From ce38da8f7ebfc7b85ff33a88c204f36e42bfb2da Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Wed, 15 Apr 2026 22:06:27 +0200 Subject: [PATCH 001/597] feat: external directories in `physical()` virtual route mounts --- .changeset/virtual-route-external-physical.md | 6 ++ packages/router-generator/src/generator.ts | 4 ++ .../router-generator/tests/generator.test.ts | 33 +++++++++ .../external-target/bar.tsx | 2 + .../external-target/foo.tsx | 2 + .../routeTree.snapshot.ts | 59 ++++++++++++++++ .../routes/__root.tsx | 5 ++ .../routes/index.tsx | 2 + .../src/core/router-generator-plugin.ts | 67 +++++++++++++++++-- 9 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 .changeset/virtual-route-external-physical.md create mode 100644 packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/bar.tsx create mode 100644 packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/foo.tsx create mode 100644 packages/router-generator/tests/generator/virtual-physical-external-abs/routeTree.snapshot.ts create mode 100644 packages/router-generator/tests/generator/virtual-physical-external-abs/routes/__root.tsx create mode 100644 packages/router-generator/tests/generator/virtual-physical-external-abs/routes/index.tsx diff --git a/.changeset/virtual-route-external-physical.md b/.changeset/virtual-route-external-physical.md new file mode 100644 index 0000000000..66a39b2c9b --- /dev/null +++ b/.changeset/virtual-route-external-physical.md @@ -0,0 +1,6 @@ +--- +'@tanstack/router-generator': minor +'@tanstack/router-plugin': minor +--- + +feat: external directories in `physical()` virtual route mounts \ No newline at end of file diff --git a/packages/router-generator/src/generator.ts b/packages/router-generator/src/generator.ts index e1b72327f2..e4d16972a7 100644 --- a/packages/router-generator/src/generator.ts +++ b/packages/router-generator/src/generator.ts @@ -275,6 +275,10 @@ export class Generator { ) } + public getPhysicalDirectories(): Array { + return [...this.physicalDirectories] + } + public async run(event?: GeneratorEvent): Promise { if ( event && diff --git a/packages/router-generator/tests/generator.test.ts b/packages/router-generator/tests/generator.test.ts index 79f7d505b2..2b9524f597 100644 --- a/packages/router-generator/tests/generator.test.ts +++ b/packages/router-generator/tests/generator.test.ts @@ -388,6 +388,39 @@ describe('generator works', async () => { }) }) + it('physical() accepts a path outside routesDirectory', async () => { + const folderName = 'virtual-physical-external-abs' + const dir = makeFolderDir(folderName) + const externalDir = path.join(dir, 'external-target') + const config = await setupConfig(folderName, { + virtualRouteConfig: rootRoute('__root.tsx', [ + index('index.tsx'), + physical('/external', externalDir), + ]), + }) + + const { routeNodes, physicalDirectories } = await virtualGetRouteNodes( + config, + dir, + { + indexTokenSegmentRegex: /^(?:index)$/, + routeTokenSegmentRegex: /^(?:route)$/, + }, + ) + + expect(physicalDirectories).toContain(externalDir) + expect(routeNodes.map((n) => n.routePath).sort()).toEqual([ + '/', + '/external/bar', + '/external/foo', + ]) + + const externalFoo = routeNodes.find((n) => n.routePath === '/external/foo')! + expect(path.resolve(config.routesDirectory, externalFoo.filePath)).toBe( + path.join(externalDir, 'foo.tsx'), + ) + }) + it.each(folderNames)( 'should create directory for routeTree if it does not exist', async () => { diff --git a/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/bar.tsx b/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/bar.tsx new file mode 100644 index 0000000000..0117add41a --- /dev/null +++ b/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/bar.tsx @@ -0,0 +1,2 @@ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/external/bar')({ component: () => 'bar' }) diff --git a/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/foo.tsx b/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/foo.tsx new file mode 100644 index 0000000000..71fd91d06a --- /dev/null +++ b/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/foo.tsx @@ -0,0 +1,2 @@ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/external/foo')({ component: () => 'foo' }) diff --git a/packages/router-generator/tests/generator/virtual-physical-external-abs/routeTree.snapshot.ts b/packages/router-generator/tests/generator/virtual-physical-external-abs/routeTree.snapshot.ts new file mode 100644 index 0000000000..d204c269b3 --- /dev/null +++ b/packages/router-generator/tests/generator/virtual-physical-external-abs/routeTree.snapshot.ts @@ -0,0 +1,59 @@ +/* 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' + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/' + fileRoutesByTo: FileRoutesByTo + to: '/' + id: '__root__' | '/' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() diff --git a/packages/router-generator/tests/generator/virtual-physical-external-abs/routes/__root.tsx b/packages/router-generator/tests/generator/virtual-physical-external-abs/routes/__root.tsx new file mode 100644 index 0000000000..f463b796b4 --- /dev/null +++ b/packages/router-generator/tests/generator/virtual-physical-external-abs/routes/__root.tsx @@ -0,0 +1,5 @@ +import { createRootRoute, Outlet } from '@tanstack/react-router' + +export const Route = createRootRoute({ + component: () => , +}) diff --git a/packages/router-generator/tests/generator/virtual-physical-external-abs/routes/index.tsx b/packages/router-generator/tests/generator/virtual-physical-external-abs/routes/index.tsx new file mode 100644 index 0000000000..0a298cf6cc --- /dev/null +++ b/packages/router-generator/tests/generator/virtual-physical-external-abs/routes/index.tsx @@ -0,0 +1,2 @@ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ component: () => 'home' }) diff --git a/packages/router-plugin/src/core/router-generator-plugin.ts b/packages/router-plugin/src/core/router-generator-plugin.ts index 055a1bc3c5..4eeca38832 100644 --- a/packages/router-plugin/src/core/router-generator-plugin.ts +++ b/packages/router-plugin/src/core/router-generator-plugin.ts @@ -9,6 +9,17 @@ import type { Config } from './config' const PLUGIN_NAME = 'unplugin:router-generator' +// Physical mounts that point outside `routesDirectory` — their files aren't +// covered by the bundler's own watcher. +function getExternalPhysicalDirs( + generator: Generator, + routesDirectoryPath: string, +): Array { + return generator + .getPhysicalDirectories() + .filter((dir) => !dir.startsWith(routesDirectoryPath)) +} + export const unpluginRouterGeneratorFactory: UnpluginFactory< Partial Config)> | undefined > = (options = {}) => { @@ -78,11 +89,30 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory< initConfigAndGenerator({ root: config.root }) await generate() }, + configureServer(server) { + const external = getExternalPhysicalDirs( + generator, + getRoutesDirectoryPath(), + ) + if (external.length === 0) return + for (const dir of external) { + server.watcher.add(dir) + } + const onEvent = + (event: 'create' | 'update' | 'delete') => (file: string) => { + if (!external.some((dir) => file.startsWith(dir))) return + void generate({ file, event }) + } + server.watcher.on('add', onEvent('create')) + server.watcher.on('change', onEvent('update')) + server.watcher.on('unlink', onEvent('delete')) + }, }, rspack(compiler) { initConfigAndGenerator() let handle: FSWatcher | null = null + let externalHandle: FSWatcher | null = null compiler.hooks.beforeRun.tapPromise(PLUGIN_NAME, () => generate()) @@ -98,19 +128,32 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory< .watch(routesDirectoryPath, { ignoreInitial: true }) .on('add', (file) => generate({ file, event: 'create' })) + // External physical() mounts are outside rspack's file graph. + const external = getExternalPhysicalDirs( + generator, + routesDirectoryPath, + ) + if (external.length > 0) { + externalHandle = chokidar + .watch(external, { ignoreInitial: true }) + .on('add', (file) => generate({ file, event: 'create' })) + .on('change', (file) => generate({ file, event: 'update' })) + .on('unlink', (file) => generate({ file, event: 'delete' })) + } + await generate() }) compiler.hooks.watchClose.tap(PLUGIN_NAME, async () => { - if (handle) { - await handle.close() - } + if (handle) await handle.close() + if (externalHandle) await externalHandle.close() }) }, webpack(compiler) { initConfigAndGenerator() let handle: FSWatcher | null = null + let externalHandle: FSWatcher | null = null compiler.hooks.beforeRun.tapPromise(PLUGIN_NAME, () => generate()) @@ -126,13 +169,25 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory< .watch(routesDirectoryPath, { ignoreInitial: true }) .on('add', (file) => generate({ file, event: 'create' })) + // External physical() mounts are outside webpack's file graph. + const external = getExternalPhysicalDirs( + generator, + routesDirectoryPath, + ) + if (external.length > 0) { + externalHandle = chokidar + .watch(external, { ignoreInitial: true }) + .on('add', (file) => generate({ file, event: 'create' })) + .on('change', (file) => generate({ file, event: 'update' })) + .on('unlink', (file) => generate({ file, event: 'delete' })) + } + await generate() }) compiler.hooks.watchClose.tap(PLUGIN_NAME, async () => { - if (handle) { - await handle.close() - } + if (handle) await handle.close() + if (externalHandle) await externalHandle.close() }) compiler.hooks.done.tap(PLUGIN_NAME, () => { From 8cdb7e48a1cd006514c1c544265a87c0a27930fc Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Wed, 15 Apr 2026 23:56:14 +0200 Subject: [PATCH 002/597] watcher test --- .../router-generator-plugin-watcher.test.ts | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 packages/router-plugin/tests/router-generator-plugin-watcher.test.ts diff --git a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts new file mode 100644 index 0000000000..ba9b0381a5 --- /dev/null +++ b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts @@ -0,0 +1,108 @@ +import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import chokidar from 'chokidar' +import { afterEach, beforeEach, describe, it } from 'vitest' + +import { physical, rootRoute } from '@tanstack/virtual-file-routes' +import { unpluginRouterGeneratorFactory } from '../src/core/router-generator-plugin' + +const ROOT_ROUTE = `import { createRootRoute, Outlet } from '@tanstack/react-router' +export const Route = createRootRoute({ component: () => null }) +` + +const makeRouteFile = (routePath: string) => + `import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('${routePath}')({ component: () => null }) +` + +async function waitUntil( + condition: () => boolean | Promise, + { timeoutMs = 2000, intervalMs = 25 } = {}, +) { + const start = Date.now() + while (Date.now() - start < timeoutMs) { + if (await condition()) return + await new Promise((r) => setTimeout(r, intervalMs)) + } + throw new Error(`Timed out after ${timeoutMs}ms`) +} + +async function routeTreeIncludes(generatedRouteTree: string, match: string) { + try { + const text = await readFile(generatedRouteTree, 'utf-8') + return text.includes(match) + } catch { + return false + } +} + +describe('router-generator-plugin vite watcher', () => { + let fixtureDir = '' + let externalDir = '' + let routesDir = '' + let generatedRouteTree = '' + let watcher: chokidar.FSWatcher | undefined + + beforeEach(async () => { + fixtureDir = await mkdtemp(path.join(tmpdir(), 'tsr-plugin-watcher-')) + routesDir = path.join(fixtureDir, 'routes') + externalDir = path.join(fixtureDir, 'external') + generatedRouteTree = path.join(fixtureDir, 'routeTree.gen.ts') + + await mkdir(routesDir, { recursive: true }) + await mkdir(externalDir, { recursive: true }) + await writeFile(path.join(routesDir, '__root.tsx'), ROOT_ROUTE) + await writeFile( + path.join(externalDir, 'alpha.tsx'), + makeRouteFile('/ext/alpha'), + ) + }) + + afterEach(async () => { + if (watcher) { + await watcher.close() + watcher = undefined + } + await rm(fixtureDir, { recursive: true, force: true }) + }) + + it('regenerates routeTree when a file is added to an external physical mount', async () => { + const plugin = unpluginRouterGeneratorFactory({ + routesDirectory: routesDir, + generatedRouteTree, + virtualRouteConfig: rootRoute('__root.tsx', [ + physical('/ext', externalDir), + ]), + disableLogging: true, + }) + + const viteHooks = plugin.vite as { + configResolved: (config: { root: string }) => Promise + configureServer: (server: { + watcher: chokidar.FSWatcher + }) => void | Promise + } + + await viteHooks.configResolved({ root: fixtureDir }) + await waitUntil(() => + routeTreeIncludes(generatedRouteTree, "'/ext/alpha'"), + ) + + watcher = chokidar.watch(routesDir, { ignoreInitial: true }) + await new Promise((resolve) => watcher!.once('ready', resolve)) + await viteHooks.configureServer({ watcher }) + + // Add a new route file in the external mount. + const betaPath = path.join(externalDir, 'beta.tsx') + await writeFile(betaPath, makeRouteFile('/ext/beta')) + + await waitUntil(() => routeTreeIncludes(generatedRouteTree, "'/ext/beta'")) + + // Removing the file should likewise trigger regeneration. + await rm(betaPath) + await waitUntil(async () => + !(await routeTreeIncludes(generatedRouteTree, "'/ext/beta'")), + ) + }) +}) From aebbbc02219a1513baf388baf052d06ec02b1a82 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2026 21:57:43 +0000 Subject: [PATCH 003/597] ci: apply automated fixes --- .changeset/virtual-route-external-physical.md | 2 +- .../external-target/bar.tsx | 4 +++- .../external-target/foo.tsx | 4 +++- .../router-plugin/src/core/router-generator-plugin.ts | 10 ++-------- .../tests/router-generator-plugin-watcher.test.ts | 8 +++----- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.changeset/virtual-route-external-physical.md b/.changeset/virtual-route-external-physical.md index 66a39b2c9b..ecc1aa3b99 100644 --- a/.changeset/virtual-route-external-physical.md +++ b/.changeset/virtual-route-external-physical.md @@ -3,4 +3,4 @@ '@tanstack/router-plugin': minor --- -feat: external directories in `physical()` virtual route mounts \ No newline at end of file +feat: external directories in `physical()` virtual route mounts diff --git a/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/bar.tsx b/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/bar.tsx index 0117add41a..e542318de3 100644 --- a/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/bar.tsx +++ b/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/bar.tsx @@ -1,2 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/external/bar')({ component: () => 'bar' }) +export const Route = createFileRoute('/external/bar')({ + component: () => 'bar', +}) diff --git a/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/foo.tsx b/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/foo.tsx index 71fd91d06a..a03b3d56a0 100644 --- a/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/foo.tsx +++ b/packages/router-generator/tests/generator/virtual-physical-external-abs/external-target/foo.tsx @@ -1,2 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/external/foo')({ component: () => 'foo' }) +export const Route = createFileRoute('/external/foo')({ + component: () => 'foo', +}) diff --git a/packages/router-plugin/src/core/router-generator-plugin.ts b/packages/router-plugin/src/core/router-generator-plugin.ts index 4eeca38832..30eff51633 100644 --- a/packages/router-plugin/src/core/router-generator-plugin.ts +++ b/packages/router-plugin/src/core/router-generator-plugin.ts @@ -129,10 +129,7 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory< .on('add', (file) => generate({ file, event: 'create' })) // External physical() mounts are outside rspack's file graph. - const external = getExternalPhysicalDirs( - generator, - routesDirectoryPath, - ) + const external = getExternalPhysicalDirs(generator, routesDirectoryPath) if (external.length > 0) { externalHandle = chokidar .watch(external, { ignoreInitial: true }) @@ -170,10 +167,7 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory< .on('add', (file) => generate({ file, event: 'create' })) // External physical() mounts are outside webpack's file graph. - const external = getExternalPhysicalDirs( - generator, - routesDirectoryPath, - ) + const external = getExternalPhysicalDirs(generator, routesDirectoryPath) if (external.length > 0) { externalHandle = chokidar .watch(external, { ignoreInitial: true }) diff --git a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts index ba9b0381a5..4946891674 100644 --- a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts +++ b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts @@ -85,9 +85,7 @@ describe('router-generator-plugin vite watcher', () => { } await viteHooks.configResolved({ root: fixtureDir }) - await waitUntil(() => - routeTreeIncludes(generatedRouteTree, "'/ext/alpha'"), - ) + await waitUntil(() => routeTreeIncludes(generatedRouteTree, "'/ext/alpha'")) watcher = chokidar.watch(routesDir, { ignoreInitial: true }) await new Promise((resolve) => watcher!.once('ready', resolve)) @@ -101,8 +99,8 @@ describe('router-generator-plugin vite watcher', () => { // Removing the file should likewise trigger regeneration. await rm(betaPath) - await waitUntil(async () => - !(await routeTreeIncludes(generatedRouteTree, "'/ext/beta'")), + await waitUntil( + async () => !(await routeTreeIncludes(generatedRouteTree, "'/ext/beta'")), ) }) }) From 4c4f77e2f8557ac1fe8f35eaa78e4745232425e5 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 16 Apr 2026 00:06:40 +0200 Subject: [PATCH 004/597] avoid using startsWith --- .../router-plugin/src/core/router-generator-plugin.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/router-plugin/src/core/router-generator-plugin.ts b/packages/router-plugin/src/core/router-generator-plugin.ts index 30eff51633..a6aa217754 100644 --- a/packages/router-plugin/src/core/router-generator-plugin.ts +++ b/packages/router-plugin/src/core/router-generator-plugin.ts @@ -1,4 +1,4 @@ -import { isAbsolute, join, normalize } from 'node:path' +import { isAbsolute, join, normalize, relative } from 'node:path' import { Generator, resolveConfigPath } from '@tanstack/router-generator' import { getConfig } from './config' @@ -11,13 +11,17 @@ const PLUGIN_NAME = 'unplugin:router-generator' // Physical mounts that point outside `routesDirectory` — their files aren't // covered by the bundler's own watcher. +function isInside(parent: string, child: string): boolean { + const rel = relative(parent, child) + return rel === '' || (!rel.startsWith('..') && !isAbsolute(rel)) +} function getExternalPhysicalDirs( generator: Generator, routesDirectoryPath: string, ): Array { return generator .getPhysicalDirectories() - .filter((dir) => !dir.startsWith(routesDirectoryPath)) + .filter((dir) => !isInside(routesDirectoryPath, dir)) } export const unpluginRouterGeneratorFactory: UnpluginFactory< @@ -100,7 +104,7 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory< } const onEvent = (event: 'create' | 'update' | 'delete') => (file: string) => { - if (!external.some((dir) => file.startsWith(dir))) return + if (!external.some((dir) => isInside(dir, file))) return void generate({ file, event }) } server.watcher.on('add', onEvent('create')) From b36e09bebce5fe1bce5887000c11e3bb8f4ef688 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 16 Apr 2026 00:47:53 +0200 Subject: [PATCH 005/597] use vite server --- .../router-generator-plugin-watcher.test.ts | 88 +++++++++++-------- 1 file changed, 49 insertions(+), 39 deletions(-) diff --git a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts index 4946891674..a543b26921 100644 --- a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts +++ b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts @@ -1,11 +1,12 @@ import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import path from 'node:path' -import chokidar from 'chokidar' import { afterEach, beforeEach, describe, it } from 'vitest' +import { createServer } from 'vite' +import type { ViteDevServer } from 'vite' import { physical, rootRoute } from '@tanstack/virtual-file-routes' -import { unpluginRouterGeneratorFactory } from '../src/core/router-generator-plugin' +import { tanstackRouterGenerator } from '../src/vite' const ROOT_ROUTE = `import { createRootRoute, Outlet } from '@tanstack/react-router' export const Route = createRootRoute({ component: () => null }) @@ -18,7 +19,7 @@ export const Route = createFileRoute('${routePath}')({ component: () => null }) async function waitUntil( condition: () => boolean | Promise, - { timeoutMs = 2000, intervalMs = 25 } = {}, + { timeoutMs = 10_000, intervalMs = 50 } = {}, ) { const start = Date.now() while (Date.now() - start < timeoutMs) { @@ -42,7 +43,7 @@ describe('router-generator-plugin vite watcher', () => { let externalDir = '' let routesDir = '' let generatedRouteTree = '' - let watcher: chokidar.FSWatcher | undefined + let server: ViteDevServer | undefined beforeEach(async () => { fixtureDir = await mkdtemp(path.join(tmpdir(), 'tsr-plugin-watcher-')) @@ -60,47 +61,56 @@ describe('router-generator-plugin vite watcher', () => { }) afterEach(async () => { - if (watcher) { - await watcher.close() - watcher = undefined + if (server) { + await server.close() + server = undefined } await rm(fixtureDir, { recursive: true, force: true }) }) - it('regenerates routeTree when a file is added to an external physical mount', async () => { - const plugin = unpluginRouterGeneratorFactory({ - routesDirectory: routesDir, - generatedRouteTree, - virtualRouteConfig: rootRoute('__root.tsx', [ - physical('/ext', externalDir), - ]), - disableLogging: true, - }) + it( + 'regenerates routeTree on add/remove in an external physical mount', + { timeout: 20_000 }, + async () => { + server = await createServer({ + root: fixtureDir, + configFile: false, + logLevel: 'silent', + appType: 'custom', + server: { middlewareMode: true, watch: {} }, + plugins: [ + tanstackRouterGenerator({ + routesDirectory: routesDir, + generatedRouteTree, + virtualRouteConfig: rootRoute('__root.tsx', [ + physical('/ext', externalDir), + ]), + disableLogging: true, + }), + ], + }) - const viteHooks = plugin.vite as { - configResolved: (config: { root: string }) => Promise - configureServer: (server: { - watcher: chokidar.FSWatcher - }) => void | Promise - } + await waitUntil(() => + routeTreeIncludes(generatedRouteTree, "'/ext/alpha'"), + ) - await viteHooks.configResolved({ root: fixtureDir }) - await waitUntil(() => routeTreeIncludes(generatedRouteTree, "'/ext/alpha'")) + // Short settle after each fs mutation — the plugin debounces and the + // generator may run multiple passes for a single chokidar burst. + const settle = () => new Promise((r) => setTimeout(r, 500)) - watcher = chokidar.watch(routesDir, { ignoreInitial: true }) - await new Promise((resolve) => watcher!.once('ready', resolve)) - await viteHooks.configureServer({ watcher }) + const betaPath = path.join(externalDir, 'beta.tsx') + await writeFile(betaPath, makeRouteFile('/ext/beta')) + await settle() + await waitUntil(() => + routeTreeIncludes(generatedRouteTree, "'/ext/beta'"), + ) - // Add a new route file in the external mount. - const betaPath = path.join(externalDir, 'beta.tsx') - await writeFile(betaPath, makeRouteFile('/ext/beta')) - - await waitUntil(() => routeTreeIncludes(generatedRouteTree, "'/ext/beta'")) - - // Removing the file should likewise trigger regeneration. - await rm(betaPath) - await waitUntil( - async () => !(await routeTreeIncludes(generatedRouteTree, "'/ext/beta'")), - ) - }) + await rm(betaPath) + await settle() + await waitUntil( + async () => + !(await routeTreeIncludes(generatedRouteTree, "'/ext/beta'")), + ) + }, + ) }) From c2e92320b94713bd527a49172b8c854e1fcd8568 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 16 Apr 2026 01:38:53 +0200 Subject: [PATCH 006/597] test: increase timeout values for external physical mount tests --- .../tests/router-generator-plugin-watcher.test.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts index a543b26921..ea33cedebb 100644 --- a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts +++ b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts @@ -19,7 +19,7 @@ export const Route = createFileRoute('${routePath}')({ component: () => null }) async function waitUntil( condition: () => boolean | Promise, - { timeoutMs = 10_000, intervalMs = 50 } = {}, + { timeoutMs = 20_000, intervalMs = 50 } = {}, ) { const start = Date.now() while (Date.now() - start < timeoutMs) { @@ -70,14 +70,17 @@ describe('router-generator-plugin vite watcher', () => { it( 'regenerates routeTree on add/remove in an external physical mount', - { timeout: 20_000 }, + { timeout: 30_000 }, async () => { server = await createServer({ root: fixtureDir, configFile: false, logLevel: 'silent', appType: 'custom', - server: { middlewareMode: true, watch: {} }, + server: { + middlewareMode: true, + watch: { usePolling: true, interval: 100 }, + }, plugins: [ tanstackRouterGenerator({ routesDirectory: routesDir, @@ -96,7 +99,7 @@ describe('router-generator-plugin vite watcher', () => { // Short settle after each fs mutation — the plugin debounces and the // generator may run multiple passes for a single chokidar burst. - const settle = () => new Promise((r) => setTimeout(r, 500)) + const settle = () => new Promise((r) => setTimeout(r, 1000)) const betaPath = path.join(externalDir, 'beta.tsx') await writeFile(betaPath, makeRouteFile('/ext/beta')) From c207ebbb19ffed904051b0589f6393bbf2f210ef Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 16 Apr 2026 02:05:51 +0200 Subject: [PATCH 007/597] fix: adjust timeout values and improve temporary directory handling in tests --- .../router-generator-plugin-watcher.test.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts index ea33cedebb..1fce84bb63 100644 --- a/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts +++ b/packages/router-plugin/tests/router-generator-plugin-watcher.test.ts @@ -1,5 +1,5 @@ import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' +import { fileURLToPath } from 'node:url' import path from 'node:path' import { afterEach, beforeEach, describe, it } from 'vitest' import { createServer } from 'vite' @@ -19,7 +19,7 @@ export const Route = createFileRoute('${routePath}')({ component: () => null }) async function waitUntil( condition: () => boolean | Promise, - { timeoutMs = 20_000, intervalMs = 50 } = {}, + { timeoutMs = 10_000, intervalMs = 50 } = {}, ) { const start = Date.now() while (Date.now() - start < timeoutMs) { @@ -46,7 +46,12 @@ describe('router-generator-plugin vite watcher', () => { let server: ViteDevServer | undefined beforeEach(async () => { - fixtureDir = await mkdtemp(path.join(tmpdir(), 'tsr-plugin-watcher-')) + // Use a directory within the package to avoid cross-device rename errors: + // the generator writes temp files to .tanstack/tmp/ then does an atomic + // rename(), which fails with EXDEV when tmpdir() is on another device. + fixtureDir = await mkdtemp( + path.join(path.dirname(fileURLToPath(import.meta.url)), 'tmp-watcher-'), + ) routesDir = path.join(fixtureDir, 'routes') externalDir = path.join(fixtureDir, 'external') generatedRouteTree = path.join(fixtureDir, 'routeTree.gen.ts') @@ -77,10 +82,7 @@ describe('router-generator-plugin vite watcher', () => { configFile: false, logLevel: 'silent', appType: 'custom', - server: { - middlewareMode: true, - watch: { usePolling: true, interval: 100 }, - }, + server: { middlewareMode: true, watch: {} }, plugins: [ tanstackRouterGenerator({ routesDirectory: routesDir, @@ -99,7 +101,7 @@ describe('router-generator-plugin vite watcher', () => { // Short settle after each fs mutation — the plugin debounces and the // generator may run multiple passes for a single chokidar burst. - const settle = () => new Promise((r) => setTimeout(r, 1000)) + const settle = () => new Promise((r) => setTimeout(r, 500)) const betaPath = path.join(externalDir, 'beta.tsx') await writeFile(betaPath, makeRouteFile('/ext/beta')) From cd5572dc37c64455db449462609288b2656dfdb2 Mon Sep 17 00:00:00 2001 From: Birk Skyum <74932975+birkskyum@users.noreply.github.com> Date: Thu, 16 Apr 2026 20:48:21 +0200 Subject: [PATCH 008/597] chore: bump solid-js override 1.9.12 (#7202) --- package.json | 2 +- pnpm-lock.yaml | 1130 ++++++++++++++++++++++++------------------------ 2 files changed, 558 insertions(+), 574 deletions(-) diff --git a/package.json b/package.json index 3abe245fa8..134fbdb11b 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "overrides": { "@types/babel__traverse": "^7.28.0", "vite-plugin-dts": "4.2.3", - "solid-js": "1.9.10", + "solid-js": "1.9.12", "react": "$react", "react-dom": "$react-dom", "@types/react": "$@types/react", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a4360011c7..574249703f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,7 +7,7 @@ settings: overrides: '@types/babel__traverse': ^7.28.0 vite-plugin-dts: 4.2.3 - solid-js: 1.9.10 + solid-js: 1.9.12 react: ^19.2.3 react-dom: ^19.2.3 '@types/react': ^19.2.8 @@ -201,8 +201,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(react@19.2.3) solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vue: specifier: ^3.5.16 version: 3.5.25(typescript@6.0.2) @@ -233,7 +233,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) benchmarks/client-nav: dependencies: @@ -256,8 +256,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(react@19.2.3) solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vue: specifier: ^3.5.16 version: 3.5.25(typescript@6.0.2) @@ -291,7 +291,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vitest: specifier: ^4.0.17 version: 4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) @@ -323,8 +323,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(react@19.2.3) solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vue: specifier: ^3.5.16 version: 3.5.25(typescript@6.0.2) @@ -346,7 +346,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vitest: specifier: ^4.0.17 version: 4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) @@ -3187,8 +3187,8 @@ importers: specifier: workspace:^ version: link:../../../packages/solid-router-devtools solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@playwright/test': specifier: ^1.57.0 @@ -3201,7 +3201,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/basic: dependencies: @@ -3218,8 +3218,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3235,7 +3235,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/basic-esbuild-file-based: dependencies: @@ -3255,8 +3255,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 zod: specifier: ^3.24.2 version: 3.25.57 @@ -3272,7 +3272,7 @@ importers: version: 0.27.4 esbuild-plugin-solid: specifier: ^0.6.0 - version: 0.6.0(esbuild@0.27.4)(solid-js@1.9.10) + version: 0.6.0(esbuild@0.27.4)(solid-js@1.9.12) e2e/solid-router/basic-file-based: dependencies: @@ -3295,8 +3295,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3318,7 +3318,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/basic-file-based-code-splitting: dependencies: @@ -3335,8 +3335,8 @@ importers: specifier: workspace:^ version: link:../../../packages/solid-router-devtools solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3355,7 +3355,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/basic-scroll-restoration: dependencies: @@ -3370,13 +3370,13 @@ importers: version: link:../../../packages/solid-router-devtools '@tanstack/solid-virtual': specifier: ^3.13.0 - version: 3.13.12(solid-js@1.9.10) + version: 3.13.12(solid-js@1.9.12) redaxios: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3395,7 +3395,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/basic-solid-query: dependencies: @@ -3404,10 +3404,10 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -3418,8 +3418,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3435,7 +3435,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/basic-solid-query-file-based: dependencies: @@ -3447,10 +3447,10 @@ importers: version: link:../../../packages/router-plugin '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -3461,8 +3461,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3481,7 +3481,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/basic-virtual-file-based: dependencies: @@ -3504,8 +3504,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3524,7 +3524,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/basic-virtual-named-export-config-file-based: dependencies: @@ -3547,8 +3547,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3567,7 +3567,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/generator-cli-only: dependencies: @@ -3587,8 +3587,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3604,7 +3604,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/js-only-file-based: dependencies: @@ -3621,8 +3621,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3641,7 +3641,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/rspack-basic-file-based: dependencies: @@ -3655,8 +3655,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@playwright/test': specifier: ^1.57.0 @@ -3669,7 +3669,7 @@ importers: version: 1.0.3(@rsbuild/core@1.2.4) '@rsbuild/plugin-solid': specifier: ^1.0.6 - version: 1.0.6(@babel/core@7.29.0)(@rsbuild/core@1.2.4)(solid-js@1.9.10) + version: 1.0.6(@babel/core@7.29.0)(@rsbuild/core@1.2.4)(solid-js@1.9.12) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -3701,8 +3701,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@playwright/test': specifier: ^1.57.0 @@ -3715,7 +3715,7 @@ importers: version: 1.0.3(@rsbuild/core@1.2.4) '@rsbuild/plugin-solid': specifier: ^1.0.6 - version: 1.0.6(@babel/core@7.29.0)(@rsbuild/core@1.2.4)(solid-js@1.9.10) + version: 1.0.6(@babel/core@7.29.0)(@rsbuild/core@1.2.4)(solid-js@1.9.12) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -3759,8 +3759,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3779,13 +3779,13 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/sentry-integration: dependencies: '@sentry/solid': specifier: ^10.32.0 - version: 10.32.0(@tanstack/solid-router@packages+solid-router)(solid-js@1.9.10) + version: 10.32.0(@tanstack/solid-router@packages+solid-router)(solid-js@1.9.12) '@sentry/tracing': specifier: ^7.120.4 version: 7.120.4 @@ -3805,8 +3805,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3822,7 +3822,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-router/view-transitions: dependencies: @@ -3842,8 +3842,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3865,7 +3865,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/basic: dependencies: @@ -3891,8 +3891,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -3935,7 +3935,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/basic-auth: dependencies: @@ -3961,8 +3961,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -3999,7 +3999,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/basic-cloudflare: dependencies: @@ -4013,8 +4013,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 @@ -4042,7 +4042,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -4081,10 +4081,10 @@ importers: dependencies: '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4101,8 +4101,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -4136,7 +4136,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/basic-spa: devDependencies: @@ -4180,8 +4180,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vite: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) @@ -4200,7 +4200,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/csp: dependencies: @@ -4211,8 +4211,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vite: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) @@ -4234,7 +4234,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/css-modules: dependencies: @@ -4245,8 +4245,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@playwright/test': specifier: ^1.57.0 @@ -4271,7 +4271,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/custom-basepath: dependencies: @@ -4291,8 +4291,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@playwright/test': specifier: ^1.57.0 @@ -4329,16 +4329,16 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/query-integration: dependencies: '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4352,8 +4352,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -4384,7 +4384,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/scroll-restoration: dependencies: @@ -4404,8 +4404,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -4442,7 +4442,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/selective-ssr: dependencies: @@ -4453,8 +4453,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 zod: specifier: ^3.24.2 version: 3.25.57 @@ -4479,7 +4479,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/serialization-adapters: dependencies: @@ -4493,8 +4493,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vite: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) @@ -4522,13 +4522,13 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/server-functions: dependencies: '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4548,8 +4548,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -4589,13 +4589,13 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/server-routes: dependencies: '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4615,8 +4615,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -4656,7 +4656,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/spa-mode: dependencies: @@ -4670,8 +4670,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 zod: specifier: ^3.24.2 version: 3.25.57 @@ -4693,7 +4693,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/start-manifest: dependencies: @@ -4704,8 +4704,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@playwright/test': specifier: ^1.57.0 @@ -4727,7 +4727,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/virtual-routes: dependencies: @@ -4747,8 +4747,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -4785,7 +4785,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/solid-start/website: dependencies: @@ -4802,8 +4802,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -4837,7 +4837,7 @@ importers: version: 6.0.2 vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/vue-router/basepath-file-based: dependencies: @@ -8958,7 +8958,7 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-devtools': specifier: ^0.7.0 - version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.10) + version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9202,7 +9202,7 @@ importers: dependencies: '@tanstack/react-devtools': specifier: ^0.7.0 - version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.10) + version: 0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9901,8 +9901,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9918,7 +9918,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/authenticated-routes-firebase: dependencies: @@ -9944,8 +9944,8 @@ importers: specifier: ^14.9.0 version: 14.9.0 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9961,7 +9961,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic: dependencies: @@ -9978,8 +9978,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9998,7 +9998,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-default-search-params: dependencies: @@ -10007,7 +10007,7 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10018,8 +10018,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10035,7 +10035,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-devtools-panel: dependencies: @@ -10052,8 +10052,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10066,7 +10066,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-file-based: dependencies: @@ -10083,8 +10083,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10103,7 +10103,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-non-nested-devtools: dependencies: @@ -10120,8 +10120,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10140,7 +10140,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-solid-query: dependencies: @@ -10149,10 +10149,10 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10163,8 +10163,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10180,7 +10180,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-solid-query-file-based: dependencies: @@ -10189,10 +10189,10 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10203,8 +10203,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10223,7 +10223,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-ssr-file-based: dependencies: @@ -10246,8 +10246,8 @@ importers: specifier: ^3.3.2 version: 3.3.2 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10263,7 +10263,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-ssr-streaming-file-based: dependencies: @@ -10292,8 +10292,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10315,7 +10315,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-virtual-file-based: dependencies: @@ -10338,8 +10338,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10355,7 +10355,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/basic-virtual-inside-file-based: dependencies: @@ -10378,8 +10378,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10395,7 +10395,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/deferred-data: dependencies: @@ -10412,8 +10412,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10429,7 +10429,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/i18n-paraglide: dependencies: @@ -10443,8 +10443,8 @@ importers: specifier: ^1.168.19 version: link:../../../packages/solid-router solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10463,7 +10463,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/kitchen-sink: dependencies: @@ -10483,8 +10483,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10500,7 +10500,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/kitchen-sink-file-based: dependencies: @@ -10520,8 +10520,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10540,7 +10540,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/kitchen-sink-solid-query: dependencies: @@ -10549,10 +10549,10 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10566,8 +10566,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10583,7 +10583,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/kitchen-sink-solid-query-file-based: dependencies: @@ -10595,10 +10595,10 @@ importers: version: link:../../../packages/router-plugin '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10612,8 +10612,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10629,7 +10629,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/large-file-based: dependencies: @@ -10641,7 +10641,7 @@ importers: version: link:../../../packages/router-plugin '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10652,8 +10652,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10669,7 +10669,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/location-masking: dependencies: @@ -10678,7 +10678,7 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10689,8 +10689,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10703,7 +10703,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/navigation-blocking: dependencies: @@ -10712,7 +10712,7 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10723,8 +10723,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10737,7 +10737,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/quickstart: dependencies: @@ -10751,8 +10751,8 @@ importers: specifier: workspace:^ version: link:../../../packages/solid-router-devtools solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10765,7 +10765,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/quickstart-esbuild-file-based: dependencies: @@ -10782,8 +10782,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10796,7 +10796,7 @@ importers: version: 0.27.4 esbuild-plugin-solid: specifier: ^0.6.0 - version: 0.6.0(esbuild@0.27.4)(solid-js@1.9.10) + version: 0.6.0(esbuild@0.27.4)(solid-js@1.9.12) examples/solid/quickstart-file-based: dependencies: @@ -10813,8 +10813,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10833,7 +10833,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/quickstart-rspack-file-based: dependencies: @@ -10850,8 +10850,8 @@ importers: specifier: ^8.5.1 version: 8.5.6 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10864,7 +10864,7 @@ importers: version: 1.0.6(@rsbuild/core@1.2.4) '@rsbuild/plugin-solid': specifier: ^1.0.6 - version: 1.0.6(@babel/core@7.29.0)(@rsbuild/core@1.2.4)(solid-js@1.9.10) + version: 1.0.6(@babel/core@7.29.0)(@rsbuild/core@1.2.4)(solid-js@1.9.12) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -10881,8 +10881,8 @@ importers: specifier: workspace:^ version: link:../../../packages/solid-router-devtools solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10901,7 +10901,7 @@ importers: version: 10.0.0(@babel/core@7.28.5)(webpack@5.97.1) babel-preset-solid: specifier: ^1.9.10 - version: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.10) + version: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.12) css-loader: specifier: ^7.1.2 version: 7.1.2(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1) @@ -10945,8 +10945,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@types/node': specifier: 25.0.9 @@ -10962,7 +10962,7 @@ importers: version: 4.2.3(@types/node@25.0.9)(rollup@4.56.0)(typescript@6.0.2)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/router-monorepo-simple-lazy: dependencies: @@ -10979,8 +10979,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@types/node': specifier: 25.0.9 @@ -10996,7 +10996,7 @@ importers: version: 4.2.3(@types/node@25.0.9)(rollup@4.56.0)(typescript@6.0.2)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/router-monorepo-solid-query: dependencies: @@ -11005,10 +11005,10 @@ importers: version: link:../../../packages/router-plugin '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11019,8 +11019,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@types/node': specifier: 25.0.9 @@ -11036,7 +11036,7 @@ importers: version: 4.2.3(@types/node@25.0.9)(rollup@4.56.0)(typescript@6.0.2)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/scroll-restoration: dependencies: @@ -11051,10 +11051,10 @@ importers: version: link:../../../packages/solid-router-devtools '@tanstack/solid-virtual': specifier: ^3.13.0 - version: 3.13.12(solid-js@1.9.10) + version: 3.13.12(solid-js@1.9.12) solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11067,7 +11067,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/search-validator-adapters: dependencies: @@ -11082,7 +11082,7 @@ importers: version: link:../../../packages/router-plugin '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11099,8 +11099,8 @@ importers: specifier: ^2.1.7 version: 2.1.7 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11113,7 +11113,7 @@ importers: devDependencies: '@solidjs/testing-library': specifier: ^0.8.10 - version: 0.8.10(solid-js@1.9.10) + version: 0.8.10(solid-js@1.9.12) '@testing-library/jest-dom': specifier: ^6.6.3 version: 6.6.3 @@ -11125,7 +11125,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-basic: dependencies: @@ -11142,8 +11142,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -11168,7 +11168,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-basic-auth: dependencies: @@ -11194,8 +11194,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -11223,7 +11223,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-basic-authjs: dependencies: @@ -11240,8 +11240,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 start-authjs: specifier: ^1.0.0 version: 1.0.0(@auth/core@0.41.1) @@ -11266,7 +11266,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-basic-cloudflare: dependencies: @@ -11280,8 +11280,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.0 @@ -11303,7 +11303,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -11320,8 +11320,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@netlify/vite-plugin-tanstack-start': specifier: ^1.1.4 @@ -11343,7 +11343,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-basic-nitro: dependencies: @@ -11357,8 +11357,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 @@ -11380,16 +11380,16 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-basic-solid-query: dependencies: '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10) + version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11406,8 +11406,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -11429,7 +11429,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-basic-static: dependencies: @@ -11449,8 +11449,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -11472,7 +11472,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-bun: dependencies: @@ -11484,7 +11484,7 @@ importers: version: link:../../../packages/router-plugin '@tanstack/solid-devtools': specifier: ^0.7.0 - version: 0.7.14(csstype@3.2.3)(solid-js@1.9.10) + version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11498,15 +11498,15 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 devDependencies: '@solidjs/testing-library': specifier: ^0.8.10 - version: 0.8.10(solid-js@1.9.10) + version: 0.8.10(solid-js@1.9.12) '@tanstack/eslint-config': specifier: ^0.3.2 version: 0.3.2(@typescript-eslint/utils@8.57.1(eslint@9.22.0(jiti@2.6.1))(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@9.22.0(jiti@2.6.1))(typescript@6.0.2) @@ -11533,7 +11533,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vitest: specifier: ^3.2.4 version: 3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(@vitest/browser@4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18))(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) @@ -11545,7 +11545,7 @@ importers: dependencies: '@convex-dev/better-auth': specifier: ^0.9.7 - version: 0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.10))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2) + version: 0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) @@ -11560,7 +11560,7 @@ importers: version: link:../../../packages/solid-start better-auth: specifier: ^1.3.27 - version: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.10) + version: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -11569,13 +11569,13 @@ importers: version: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) convex-solidjs: specifier: ^0.0.3 - version: 0.0.3(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3)(solid-js@1.9.10) + version: 0.0.3(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) redaxios: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -11600,7 +11600,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-counter: dependencies: @@ -11617,8 +11617,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -11640,13 +11640,13 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-i18n-paraglide: dependencies: '@tanstack/solid-devtools': specifier: ^0.7.0 - version: 0.7.14(csstype@3.2.3)(solid-js@1.9.10) + version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11657,8 +11657,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@inlang/paraglide-js': specifier: ^2.4.0 @@ -11680,13 +11680,13 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-large: dependencies: '@tanstack/solid-query': specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11700,8 +11700,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -11726,7 +11726,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-streaming-data-from-server-functions: dependencies: @@ -11740,8 +11740,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 zod: specifier: ^3.24.2 version: 3.25.57 @@ -11757,7 +11757,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-supabase-basic: dependencies: @@ -11780,8 +11780,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 @@ -11800,7 +11800,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/start-tailwind-v4: dependencies: @@ -11814,8 +11814,8 @@ importers: specifier: workspace:* version: link:../../../packages/solid-start solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -11840,7 +11840,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/view-transitions: dependencies: @@ -11860,8 +11860,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11877,7 +11877,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/with-framer-motion: dependencies: @@ -11894,11 +11894,11 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 solid-motionone: specifier: ^1.0.4 - version: 1.0.4(solid-js@1.9.10) + version: 1.0.4(solid-js@1.9.12) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11914,7 +11914,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/solid/with-trpc: dependencies: @@ -11943,8 +11943,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11963,7 +11963,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.11 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) examples/vue/basic: dependencies: @@ -12548,14 +12548,14 @@ importers: version: 2.1.16(csstype@3.1.3) devDependencies: solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vite: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.10 - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) packages/router-generator: dependencies: @@ -12643,7 +12643,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.10 || ^3.0.0-0 - version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) webpack: specifier: '>=5.92.0' version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.27.4) @@ -12739,13 +12739,13 @@ importers: dependencies: '@solid-devtools/logger': specifier: ^0.9.4 - version: 0.9.7(solid-js@1.9.10) + version: 0.9.7(solid-js@1.9.12) '@solid-primitives/refs': specifier: ^1.0.8 - version: 1.1.0(solid-js@1.9.10) + version: 1.1.0(solid-js@1.9.12) '@solidjs/meta': specifier: ^0.29.4 - version: 0.29.4(solid-js@1.9.10) + version: 0.29.4(solid-js@1.9.12) '@tanstack/history': specifier: workspace:* version: link:../history @@ -12758,7 +12758,7 @@ importers: devDependencies: '@solidjs/testing-library': specifier: ^0.8.10 - version: 0.8.10(solid-js@1.9.10) + version: 0.8.10(solid-js@1.9.12) '@tanstack/intent': specifier: ^0.0.14 version: 0.0.14 @@ -12775,14 +12775,14 @@ importers: specifier: ^0.14.5 version: 0.14.5(eslint@9.22.0(jiti@2.6.1))(typescript@6.0.2) solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vite: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.10 - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) zod: specifier: ^3.23.8 version: 3.25.57 @@ -12803,14 +12803,14 @@ importers: specifier: 25.0.9 version: 25.0.9 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vite: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.10 - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) packages/solid-router-ssr-query: dependencies: @@ -12823,7 +12823,7 @@ importers: devDependencies: '@tanstack/solid-query': specifier: '>=5.90.0' - version: 5.90.9(solid-js@1.9.10) + version: 5.90.9(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:* version: link:../solid-router @@ -12831,14 +12831,14 @@ importers: specifier: ^0.14.5 version: 0.14.5(eslint@9.22.0(jiti@2.6.1))(typescript@6.0.2) solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 vite: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.10 - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) packages/solid-start: dependencies: @@ -12864,8 +12864,8 @@ importers: specifier: ^2.0.3 version: 2.0.3 solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@tanstack/intent': specifier: ^0.0.14 @@ -12892,12 +12892,12 @@ importers: specifier: workspace:* version: link:../start-client-core solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 devDependencies: '@solidjs/testing-library': specifier: ^0.8.10 - version: 0.8.10(solid-js@1.9.10) + version: 0.8.10(solid-js@1.9.12) '@testing-library/jest-dom': specifier: ^6.6.3 version: 6.6.3 @@ -12906,13 +12906,13 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.10 - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) packages/solid-start-server: dependencies: '@solidjs/meta': specifier: ^0.29.4 - version: 0.29.4(solid-js@1.9.10) + version: 0.29.4(solid-js@1.9.12) '@tanstack/history': specifier: workspace:* version: link:../history @@ -12930,8 +12930,8 @@ importers: version: link:../start-server-core devDependencies: solid-js: - specifier: 1.9.10 - version: 1.9.10 + specifier: 1.9.12 + version: 1.9.12 typescript: specifier: ^6.0.2 version: 6.0.2 @@ -12940,7 +12940,7 @@ importers: version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vite-plugin-solid: specifier: ^2.11.10 - version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + version: 2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) packages/start-client-core: dependencies: @@ -18260,7 +18260,7 @@ packages: peerDependencies: '@solidjs/router': ^0.13.4 || ^0.14.0 || ^0.15.0 '@tanstack/solid-router': ^1.132.27 - solid-js: 1.9.10 + solid-js: 1.9.12 peerDependenciesMeta: '@solidjs/router': optional: true @@ -18327,144 +18327,144 @@ packages: '@solid-devtools/debugger@0.26.0': resolution: {integrity: sha512-36QxZ+s/lY60E+Pb9q0eTsdqgaog4c823WIj5dC2LFdGrGXbVGBQEj6k7CgvMnEETdwndrd0Fm72fQyYPlZrVA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-devtools/logger@0.9.7': resolution: {integrity: sha512-JHZ0ejkQnRoMcV8bgqogSYFlYdo0wJ1S/vAHEROSHQk1jNtErTXJwLrCXdR+LNuBWhJJ0aq/y7Pjit/ssvKrDw==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-devtools/shared@0.19.0': resolution: {integrity: sha512-OGo6l84f9X5YEAqSEM4Xl94+xKXSqmACMzKWsAqO0BStLBMVL0vIVu286AQk5XkNxn11/EB9wrdkZc9GUzKlxA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/bounds@0.0.122': resolution: {integrity: sha512-kUq/IprOdFr/rg2upon5lQGOoTnDAmxQS4ASKK2l+VwoKSctdPwgu/4qJxEITZikL+nB0myYZzBZWptySV0cRg==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/context@0.3.2': resolution: {integrity: sha512-6fvTtpK17PFHnUf/UOc1TzBjd+kLFjtA62aRFEm1kDP9ufTo7FYW2kUzQAWbfbRHi30yjBJtopbR8qd6nShwyg==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/cursor@0.0.115': resolution: {integrity: sha512-8nEmUN/sacXPChwuJOAi6Yi6VnxthW/Jk8VGvvcF38AenjUvOA6FHI6AkJILuFXjQw1PGxia1YbH/Mn77dPiOA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/event-listener@2.4.0': resolution: {integrity: sha512-TSfR1PNTfojFEYGSxSMCnUhXsaYWBo4p+cm73QmWODa9YnaQAk6PB7VjzG2bOT2D817VlvuOqTj0Qdq+MZrdGg==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/event-listener@2.4.3': resolution: {integrity: sha512-h4VqkYFv6Gf+L7SQj+Y6puigL/5DIi7x5q07VZET7AWcS+9/G3WfIE9WheniHWJs51OEkRB43w6lDys5YeFceg==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/keyboard@1.3.0': resolution: {integrity: sha512-0QX9O3eUaQorNNmXZn8a4efSByayIScVq+iGSwheD7m3SL/ACLM5oZlCNpTPLcemnVVfUPAHFiViEj86XpN5qw==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/keyboard@1.3.3': resolution: {integrity: sha512-9dQHTTgLBqyAI7aavtO+HnpTVJgWQA1ghBSrmLtMu1SMxLPDuLfuNr+Tk5udb4AL4Ojg7h9JrKOGEEDqsJXWJA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/media@2.3.0': resolution: {integrity: sha512-7+C3wfbWnGE/WPoNsqcp/EeOP2aNNB92RCpsWhBth8E5lZo/J+rK6jMb7umVsK0zguT8HBpeXp1pFyFbcsHStA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/platform@0.1.2': resolution: {integrity: sha512-sSxcZfuUrtxcwV0vdjmGnZQcflACzMfLriVeIIWXKp8hzaS3Or3tO6EFQkTd3L8T5dTq+kTtLvPscXIpL0Wzdg==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/props@3.2.2': resolution: {integrity: sha512-lZOTwFJajBrshSyg14nBMEP0h8MXzPowGO0s3OeiR3z6nXHTfj0FhzDtJMv+VYoRJKQHG2QRnJTgCzK6erARAw==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/refs@1.1.0': resolution: {integrity: sha512-QJ3bTSQOlPdHBP2m6llrT13FvVzAwZfx41lTN8lQrRwwcZoWb7kfCAjhaohPnwkAsQ6nJpLjtGfT5GOyuCA4tA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/resize-observer@2.1.0': resolution: {integrity: sha512-tO9MDAc2pNjpcRd5B8LWbiR1qzIgvGZ5BtTuO98N7CLwd+fnuyGwtlQtJpz5hcLcTnoawpQYLpiRGNgaYW+YzQ==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/resize-observer@2.1.3': resolution: {integrity: sha512-zBLje5E06TgOg93S7rGPldmhDnouNGhvfZVKOp+oG2XU8snA+GoCSSCz1M+jpNAg5Ek2EakU5UVQqL152WmdXQ==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/rootless@1.5.0': resolution: {integrity: sha512-YJ+EveQeDv9DLqfDKfsPAAGy2x3vBruoD23yn+nD2dT84QjoBxWT1T0qA0TMFjek6/xuN3flqnHtQ4r++4zdjg==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/rootless@1.5.2': resolution: {integrity: sha512-9HULb0QAzL2r47CCad0M+NKFtQ+LrGGNHZfteX/ThdGvKIg2o2GYhBooZubTCd/RTu2l2+Nw4s+dEfiDGvdrrQ==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/scheduled@1.5.0': resolution: {integrity: sha512-RVw24IRNh1FQ4DCMb3OahB70tXIwc5vH8nhR4nNPsXwUPQeuOkLsDI5BlxaPk0vyZgqw9lDpufgI3HnPwplgDw==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/static-store@0.0.8': resolution: {integrity: sha512-ZecE4BqY0oBk0YG00nzaAWO5Mjcny8Fc06CdbXadH9T9lzq/9GefqcSe/5AtdXqjvY/DtJ5C6CkcjPZO0o/eqg==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/static-store@0.1.0': resolution: {integrity: sha512-6Coau0Kv/dF83UQpbBzc+gnJafOQAPe2jCbB4jmTK5UocsR5cWmFBVRm3kin+nZFVaO4WkuELw0cKANWgTVh8Q==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/static-store@0.1.2': resolution: {integrity: sha512-ReK+5O38lJ7fT+L6mUFvUr6igFwHBESZF+2Ug842s7fvlVeBdIVEdTCErygff6w7uR6+jrr7J8jQo+cYrEq4Iw==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/styles@0.0.114': resolution: {integrity: sha512-SFXr16mgr6LvZAIj6L7i59HHg+prAmIF8VP/U3C6jSHz68Eh1G71vaWr9vlJVpy/j6bh1N8QUzu5CgtvIC92OQ==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/transition-group@1.1.2': resolution: {integrity: sha512-gnHS0OmcdjeoHN9n7Khu8KNrOlRc8a2weETDt2YT6o1zeW/XtUC6Db3Q9pkMU/9cCKdEmN4b0a/41MKAHRhzWA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/utils@6.3.0': resolution: {integrity: sha512-e7hTlJ1Ywh2+g/Qug+n4L1mpfxsikoIS4/sHE2EK9WatQt8UJqop/vE6bsLnXlU1xuhb/jo94Ah5Y27rd4wP7A==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solid-primitives/utils@6.3.2': resolution: {integrity: sha512-hZ/M/qr25QOCcwDPOHtGjxTD8w2mNyVAYvcfgwzBHq2RwNqHNdDNsMZYap20+ruRwW4A3Cdkczyoz0TSxLCAPQ==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solidjs/meta@0.29.4': resolution: {integrity: sha512-zdIWBGpR9zGx1p1bzIPqF5Gs+Ks/BH8R6fWhmUa/dcK1L2rUC8BAcZJzNRYBQv74kScf1TSOs0EY//Vd/I0V8g==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@solidjs/testing-library@0.8.10': resolution: {integrity: sha512-qdeuIerwyq7oQTIrrKvV0aL9aFeuwTd86VYD3afdq5HYEwoox1OBTJy4y8A3TFZr8oAR0nujYgCzY/8wgHGfeQ==} engines: {node: '>= 14'} peerDependencies: '@solidjs/router': '>=0.9.0' - solid-js: 1.9.10 + solid-js: 1.9.12 peerDependenciesMeta: '@solidjs/router': optional: true @@ -18732,25 +18732,25 @@ packages: resolution: {integrity: sha512-DU8OfLntngnph+Tb7ivQvh4F4w+rDu6r01fXlhjq/Nmgdr0gtsOox4kdmyq5rCs+C6aPgP3M7+BE+fv4dN+VvA==} engines: {node: '>=18'} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/devtools-ui@0.4.4': resolution: {integrity: sha512-5xHXFyX3nom0UaNfiOM92o6ziaHjGo3mcSGe2HD5Xs8dWRZNpdZ0Smd0B9ddEhy0oB+gXyMzZgUJb9DmrZV0Mg==} engines: {node: '>=18'} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/devtools@0.6.14': resolution: {integrity: sha512-dOtHoeLjjcHeNscu+ZEf89EFboQsy0ggb6pf8Sha59qBUeQbjUsaAvwP8Ogwg89oJxFQbTP7DKYNBNw5CxlNEA==} engines: {node: '>=18'} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/devtools@0.8.1': resolution: {integrity: sha512-ZyKX+IJvMaTY0TywdA6r6kbD6V+0dxWQVDGC3jd2q4RP9OMHzpXd0cKreDvqOGrAPtEUXpGBxW0AtsaauDWurQ==} engines: {node: '>=18'} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/eslint-config@0.3.2': resolution: {integrity: sha512-2g+PuGR3GuvvCiR3xZs+IMqAvnYU9bvH+jRml0BFBSxHBj22xFCTNvJWhvgj7uICFF9IchDkFUto91xDPMu5cg==} @@ -18824,23 +18824,23 @@ packages: resolution: {integrity: sha512-hyaB29d1fU2n9v2XeFEB6t2k5gKionK8mxxb9MNtF7qJheZ6z9259jU8OsBdA/f6v2oYck1K1Ia9+ooJsdy4jg==} engines: {node: '>=18'} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/solid-query-devtools@5.90.4': resolution: {integrity: sha512-ygyAiXZ+NR1tw33jVibpjiWB1IoAQWCeqSLmO/6PoSWrI9yDTwaPNAXheniEMrO6/a/vTQq2tB4N+FPNjhGaNw==} peerDependencies: '@tanstack/solid-query': ^5.90.4 - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/solid-query@5.90.9': resolution: {integrity: sha512-OF+FpTHPmZxF5M0zcEERtUA0DhuFdNOpn0EAbASarDfIuNrvi8k07dhYV5zYyYwkt+eoe/RnAX65PdSP+Y0ONw==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/solid-virtual@3.13.12': resolution: {integrity: sha512-0dS8GkBTmbuM9cUR6Jni0a45eJbd32CAEbZj8HrZMWIj3lu974NpGz5ywcomOGJ9GdeHuDaRzlwtonBbKV1ihQ==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/store@0.9.3': resolution: {integrity: sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw==} @@ -20131,7 +20131,7 @@ packages: resolution: {integrity: sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ==} peerDependencies: '@babel/core': ^7.0.0 - solid-js: 1.9.10 + solid-js: 1.9.12 peerDependenciesMeta: solid-js: optional: true @@ -20639,7 +20639,7 @@ packages: resolution: {integrity: sha512-DCKgtE1rzLUe2x3M7CzjFnN8q4e2ig7d/eudMkjyQOWzMyj19v52AL3JxKH1zpCxGFszQANygQvAltr9R99bfw==} engines: {node: '>=18', pnpm: '>=9.0.0'} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 convex@1.19.0: resolution: {integrity: sha512-TcglkEi392oK0Ah+zDoetFCRFXBM/lvCewi6AWfIgVCtVc9I/xdimdFOLN602V5wp7H4PN8wotpdIoixwSH7mQ==} @@ -21330,7 +21330,7 @@ packages: resolution: {integrity: sha512-V1FvDALwLDX6K0XNYM9CMRAnMzA0+Ecu55qBUT9q/eAJh1KIDsTMFoOzMSgyHqbOfvrVfO3Mws3z7TW2GVnIZA==} peerDependencies: esbuild: '>=0.20' - solid-js: 1.9.10 + solid-js: 1.9.12 esbuild-plugin-vue3@0.5.1: resolution: {integrity: sha512-rhTPImJ1Zi7FbVa4xWlu9dJdt+mqWxc9Z+AQd+ArbHHwtyQRe8FvER8gaTw0O6bNsBjAtU5rq0rpZEkP3QaThg==} @@ -24745,22 +24745,12 @@ packages: serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} - seroval-plugins@1.3.2: - resolution: {integrity: sha512-0QvCV2lM3aj/U3YozDiVwx9zpH0q8A60CTWIv4Jszj/givcudPb48B+rkU5D51NJ0pTpweGMttHjboPa9/zoIQ==} - engines: {node: '>=10'} - peerDependencies: - seroval: ^1.0 - seroval-plugins@1.5.0: resolution: {integrity: sha512-EAHqADIQondwRZIdeW2I636zgsODzoBDwb3PT/+7TLDWyw1Dy/Xv7iGUIEXXav7usHDE9HVhOU61irI3EnyyHA==} engines: {node: '>=10'} peerDependencies: seroval: ^1.0 - seroval@1.3.2: - resolution: {integrity: sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ==} - engines: {node: '>=10'} - seroval@1.5.0: resolution: {integrity: sha512-OE4cvmJ1uSPrKorFIH9/w/Qwuvi/IMcGbv5RKgcJ/zjA/IohDLU6SVaxFN9FwajbP7nsX0dQqMDes1whk3y+yw==} engines: {node: '>=10'} @@ -24888,18 +24878,18 @@ packages: sockjs@0.3.24: resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} - solid-js@1.9.10: - resolution: {integrity: sha512-Coz956cos/EPDlhs6+jsdTxKuJDPT7B5SVIWgABwROyxjY7Xbr8wkzD68Et+NxnV7DLJ3nJdAC2r9InuV/4Jew==} + solid-js@1.9.12: + resolution: {integrity: sha512-QzKaSJq2/iDrWR1As6MHZQ8fQkdOBf8GReYb7L5iKwMGceg7HxDcaOHk0at66tNgn9U2U7dXo8ZZpLIAmGMzgw==} solid-motionone@1.0.4: resolution: {integrity: sha512-aqEjgecoO9raDFznu/dEci7ORSmA26Kjj9J4Cn1Gyr0GZuOVdvsNxdxClTL9J40Aq/uYFx4GLwC8n70fMLHiuA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 solid-refresh@0.6.3: resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==} peerDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 sonic-boom@4.2.0: resolution: {integrity: sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==} @@ -26047,7 +26037,7 @@ packages: resolution: {integrity: sha512-Yr1dQybmtDtDAHkii6hXuc1oVH9CPcS/Zb2jN/P36qqcrkNnVPsMTzQ06jyzFPFjj3U1IYKMVt/9ZqcwGCEbjw==} peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* - solid-js: 1.9.10 + solid-js: 1.9.12 vite: ^8.0.0 peerDependenciesMeta: '@testing-library/jest-dom': @@ -26057,7 +26047,7 @@ packages: resolution: {integrity: sha512-YMZCXsLw9kyuvQFEdwLP27fuTQJLmjNoHy90AOJnbRuJ6DwShUxKFo38gdFrWn9v11hnGicKCZEaeI/TFs6JKw==} peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* - solid-js: 1.9.10 + solid-js: 1.9.12 vite: ^8.0.0 peerDependenciesMeta: '@testing-library/jest-dom': @@ -27450,9 +27440,9 @@ snapshots: '@colors/colors@1.6.0': {} - '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.10))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2)': + '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2)': dependencies: - better-auth: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.10) + better-auth: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) common-tags: 1.8.2 convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) convex-helpers: 0.1.104(@standard-schema/spec@1.0.0)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(typescript@6.0.2)(zod@3.25.57) @@ -31288,12 +31278,12 @@ snapshots: '@rspack/plugin-react-refresh': 1.0.1(react-refresh@0.16.0) react-refresh: 0.16.0 - '@rsbuild/plugin-solid@1.0.6(@babel/core@7.29.0)(@rsbuild/core@1.2.4)(solid-js@1.9.10)': + '@rsbuild/plugin-solid@1.0.6(@babel/core@7.29.0)(@rsbuild/core@1.2.4)(solid-js@1.9.12)': dependencies: '@rsbuild/core': 1.2.4 '@rsbuild/plugin-babel': 1.0.6(@rsbuild/core@1.2.4) - babel-preset-solid: 1.9.10(@babel/core@7.29.0)(solid-js@1.9.10) - solid-refresh: 0.6.3(solid-js@1.9.10) + babel-preset-solid: 1.9.10(@babel/core@7.29.0)(solid-js@1.9.12) + solid-refresh: 0.6.3(solid-js@1.9.12) transitivePeerDependencies: - '@babel/core' - solid-js @@ -31520,11 +31510,11 @@ snapshots: hoist-non-react-statics: 3.3.2 react: 19.2.3 - '@sentry/solid@10.32.0(@tanstack/solid-router@packages+solid-router)(solid-js@1.9.10)': + '@sentry/solid@10.32.0(@tanstack/solid-router@packages+solid-router)(solid-js@1.9.12)': dependencies: '@sentry/browser': 10.32.0 '@sentry/core': 10.32.0 - solid-js: 1.9.10 + solid-js: 1.9.12 optionalDependencies: '@tanstack/solid-router': link:packages/solid-router @@ -31582,176 +31572,176 @@ snapshots: color: 5.0.2 text-hex: 1.0.0 - '@solid-devtools/debugger@0.26.0(solid-js@1.9.10)': + '@solid-devtools/debugger@0.26.0(solid-js@1.9.12)': dependencies: '@nothing-but/utils': 0.17.0 - '@solid-devtools/shared': 0.19.0(solid-js@1.9.10) - '@solid-primitives/bounds': 0.0.122(solid-js@1.9.10) - '@solid-primitives/cursor': 0.0.115(solid-js@1.9.10) - '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.10) - '@solid-primitives/keyboard': 1.3.0(solid-js@1.9.10) - '@solid-primitives/platform': 0.1.2(solid-js@1.9.10) - '@solid-primitives/rootless': 1.5.0(solid-js@1.9.10) - '@solid-primitives/scheduled': 1.5.0(solid-js@1.9.10) - '@solid-primitives/static-store': 0.0.8(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-devtools/shared': 0.19.0(solid-js@1.9.12) + '@solid-primitives/bounds': 0.0.122(solid-js@1.9.12) + '@solid-primitives/cursor': 0.0.115(solid-js@1.9.12) + '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.12) + '@solid-primitives/keyboard': 1.3.0(solid-js@1.9.12) + '@solid-primitives/platform': 0.1.2(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.0(solid-js@1.9.12) + '@solid-primitives/scheduled': 1.5.0(solid-js@1.9.12) + '@solid-primitives/static-store': 0.0.8(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-devtools/logger@0.9.7(solid-js@1.9.10)': + '@solid-devtools/logger@0.9.7(solid-js@1.9.12)': dependencies: '@nothing-but/utils': 0.17.0 - '@solid-devtools/debugger': 0.26.0(solid-js@1.9.10) - '@solid-devtools/shared': 0.19.0(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-devtools/debugger': 0.26.0(solid-js@1.9.12) + '@solid-devtools/shared': 0.19.0(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-devtools/shared@0.19.0(solid-js@1.9.10)': + '@solid-devtools/shared@0.19.0(solid-js@1.9.12)': dependencies: '@nothing-but/utils': 0.17.0 - '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.10) - '@solid-primitives/media': 2.3.0(solid-js@1.9.10) - '@solid-primitives/refs': 1.1.0(solid-js@1.9.10) - '@solid-primitives/rootless': 1.5.0(solid-js@1.9.10) - '@solid-primitives/scheduled': 1.5.0(solid-js@1.9.10) - '@solid-primitives/static-store': 0.0.8(solid-js@1.9.10) - '@solid-primitives/styles': 0.0.114(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.12) + '@solid-primitives/media': 2.3.0(solid-js@1.9.12) + '@solid-primitives/refs': 1.1.0(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.0(solid-js@1.9.12) + '@solid-primitives/scheduled': 1.5.0(solid-js@1.9.12) + '@solid-primitives/static-store': 0.0.8(solid-js@1.9.12) + '@solid-primitives/styles': 0.0.114(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/bounds@0.0.122(solid-js@1.9.10)': + '@solid-primitives/bounds@0.0.122(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.10) - '@solid-primitives/resize-observer': 2.1.0(solid-js@1.9.10) - '@solid-primitives/static-store': 0.0.8(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.12) + '@solid-primitives/resize-observer': 2.1.0(solid-js@1.9.12) + '@solid-primitives/static-store': 0.0.8(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/context@0.3.2(solid-js@1.9.10)': + '@solid-primitives/context@0.3.2(solid-js@1.9.12)': dependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 - '@solid-primitives/cursor@0.0.115(solid-js@1.9.10)': + '@solid-primitives/cursor@0.0.115(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/event-listener@2.4.0(solid-js@1.9.10)': + '@solid-primitives/event-listener@2.4.0(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/event-listener@2.4.3(solid-js@1.9.10)': + '@solid-primitives/event-listener@2.4.3(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/keyboard@1.3.0(solid-js@1.9.10)': + '@solid-primitives/keyboard@1.3.0(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.10) - '@solid-primitives/rootless': 1.5.0(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.0(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/keyboard@1.3.3(solid-js@1.9.10)': + '@solid-primitives/keyboard@1.3.3(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.10) - '@solid-primitives/rootless': 1.5.2(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.2(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.2(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/media@2.3.0(solid-js@1.9.10)': + '@solid-primitives/media@2.3.0(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.10) - '@solid-primitives/rootless': 1.5.0(solid-js@1.9.10) - '@solid-primitives/static-store': 0.1.0(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.0(solid-js@1.9.12) + '@solid-primitives/static-store': 0.1.0(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/platform@0.1.2(solid-js@1.9.10)': + '@solid-primitives/platform@0.1.2(solid-js@1.9.12)': dependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 - '@solid-primitives/props@3.2.2(solid-js@1.9.10)': + '@solid-primitives/props@3.2.2(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/refs@1.1.0(solid-js@1.9.10)': + '@solid-primitives/refs@1.1.0(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/resize-observer@2.1.0(solid-js@1.9.10)': + '@solid-primitives/resize-observer@2.1.0(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.10) - '@solid-primitives/rootless': 1.5.0(solid-js@1.9.10) - '@solid-primitives/static-store': 0.1.0(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.2(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/event-listener': 2.4.0(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.0(solid-js@1.9.12) + '@solid-primitives/static-store': 0.1.0(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/resize-observer@2.1.3(solid-js@1.9.10)': + '@solid-primitives/resize-observer@2.1.3(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.10) - '@solid-primitives/rootless': 1.5.2(solid-js@1.9.10) - '@solid-primitives/static-store': 0.1.2(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.2(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.12) + '@solid-primitives/rootless': 1.5.2(solid-js@1.9.12) + '@solid-primitives/static-store': 0.1.2(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/rootless@1.5.0(solid-js@1.9.10)': + '@solid-primitives/rootless@1.5.0(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/rootless@1.5.2(solid-js@1.9.10)': + '@solid-primitives/rootless@1.5.2(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/scheduled@1.5.0(solid-js@1.9.10)': + '@solid-primitives/scheduled@1.5.0(solid-js@1.9.12)': dependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 - '@solid-primitives/static-store@0.0.8(solid-js@1.9.10)': + '@solid-primitives/static-store@0.0.8(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/static-store@0.1.0(solid-js@1.9.10)': + '@solid-primitives/static-store@0.1.0(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/static-store@0.1.2(solid-js@1.9.10)': + '@solid-primitives/static-store@0.1.2(solid-js@1.9.12)': dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/utils': 6.3.2(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/styles@0.0.114(solid-js@1.9.10)': + '@solid-primitives/styles@0.0.114(solid-js@1.9.12)': dependencies: - '@solid-primitives/rootless': 1.5.0(solid-js@1.9.10) - '@solid-primitives/utils': 6.3.0(solid-js@1.9.10) - solid-js: 1.9.10 + '@solid-primitives/rootless': 1.5.0(solid-js@1.9.12) + '@solid-primitives/utils': 6.3.0(solid-js@1.9.12) + solid-js: 1.9.12 - '@solid-primitives/transition-group@1.1.2(solid-js@1.9.10)': + '@solid-primitives/transition-group@1.1.2(solid-js@1.9.12)': dependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 - '@solid-primitives/utils@6.3.0(solid-js@1.9.10)': + '@solid-primitives/utils@6.3.0(solid-js@1.9.12)': dependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 - '@solid-primitives/utils@6.3.2(solid-js@1.9.10)': + '@solid-primitives/utils@6.3.2(solid-js@1.9.12)': dependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 - '@solidjs/meta@0.29.4(solid-js@1.9.10)': + '@solidjs/meta@0.29.4(solid-js@1.9.12)': dependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 - '@solidjs/testing-library@0.8.10(solid-js@1.9.10)': + '@solidjs/testing-library@0.8.10(solid-js@1.9.12)': dependencies: '@testing-library/dom': 10.4.1 - solid-js: 1.9.10 + solid-js: 1.9.12 '@speed-highlight/core@1.2.14': {} @@ -32016,46 +32006,46 @@ snapshots: '@tanstack/devtools-event-client@0.3.4': {} - '@tanstack/devtools-ui@0.3.5(csstype@3.2.3)(solid-js@1.9.10)': + '@tanstack/devtools-ui@0.3.5(csstype@3.2.3)(solid-js@1.9.12)': dependencies: clsx: 2.1.1 goober: 2.1.16(csstype@3.2.3) - solid-js: 1.9.10 + solid-js: 1.9.12 transitivePeerDependencies: - csstype - '@tanstack/devtools-ui@0.4.4(csstype@3.2.3)(solid-js@1.9.10)': + '@tanstack/devtools-ui@0.4.4(csstype@3.2.3)(solid-js@1.9.12)': dependencies: clsx: 2.1.1 goober: 2.1.16(csstype@3.2.3) - solid-js: 1.9.10 + solid-js: 1.9.12 transitivePeerDependencies: - csstype - '@tanstack/devtools@0.6.14(csstype@3.2.3)(solid-js@1.9.10)': + '@tanstack/devtools@0.6.14(csstype@3.2.3)(solid-js@1.9.12)': dependencies: - '@solid-primitives/keyboard': 1.3.0(solid-js@1.9.10) + '@solid-primitives/keyboard': 1.3.0(solid-js@1.9.12) '@tanstack/devtools-event-bus': 0.3.2 - '@tanstack/devtools-ui': 0.3.5(csstype@3.2.3)(solid-js@1.9.10) + '@tanstack/devtools-ui': 0.3.5(csstype@3.2.3)(solid-js@1.9.12) clsx: 2.1.1 goober: 2.1.16(csstype@3.2.3) - solid-js: 1.9.10 + solid-js: 1.9.12 transitivePeerDependencies: - bufferutil - csstype - utf-8-validate - '@tanstack/devtools@0.8.1(csstype@3.2.3)(solid-js@1.9.10)': + '@tanstack/devtools@0.8.1(csstype@3.2.3)(solid-js@1.9.12)': dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.10) - '@solid-primitives/keyboard': 1.3.3(solid-js@1.9.10) - '@solid-primitives/resize-observer': 2.1.3(solid-js@1.9.10) + '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.12) + '@solid-primitives/keyboard': 1.3.3(solid-js@1.9.12) + '@solid-primitives/resize-observer': 2.1.3(solid-js@1.9.12) '@tanstack/devtools-client': 0.0.4 '@tanstack/devtools-event-bus': 0.3.3 - '@tanstack/devtools-ui': 0.4.4(csstype@3.2.3)(solid-js@1.9.10) + '@tanstack/devtools-ui': 0.4.4(csstype@3.2.3)(solid-js@1.9.12) clsx: 2.1.1 goober: 2.1.16(csstype@3.2.3) - solid-js: 1.9.10 + solid-js: 1.9.12 transitivePeerDependencies: - bufferutil - csstype @@ -32109,9 +32099,9 @@ snapshots: '@tanstack/query-devtools@5.91.1': {} - '@tanstack/react-devtools@0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.10)': + '@tanstack/react-devtools@0.7.0(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(csstype@3.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)': dependencies: - '@tanstack/devtools': 0.6.14(csstype@3.2.3)(solid-js@1.9.10) + '@tanstack/devtools': 0.6.14(csstype@3.2.3)(solid-js@1.9.12) '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) react: 19.2.3 @@ -32152,30 +32142,30 @@ snapshots: react: 19.2.3 react-dom: 19.2.3(react@19.2.3) - '@tanstack/solid-devtools@0.7.14(csstype@3.2.3)(solid-js@1.9.10)': + '@tanstack/solid-devtools@0.7.14(csstype@3.2.3)(solid-js@1.9.12)': dependencies: - '@tanstack/devtools': 0.8.1(csstype@3.2.3)(solid-js@1.9.10) - solid-js: 1.9.10 + '@tanstack/devtools': 0.8.1(csstype@3.2.3)(solid-js@1.9.12) + solid-js: 1.9.12 transitivePeerDependencies: - bufferutil - csstype - utf-8-validate - '@tanstack/solid-query-devtools@5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.10))(solid-js@1.9.10)': + '@tanstack/solid-query-devtools@5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12)': dependencies: '@tanstack/query-devtools': 5.90.1 - '@tanstack/solid-query': 5.90.9(solid-js@1.9.10) - solid-js: 1.9.10 + '@tanstack/solid-query': 5.90.9(solid-js@1.9.12) + solid-js: 1.9.12 - '@tanstack/solid-query@5.90.9(solid-js@1.9.10)': + '@tanstack/solid-query@5.90.9(solid-js@1.9.12)': dependencies: '@tanstack/query-core': 5.90.20 - solid-js: 1.9.10 + solid-js: 1.9.12 - '@tanstack/solid-virtual@3.13.12(solid-js@1.9.10)': + '@tanstack/solid-virtual@3.13.12(solid-js@1.9.12)': dependencies: '@tanstack/virtual-core': 3.13.12 - solid-js: 1.9.10 + solid-js: 1.9.12 '@tanstack/store@0.9.3': {} @@ -34131,19 +34121,19 @@ snapshots: transitivePeerDependencies: - supports-color - babel-preset-solid@1.9.10(@babel/core@7.28.5)(solid-js@1.9.10): + babel-preset-solid@1.9.10(@babel/core@7.28.5)(solid-js@1.9.12): dependencies: '@babel/core': 7.28.5 babel-plugin-jsx-dom-expressions: 0.40.3(@babel/core@7.28.5) optionalDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 - babel-preset-solid@1.9.10(@babel/core@7.29.0)(solid-js@1.9.10): + babel-preset-solid@1.9.10(@babel/core@7.29.0)(solid-js@1.9.12): dependencies: '@babel/core': 7.29.0 babel-plugin-jsx-dom-expressions: 0.40.3(@babel/core@7.29.0) optionalDependencies: - solid-js: 1.9.10 + solid-js: 1.9.12 balanced-match@1.0.2: {} @@ -34167,7 +34157,7 @@ snapshots: jsonpointer: 5.0.1 leven: 3.1.0 - better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.10): + better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12): dependencies: '@better-auth/core': 1.3.27 '@better-auth/utils': 0.3.0 @@ -34185,7 +34175,7 @@ snapshots: optionalDependencies: react: 19.2.3 react-dom: 19.2.3(react@19.2.3) - solid-js: 1.9.10 + solid-js: 1.9.12 better-call@1.0.19: dependencies: @@ -34690,11 +34680,11 @@ snapshots: typescript: 6.0.2 zod: 3.25.57 - convex-solidjs@0.0.3(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3)(solid-js@1.9.10): + convex-solidjs@0.0.3(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3)(solid-js@1.9.12): dependencies: - '@solid-primitives/context': 0.3.2(solid-js@1.9.10) + '@solid-primitives/context': 0.3.2(solid-js@1.9.12) convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) - solid-js: 1.9.10 + solid-js: 1.9.12 transitivePeerDependencies: - '@auth0/auth0-react' - '@clerk/clerk-react' @@ -35310,13 +35300,13 @@ snapshots: has-tostringtag: 1.0.2 hasown: 2.0.2 - esbuild-plugin-solid@0.6.0(esbuild@0.27.4)(solid-js@1.9.10): + esbuild-plugin-solid@0.6.0(esbuild@0.27.4)(solid-js@1.9.12): dependencies: '@babel/core': 7.28.5 '@babel/preset-typescript': 7.27.1(@babel/core@7.28.5) - babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.10) + babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.12) esbuild: 0.27.4 - solid-js: 1.9.10 + solid-js: 1.9.12 transitivePeerDependencies: - supports-color @@ -39446,16 +39436,10 @@ snapshots: dependencies: randombytes: 2.1.0 - seroval-plugins@1.3.2(seroval@1.3.2): - dependencies: - seroval: 1.3.2 - seroval-plugins@1.5.0(seroval@1.5.0): dependencies: seroval: 1.5.0 - seroval@1.3.2: {} - seroval@1.5.0: {} serve-index@1.9.1: @@ -39659,28 +39643,28 @@ snapshots: uuid: 8.3.2 websocket-driver: 0.7.4 - solid-js@1.9.10: + solid-js@1.9.12: dependencies: csstype: 3.2.3 - seroval: 1.3.2 - seroval-plugins: 1.3.2(seroval@1.3.2) + seroval: 1.5.0 + seroval-plugins: 1.5.0(seroval@1.5.0) - solid-motionone@1.0.4(solid-js@1.9.10): + solid-motionone@1.0.4(solid-js@1.9.12): dependencies: '@motionone/dom': 10.18.0 '@motionone/utils': 10.18.0 - '@solid-primitives/props': 3.2.2(solid-js@1.9.10) - '@solid-primitives/refs': 1.1.0(solid-js@1.9.10) - '@solid-primitives/transition-group': 1.1.2(solid-js@1.9.10) + '@solid-primitives/props': 3.2.2(solid-js@1.9.12) + '@solid-primitives/refs': 1.1.0(solid-js@1.9.12) + '@solid-primitives/transition-group': 1.1.2(solid-js@1.9.12) csstype: 3.1.3 - solid-js: 1.9.10 + solid-js: 1.9.12 - solid-refresh@0.6.3(solid-js@1.9.10): + solid-refresh@0.6.3(solid-js@1.9.12): dependencies: '@babel/generator': 7.28.5 '@babel/helper-module-imports': 7.27.1 '@babel/types': 7.29.0 - solid-js: 1.9.10 + solid-js: 1.9.12 transitivePeerDependencies: - supports-color @@ -40558,14 +40542,14 @@ snapshots: dependencies: vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)): + vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)): dependencies: '@babel/core': 7.28.5 '@types/babel__core': 7.20.5 - babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.10) + babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.12) merge-anything: 5.1.7 - solid-js: 1.9.10 - solid-refresh: 0.6.3(solid-js@1.9.10) + solid-js: 1.9.12 + solid-refresh: 0.6.3(solid-js@1.9.12) vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vitefu: 1.1.1(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) optionalDependencies: @@ -40573,14 +40557,14 @@ snapshots: transitivePeerDependencies: - supports-color - vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.10)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)): + vite-plugin-solid@2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)): dependencies: '@babel/core': 7.28.5 '@types/babel__core': 7.20.5 - babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.10) + babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.12) merge-anything: 5.1.7 - solid-js: 1.9.10 - solid-refresh: 0.6.3(solid-js@1.9.10) + solid-js: 1.9.12 + solid-refresh: 0.6.3(solid-js@1.9.12) vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vitefu: 1.1.1(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) optionalDependencies: From 3d4b15b4ea77fc99b9df285ea9c54b922709852c Mon Sep 17 00:00:00 2001 From: Birk Skyum <74932975+birkskyum@users.noreply.github.com> Date: Thu, 16 Apr 2026 21:22:12 +0200 Subject: [PATCH 009/597] chore: bump query override to 5.99.0 (#7203) --- package.json | 10 +- .../src/client/hydrateStart.ts | 6 +- pnpm-lock.yaml | 462 +++++++++--------- 3 files changed, 234 insertions(+), 244 deletions(-) diff --git a/package.json b/package.json index 134fbdb11b..8c007f88fe 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,10 @@ "@swc-node/core": "^1.14.1", "@swc-node/register": "^1.11.1", "@tanstack/eslint-config": "0.4.0", - "@tanstack/query-core": "^5.90.19", - "@tanstack/react-query": "^5.90.19", + "@tanstack/query-core": "^5.99.0", + "@tanstack/react-query": "^5.99.0", + "@tanstack/solid-query": "^5.99.0", + "@tanstack/vue-query": "^5.99.0", "@tanstack/vite-config": "0.5.2", "@types/node": "25.0.9", "@types/react": "^19.2.8", @@ -97,8 +99,10 @@ "vite": "$vite", "@types/node": "$@types/node", "@playwright/test": "$@playwright/test", - "@tanstack/react-query": "$@tanstack/react-query", "@tanstack/query-core": "$@tanstack/query-core", + "@tanstack/react-query": "$@tanstack/react-query", + "@tanstack/solid-query": "$@tanstack/solid-query", + "@tanstack/vue-query": "$@tanstack/vue-query", "@tanstack/history": "workspace:*", "@tanstack/router-core": "workspace:*", "@tanstack/react-router": "workspace:*", diff --git a/packages/start-client-core/src/client/hydrateStart.ts b/packages/start-client-core/src/client/hydrateStart.ts index 3b0ca44cee..20ca5b1b0d 100644 --- a/packages/start-client-core/src/client/hydrateStart.ts +++ b/packages/start-client-core/src/client/hydrateStart.ts @@ -1,14 +1,14 @@ import { hydrate } from '@tanstack/router-core/ssr/client' +import { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter' +import type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core' +import type { AnyStartInstanceOptions } from '../createStart' import { startInstance } from '#tanstack-start-entry' import { hasPluginAdapters, pluginSerializationAdapters, } from '#tanstack-start-plugin-adapters' import { getRouter } from '#tanstack-router-entry' -import { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter' -import type { AnyStartInstanceOptions } from '../createStart' -import type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core' export async function hydrateStart(): Promise { const router = await getRouter() diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 574249703f..4cd1c6b677 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,8 +16,10 @@ overrides: vite: ^8.0.0 '@types/node': 25.0.9 '@playwright/test': ^1.57.0 - '@tanstack/react-query': ^5.90.19 - '@tanstack/query-core': ^5.90.19 + '@tanstack/query-core': ^5.99.0 + '@tanstack/react-query': ^5.99.0 + '@tanstack/solid-query': ^5.99.0 + '@tanstack/vue-query': ^5.99.0 '@tanstack/history': workspace:* '@tanstack/router-core': workspace:* '@tanstack/react-router': workspace:* @@ -90,14 +92,20 @@ importers: specifier: 0.4.0 version: 0.4.0(@typescript-eslint/utils@8.57.1(eslint@9.22.0(jiti@2.6.1))(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@9.22.0(jiti@2.6.1))(typescript@6.0.2) '@tanstack/query-core': - specifier: ^5.90.19 - version: 5.90.20 + specifier: ^5.99.0 + version: 5.99.0 '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) + '@tanstack/solid-query': + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/vite-config': specifier: 0.5.2 version: 0.5.2(@types/node@25.0.9)(typescript@6.0.2)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + '@tanstack/vue-query': + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@6.0.2)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -626,11 +634,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -675,11 +683,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1552,11 +1560,11 @@ importers: e2e/react-start/basic-react-query: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2179,11 +2187,11 @@ importers: e2e/react-start/query-integration: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2301,11 +2309,11 @@ importers: e2e/react-start/rsc-query: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2530,8 +2538,8 @@ importers: e2e/react-start/server-functions: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2655,8 +2663,8 @@ importers: e2e/react-start/server-routes: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2958,8 +2966,8 @@ importers: e2e/react-start/streaming-ssr: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3403,11 +3411,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -3446,11 +3454,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4080,11 +4088,11 @@ importers: e2e/solid-start/basic-solid-query: dependencies: '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4334,11 +4342,11 @@ importers: e2e/solid-start/query-integration: dependencies: '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4527,8 +4535,8 @@ importers: e2e/solid-start/server-functions: dependencies: '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4594,8 +4602,8 @@ importers: e2e/solid-start/server-routes: dependencies: '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4848,11 +4856,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/vue-query': - specifier: ^5.90.0 - version: 5.92.0(vue@3.5.25(typescript@5.8.3)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) + version: 6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -5169,11 +5177,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes '@tanstack/vue-query': - specifier: ^5.90.0 - version: 5.92.0(vue@3.5.25(typescript@5.8.3)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) + version: 6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -5224,11 +5232,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes '@tanstack/vue-query': - specifier: ^5.90.0 - version: 5.92.0(vue@3.5.25(typescript@5.8.3)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) + version: 6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -5273,11 +5281,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/vue-query': - specifier: ^5.90.0 - version: 5.92.0(vue@3.5.25(typescript@5.8.3)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) + version: 6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -5325,11 +5333,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/vue-query': - specifier: ^5.90.0 - version: 5.92.0(vue@3.5.25(typescript@5.8.3)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) + version: 6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -5426,11 +5434,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/vue-query': - specifier: ^5.90.0 - version: 5.92.0(vue@3.5.25(typescript@6.0.2)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2)) + version: 6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -5683,11 +5691,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/vue-query': - specifier: ^5.90.0 - version: 5.92.0(vue@3.5.25(typescript@5.8.3)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) + version: 6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6015,11 +6023,11 @@ importers: e2e/vue-start/basic-vue-query: dependencies: '@tanstack/vue-query': - specifier: ^5.92.1 - version: 5.92.1(vue@3.5.25(typescript@6.0.2)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-query-devtools': specifier: ^6.1.2 - version: 6.1.2(@tanstack/vue-query@5.92.1(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2)) + version: 6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6177,11 +6185,11 @@ importers: e2e/vue-start/query-integration: dependencies: '@tanstack/vue-query': - specifier: ^5.90.0 - version: 5.92.0(vue@3.5.25(typescript@6.0.2)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-query-devtools': specifier: ^5.90.0 - version: 5.91.0(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2)) + version: 5.91.0(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6385,8 +6393,8 @@ importers: e2e/vue-start/server-functions: dependencies: '@tanstack/vue-query': - specifier: ^5.90.9 - version: 5.92.0(vue@3.5.25(typescript@6.0.2)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6455,8 +6463,8 @@ importers: e2e/vue-start/server-routes: dependencies: '@tanstack/vue-query': - specifier: ^5.90.9 - version: 5.92.0(vue@3.5.25(typescript@6.0.2)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6856,8 +6864,8 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -6903,7 +6911,7 @@ importers: version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query-devtools': specifier: ^5.67.2 - version: 5.67.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.67.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7031,11 +7039,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7077,11 +7085,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7506,11 +7514,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7558,11 +7566,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7613,8 +7621,8 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7665,8 +7673,8 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7708,8 +7716,8 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -7954,11 +7962,11 @@ importers: examples/react/router-monorepo-react-query: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8009,8 +8017,8 @@ importers: specifier: workspace:* version: link:../router '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) react: specifier: ^19.2.3 version: 19.2.3 @@ -8055,8 +8063,8 @@ importers: specifier: workspace:* version: link:../router '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) react: specifier: ^19.2.3 version: 19.2.3 @@ -8086,8 +8094,8 @@ importers: examples/react/router-monorepo-react-query/packages/post-query: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8114,8 +8122,8 @@ importers: specifier: workspace:* version: link:../../../../../packages/history '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../../../packages/react-router @@ -8289,8 +8297,8 @@ importers: specifier: workspace:* version: link:../router '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) react: specifier: ^19.2.3 version: 19.2.3 @@ -8526,8 +8534,8 @@ importers: specifier: workspace:* version: link:../../../packages/arktype-adapter '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8844,11 +8852,11 @@ importers: examples/react/start-basic-react-query: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9086,13 +9094,13 @@ importers: dependencies: '@convex-dev/react-query': specifier: 0.0.0-alpha.8 - version: 0.0.0-alpha.8(@tanstack/react-query@5.90.20(react@19.2.3))(convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) + version: 0.0.0-alpha.8(@tanstack/react-query@5.99.0(react@19.2.3))(convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9250,8 +9258,8 @@ importers: examples/react/start-large: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9559,11 +9567,11 @@ importers: examples/react/start-trellaux: dependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9822,11 +9830,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3) + version: 5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9844,7 +9852,7 @@ importers: version: 11.4.3(typescript@6.0.2) '@trpc/tanstack-react-query': specifier: ^11.4.3 - version: 11.4.3(@tanstack/react-query@5.90.20(react@19.2.3))(@trpc/client@11.4.3(@trpc/server@11.4.3(typescript@6.0.2))(typescript@6.0.2))(@trpc/server@11.4.3(typescript@6.0.2))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2) + version: 11.4.3(@tanstack/react-query@5.99.0(react@19.2.3))(@trpc/client@11.4.3(@trpc/server@11.4.3(typescript@6.0.2))(typescript@6.0.2))(@trpc/server@11.4.3(typescript@6.0.2))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2) express: specifier: ^4.21.2 version: 4.21.2 @@ -10006,8 +10014,8 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10148,11 +10156,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10188,11 +10196,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10548,11 +10556,11 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10594,11 +10602,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10640,8 +10648,8 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10677,8 +10685,8 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -10711,8 +10719,8 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11004,11 +11012,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11081,8 +11089,8 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11385,11 +11393,11 @@ importers: examples/solid/start-basic-solid-query: dependencies: '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-query-devtools': specifier: ^5.90.0 - version: 5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12) + version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -11545,7 +11553,7 @@ importers: dependencies: '@convex-dev/better-auth': specifier: ^0.9.7 - version: 0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2) + version: 0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) @@ -11560,7 +11568,7 @@ importers: version: link:../../../packages/solid-start better-auth: specifier: ^1.3.27 - version: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) + version: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -11685,8 +11693,8 @@ importers: examples/solid/start-large: dependencies: '@tanstack/solid-query': - specifier: ^5.90.9 - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: ^1.168.19 version: link:../../../packages/solid-router @@ -12266,15 +12274,15 @@ importers: packages/react-router-ssr-query: dependencies: '@tanstack/query-core': - specifier: ^5.90.19 - version: 5.90.20 + specifier: ^5.99.0 + version: 5.99.0 '@tanstack/router-ssr-query-core': specifier: workspace:* version: link:../router-ssr-query-core devDependencies: '@tanstack/react-query': - specifier: ^5.90.19 - version: 5.90.20(react@19.2.3) + specifier: ^5.99.0 + version: 5.99.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../react-router @@ -12670,8 +12678,8 @@ importers: packages/router-ssr-query-core: devDependencies: '@tanstack/query-core': - specifier: ^5.90.19 - version: 5.90.20 + specifier: ^5.99.0 + version: 5.99.0 '@tanstack/router-core': specifier: workspace:* version: link:../router-core @@ -12815,15 +12823,15 @@ importers: packages/solid-router-ssr-query: dependencies: '@tanstack/query-core': - specifier: ^5.90.19 - version: 5.90.20 + specifier: ^5.99.0 + version: 5.99.0 '@tanstack/router-ssr-query-core': specifier: workspace:* version: link:../router-ssr-query-core devDependencies: '@tanstack/solid-query': - specifier: '>=5.90.0' - version: 5.90.9(solid-js@1.9.12) + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': specifier: workspace:* version: link:../solid-router @@ -13249,15 +13257,15 @@ importers: packages/vue-router-ssr-query: dependencies: '@tanstack/query-core': - specifier: ^5.90.19 - version: 5.90.20 + specifier: ^5.99.0 + version: 5.99.0 '@tanstack/router-ssr-query-core': specifier: workspace:* version: link:../router-ssr-query-core devDependencies: '@tanstack/vue-query': - specifier: ^5.92.0 - version: 5.92.0(vue@3.5.25(typescript@6.0.2)) + specifier: ^5.99.0 + version: 5.99.0(vue@3.5.25(typescript@6.0.2)) '@tanstack/vue-router': specifier: workspace:* version: link:../vue-router @@ -13999,7 +14007,7 @@ packages: '@convex-dev/react-query@0.0.0-alpha.8': resolution: {integrity: sha512-Rv/q7/CplU75f7ckBd2vh+HoeeQ0tOrjwMl14Hk7D/03e55oUIU0TV5JYYzC79ZQyyAtoj7CmCo5ZxcmtKNv1Q==} peerDependencies: - '@tanstack/react-query': ^5.90.19 + '@tanstack/react-query': ^5.99.0 convex: ^1.17.0 '@cspotcode/source-map-support@0.8.1': @@ -18770,8 +18778,8 @@ packages: resolution: {integrity: sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==} engines: {node: '>=12'} - '@tanstack/query-core@5.90.20': - resolution: {integrity: sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==} + '@tanstack/query-core@5.99.0': + resolution: {integrity: sha512-3Jv3WQG0BCcH7G+7lf/bP8QyBfJOXeY+T08Rin3GZ1bshvwlbPt7NrDHMEzGdKIOmOzvIQmxjk28YEQX60k7pQ==} '@tanstack/query-devtools@5.67.2': resolution: {integrity: sha512-O4QXFFd7xqp6EX7sdvc9tsVO8nm4lpWBqwpgjpVLW5g7IeOY6VnS/xvs/YzbRhBVkKTMaJMOUGU7NhSX+YGoNg==} @@ -18794,17 +18802,17 @@ packages: '@tanstack/react-query-devtools@5.67.2': resolution: {integrity: sha512-cmj2DxBc+/9btQ66n5xI8wTtAma2BLVa403K7zIYiguzJ/kV201jnGensYqJeu1Rd8uRMLLRM74jLVMLDWNRJA==} peerDependencies: - '@tanstack/react-query': ^5.90.19 + '@tanstack/react-query': ^5.99.0 react: ^19.2.3 '@tanstack/react-query-devtools@5.90.2': resolution: {integrity: sha512-vAXJzZuBXtCQtrY3F/yUNJCV4obT/A/n81kb3+YqLbro5Z2+phdAbceO+deU3ywPw8B42oyJlp4FhO0SoivDFQ==} peerDependencies: - '@tanstack/react-query': ^5.90.19 + '@tanstack/react-query': ^5.99.0 react: ^19.2.3 - '@tanstack/react-query@5.90.20': - resolution: {integrity: sha512-vXBxa+qeyveVO7OA0jX1z+DeyCA4JKnThKv411jd5SORpBKgkcVnYKCiBgECvADvniBX7tobwBmg01qq9JmMJw==} + '@tanstack/react-query@5.99.0': + resolution: {integrity: sha512-OY2bCqPemT1LlqJ8Y2CUau4KELnIhhG9Ol3ZndPbdnB095pRbPo1cHuXTndg8iIwtoHTgwZjyaDnQ0xD0mYwAw==} peerDependencies: react: ^19.2.3 @@ -18829,11 +18837,11 @@ packages: '@tanstack/solid-query-devtools@5.90.4': resolution: {integrity: sha512-ygyAiXZ+NR1tw33jVibpjiWB1IoAQWCeqSLmO/6PoSWrI9yDTwaPNAXheniEMrO6/a/vTQq2tB4N+FPNjhGaNw==} peerDependencies: - '@tanstack/solid-query': ^5.90.4 + '@tanstack/solid-query': ^5.99.0 solid-js: 1.9.12 - '@tanstack/solid-query@5.90.9': - resolution: {integrity: sha512-OF+FpTHPmZxF5M0zcEERtUA0DhuFdNOpn0EAbASarDfIuNrvi8k07dhYV5zYyYwkt+eoe/RnAX65PdSP+Y0ONw==} + '@tanstack/solid-query@5.99.0': + resolution: {integrity: sha512-XZxt95MYWivATb6ykmUobhtzR0l8uW3CNQt7FKkV1AgMR8YDirDoHoXBbNGRQidN30g3lqDxgFWdbi6HrZqDdg==} peerDependencies: solid-js: 1.9.12 @@ -18863,26 +18871,17 @@ packages: '@tanstack/vue-query-devtools@5.91.0': resolution: {integrity: sha512-Kn6p5ffEKUj+YGEP+BapoPI8kUiPtNnFDyzjTvUx6GHbyfzfefQPhYoRtFiWeyrGHjUB/Mvtnr7Rosbzs/ngVg==} peerDependencies: - '@tanstack/vue-query': ^5.90.5 + '@tanstack/vue-query': ^5.99.0 vue: ^3.3.0 '@tanstack/vue-query-devtools@6.1.2': resolution: {integrity: sha512-1E886RHorY432aOJU3dyzLbI67PhqQzvAPQyp8hU6UR4EVXKZSVzVT0O0utmTT2jnBpbbUiCFt2uNSs8W3grHw==} peerDependencies: - '@tanstack/vue-query': ^5.92.0 + '@tanstack/vue-query': ^5.99.0 vue: ^3.3.0 - '@tanstack/vue-query@5.92.0': - resolution: {integrity: sha512-4DcB+vkYjYtrysrZLnoPTz2/N/1pPtJm9j1dat+/bp7lvMGAiedJIsIlnrusIlRVV2OeU5SKZy7PhwcX1U4stw==} - peerDependencies: - '@vue/composition-api': ^1.1.2 - vue: ^2.6.0 || ^3.3.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - - '@tanstack/vue-query@5.92.1': - resolution: {integrity: sha512-m672jBiwK6sv1HHFF7Q3XsLUVKejzjEAMDqhFgLXIVtmwSayUo0WnhNQmlBlcHRKCR/Lw5jmIh6iu08ZXBh4ag==} + '@tanstack/vue-query@5.99.0': + resolution: {integrity: sha512-okrHNkouasL5cjo7O8hUxul22DiIL335KUQus/cfoAdCOUytF/OIv3BpNDevfqE6zHqqJ651Fb9OkUJPUCL0ZQ==} peerDependencies: '@vue/composition-api': ^1.1.2 vue: ^2.6.0 || ^3.3.0 @@ -18970,7 +18969,7 @@ packages: '@trpc/tanstack-react-query@11.4.3': resolution: {integrity: sha512-aYPp12wE9IrakccGWoQU/waZuWr3FLw9RtagsqJmX9NKHpQOVzoDvHA1W0amwyTQSAfL98Bn5rWmD7KTdr5AWg==} peerDependencies: - '@tanstack/react-query': ^5.90.19 + '@tanstack/react-query': ^5.99.0 '@trpc/client': 11.4.3 '@trpc/server': 11.4.3 react: ^19.2.3 @@ -27440,9 +27439,9 @@ snapshots: '@colors/colors@1.6.0': {} - '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2)': + '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2)': dependencies: - better-auth: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) + better-auth: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)) common-tags: 1.8.2 convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) convex-helpers: 0.1.104(@standard-schema/spec@1.0.0)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(typescript@6.0.2)(zod@3.25.57) @@ -27458,9 +27457,9 @@ snapshots: - hono - typescript - '@convex-dev/react-query@0.0.0-alpha.8(@tanstack/react-query@5.90.20(react@19.2.3))(convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3))': + '@convex-dev/react-query@0.0.0-alpha.8(@tanstack/react-query@5.99.0(react@19.2.3))(convex@1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3))': dependencies: - '@tanstack/react-query': 5.90.20(react@19.2.3) + '@tanstack/react-query': 5.99.0(react@19.2.3) convex: 1.19.0(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@cspotcode/source-map-support@0.8.1': @@ -32091,7 +32090,7 @@ snapshots: dependencies: remove-accents: 0.5.0 - '@tanstack/query-core@5.90.20': {} + '@tanstack/query-core@5.99.0': {} '@tanstack/query-devtools@5.67.2': {} @@ -32112,21 +32111,21 @@ snapshots: - solid-js - utf-8-validate - '@tanstack/react-query-devtools@5.67.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3)': + '@tanstack/react-query-devtools@5.67.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3)': dependencies: '@tanstack/query-devtools': 5.67.2 - '@tanstack/react-query': 5.90.20(react@19.2.3) + '@tanstack/react-query': 5.99.0(react@19.2.3) react: 19.2.3 - '@tanstack/react-query-devtools@5.90.2(@tanstack/react-query@5.90.20(react@19.2.3))(react@19.2.3)': + '@tanstack/react-query-devtools@5.90.2(@tanstack/react-query@5.99.0(react@19.2.3))(react@19.2.3)': dependencies: '@tanstack/query-devtools': 5.90.1 - '@tanstack/react-query': 5.90.20(react@19.2.3) + '@tanstack/react-query': 5.99.0(react@19.2.3) react: 19.2.3 - '@tanstack/react-query@5.90.20(react@19.2.3)': + '@tanstack/react-query@5.99.0(react@19.2.3)': dependencies: - '@tanstack/query-core': 5.90.20 + '@tanstack/query-core': 5.99.0 react: 19.2.3 '@tanstack/react-store@0.9.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': @@ -32151,15 +32150,15 @@ snapshots: - csstype - utf-8-validate - '@tanstack/solid-query-devtools@5.90.4(@tanstack/solid-query@5.90.9(solid-js@1.9.12))(solid-js@1.9.12)': + '@tanstack/solid-query-devtools@5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12)': dependencies: '@tanstack/query-devtools': 5.90.1 - '@tanstack/solid-query': 5.90.9(solid-js@1.9.12) + '@tanstack/solid-query': 5.99.0(solid-js@1.9.12) solid-js: 1.9.12 - '@tanstack/solid-query@5.90.9(solid-js@1.9.12)': + '@tanstack/solid-query@5.99.0(solid-js@1.9.12)': dependencies: - '@tanstack/query-core': 5.90.20 + '@tanstack/query-core': 5.99.0 solid-js: 1.9.12 '@tanstack/solid-virtual@3.13.12(solid-js@1.9.12)': @@ -32187,50 +32186,36 @@ snapshots: - supports-color - typescript - '@tanstack/vue-query-devtools@5.91.0(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2))': + '@tanstack/vue-query-devtools@5.91.0(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2))': dependencies: '@tanstack/query-devtools': 5.90.1 - '@tanstack/vue-query': 5.92.0(vue@3.5.25(typescript@6.0.2)) + '@tanstack/vue-query': 5.99.0(vue@3.5.25(typescript@6.0.2)) vue: 3.5.25(typescript@6.0.2) - '@tanstack/vue-query-devtools@6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3))': + '@tanstack/vue-query-devtools@6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@5.8.3)))(vue@3.5.25(typescript@5.8.3))': dependencies: '@tanstack/query-devtools': 5.91.1 - '@tanstack/vue-query': 5.92.0(vue@3.5.25(typescript@5.8.3)) + '@tanstack/vue-query': 5.99.0(vue@3.5.25(typescript@5.8.3)) vue: 3.5.25(typescript@5.8.3) - '@tanstack/vue-query-devtools@6.1.2(@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2))': + '@tanstack/vue-query-devtools@6.1.2(@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2))': dependencies: '@tanstack/query-devtools': 5.91.1 - '@tanstack/vue-query': 5.92.0(vue@3.5.25(typescript@6.0.2)) + '@tanstack/vue-query': 5.99.0(vue@3.5.25(typescript@6.0.2)) vue: 3.5.25(typescript@6.0.2) - '@tanstack/vue-query-devtools@6.1.2(@tanstack/vue-query@5.92.1(vue@3.5.25(typescript@6.0.2)))(vue@3.5.25(typescript@6.0.2))': - dependencies: - '@tanstack/query-devtools': 5.91.1 - '@tanstack/vue-query': 5.92.1(vue@3.5.25(typescript@6.0.2)) - vue: 3.5.25(typescript@6.0.2) - - '@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@5.8.3))': + '@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@5.8.3))': dependencies: '@tanstack/match-sorter-utils': 8.19.4 - '@tanstack/query-core': 5.90.20 + '@tanstack/query-core': 5.99.0 '@vue/devtools-api': 6.6.4 vue: 3.5.25(typescript@5.8.3) vue-demi: 0.14.10(vue@3.5.25(typescript@5.8.3)) - '@tanstack/vue-query@5.92.0(vue@3.5.25(typescript@6.0.2))': + '@tanstack/vue-query@5.99.0(vue@3.5.25(typescript@6.0.2))': dependencies: '@tanstack/match-sorter-utils': 8.19.4 - '@tanstack/query-core': 5.90.20 - '@vue/devtools-api': 6.6.4 - vue: 3.5.25(typescript@6.0.2) - vue-demi: 0.14.10(vue@3.5.25(typescript@6.0.2)) - - '@tanstack/vue-query@5.92.1(vue@3.5.25(typescript@6.0.2))': - dependencies: - '@tanstack/match-sorter-utils': 8.19.4 - '@tanstack/query-core': 5.90.20 + '@tanstack/query-core': 5.99.0 '@vue/devtools-api': 6.6.4 vue: 3.5.25(typescript@6.0.2) vue-demi: 0.14.10(vue@3.5.25(typescript@6.0.2)) @@ -32316,9 +32301,9 @@ snapshots: dependencies: typescript: 6.0.2 - '@trpc/tanstack-react-query@11.4.3(@tanstack/react-query@5.90.20(react@19.2.3))(@trpc/client@11.4.3(@trpc/server@11.4.3(typescript@6.0.2))(typescript@6.0.2))(@trpc/server@11.4.3(typescript@6.0.2))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2)': + '@trpc/tanstack-react-query@11.4.3(@tanstack/react-query@5.99.0(react@19.2.3))(@trpc/client@11.4.3(@trpc/server@11.4.3(typescript@6.0.2))(typescript@6.0.2))(@trpc/server@11.4.3(typescript@6.0.2))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2)': dependencies: - '@tanstack/react-query': 5.90.20(react@19.2.3) + '@tanstack/react-query': 5.99.0(react@19.2.3) '@trpc/client': 11.4.3(@trpc/server@11.4.3(typescript@6.0.2))(typescript@6.0.2) '@trpc/server': 11.4.3(typescript@6.0.2) react: 19.2.3 @@ -34157,7 +34142,7 @@ snapshots: jsonpointer: 5.0.1 leven: 3.1.0 - better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12): + better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)): dependencies: '@better-auth/core': 1.3.27 '@better-auth/utils': 0.3.0 @@ -34176,6 +34161,7 @@ snapshots: react: 19.2.3 react-dom: 19.2.3(react@19.2.3) solid-js: 1.9.12 + vue: 3.5.25(typescript@6.0.2) better-call@1.0.19: dependencies: From 22dc15203379da15e6eaa225e61696039380aedd Mon Sep 17 00:00:00 2001 From: Birk Skyum <74932975+birkskyum@users.noreply.github.com> Date: Thu, 16 Apr 2026 23:51:45 +0200 Subject: [PATCH 010/597] fix(solid-router): use keyed Show in Outlet to fix child route rendering with useQuery (#7204) --- .changeset/wild-lies-marry.md | 5 + .../solid-query-layout-suspense/package.json | 26 ++++ .../playwright.config.ts | 25 ++++ .../src/routeTree.gen.ts | 113 ++++++++++++++++++ .../src/router.tsx | 21 ++++ .../src/routes/__root.tsx | 34 ++++++ .../src/routes/index.tsx | 5 + .../src/routes/layout.page2.tsx | 19 +++ .../src/routes/layout.tsx | 25 ++++ .../tests/app.spec.ts | 17 +++ .../solid-query-layout-suspense/tsconfig.json | 15 +++ .../vite.config.ts | 7 ++ packages/solid-router/src/Match.tsx | 19 +-- .../store-updates-during-navigation.test.tsx | 4 +- pnpm-lock.yaml | 34 ++++++ 15 files changed, 360 insertions(+), 9 deletions(-) create mode 100644 .changeset/wild-lies-marry.md create mode 100644 e2e/solid-start/solid-query-layout-suspense/package.json create mode 100644 e2e/solid-start/solid-query-layout-suspense/playwright.config.ts create mode 100644 e2e/solid-start/solid-query-layout-suspense/src/routeTree.gen.ts create mode 100644 e2e/solid-start/solid-query-layout-suspense/src/router.tsx create mode 100644 e2e/solid-start/solid-query-layout-suspense/src/routes/__root.tsx create mode 100644 e2e/solid-start/solid-query-layout-suspense/src/routes/index.tsx create mode 100644 e2e/solid-start/solid-query-layout-suspense/src/routes/layout.page2.tsx create mode 100644 e2e/solid-start/solid-query-layout-suspense/src/routes/layout.tsx create mode 100644 e2e/solid-start/solid-query-layout-suspense/tests/app.spec.ts create mode 100644 e2e/solid-start/solid-query-layout-suspense/tsconfig.json create mode 100644 e2e/solid-start/solid-query-layout-suspense/vite.config.ts diff --git a/.changeset/wild-lies-marry.md b/.changeset/wild-lies-marry.md new file mode 100644 index 0000000000..979db8dac0 --- /dev/null +++ b/.changeset/wild-lies-marry.md @@ -0,0 +1,5 @@ +--- +'@tanstack/solid-router': patch +--- + +fix: use keyed Show in Outlet to fix child route rendering with useQuery diff --git a/e2e/solid-start/solid-query-layout-suspense/package.json b/e2e/solid-start/solid-query-layout-suspense/package.json new file mode 100644 index 0000000000..588606a495 --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/package.json @@ -0,0 +1,26 @@ +{ + "name": "tanstack-solid-start-e2e-solid-query-layout-suspense", + "private": true, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev --port $PORT", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/solid-query": "^5.90.9", + "@tanstack/solid-router": "workspace:^", + "@tanstack/solid-start": "workspace:^", + "solid-js": "^1.9.10", + "vite": "^8.0.0" + }, + "devDependencies": { + "@playwright/test": "^1.50.1", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "^22.10.2", + "typescript": "^6.0.2", + "vite-plugin-solid": "^2.11.11" + } +} diff --git a/e2e/solid-start/solid-query-layout-suspense/playwright.config.ts b/e2e/solid-start/solid-query-layout-suspense/playwright.config.ts new file mode 100644 index 0000000000..e7e18e60a7 --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/playwright.config.ts @@ -0,0 +1,25 @@ +import { defineConfig, devices } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } + +const PORT = await getTestServerPort(packageJson.name) +const baseURL = `http://localhost:${PORT}` + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + use: { baseURL }, + webServer: { + command: `PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm dev:e2e`, + url: baseURL, + reuseExistingServer: !process.env.CI, + stdout: 'pipe', + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/solid-start/solid-query-layout-suspense/src/routeTree.gen.ts b/e2e/solid-start/solid-query-layout-suspense/src/routeTree.gen.ts new file mode 100644 index 0000000000..e120a08bd4 --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/src/routeTree.gen.ts @@ -0,0 +1,113 @@ +/* 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 LayoutRouteImport } from './routes/layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as LayoutPage2RouteImport } from './routes/layout.page2' + +const LayoutRoute = LayoutRouteImport.update({ + id: '/layout', + path: '/layout', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const LayoutPage2Route = LayoutPage2RouteImport.update({ + id: '/page2', + path: '/page2', + getParentRoute: () => LayoutRoute, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/layout': typeof LayoutRouteWithChildren + '/layout/page2': typeof LayoutPage2Route +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/layout': typeof LayoutRouteWithChildren + '/layout/page2': typeof LayoutPage2Route +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/layout': typeof LayoutRouteWithChildren + '/layout/page2': typeof LayoutPage2Route +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/' | '/layout' | '/layout/page2' + fileRoutesByTo: FileRoutesByTo + to: '/' | '/layout' | '/layout/page2' + id: '__root__' | '/' | '/layout' | '/layout/page2' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + LayoutRoute: typeof LayoutRouteWithChildren +} + +declare module '@tanstack/solid-router' { + interface FileRoutesByPath { + '/layout': { + id: '/layout' + path: '/layout' + fullPath: '/layout' + preLoaderRoute: typeof LayoutRouteImport + parentRoute: typeof rootRouteImport + } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/layout/page2': { + id: '/layout/page2' + path: '/page2' + fullPath: '/layout/page2' + preLoaderRoute: typeof LayoutPage2RouteImport + parentRoute: typeof LayoutRoute + } + } +} + +interface LayoutRouteChildren { + LayoutPage2Route: typeof LayoutPage2Route +} + +const LayoutRouteChildren: LayoutRouteChildren = { + LayoutPage2Route: LayoutPage2Route, +} + +const LayoutRouteWithChildren = + LayoutRoute._addFileChildren(LayoutRouteChildren) + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + LayoutRoute: LayoutRouteWithChildren, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { createStart } from '@tanstack/solid-start' +declare module '@tanstack/solid-start' { + interface Register { + ssr: true + router: Awaited> + } +} diff --git a/e2e/solid-start/solid-query-layout-suspense/src/router.tsx b/e2e/solid-start/solid-query-layout-suspense/src/router.tsx new file mode 100644 index 0000000000..9e1a2eeffa --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/src/router.tsx @@ -0,0 +1,21 @@ +import { QueryClient, QueryClientProvider } from '@tanstack/solid-query' +import { createRouter } from '@tanstack/solid-router' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + const queryClient = new QueryClient() + return createRouter({ + routeTree, + Wrap: (props) => ( + + {props.children} + + ), + }) +} + +declare module '@tanstack/solid-router' { + interface Register { + router: ReturnType + } +} diff --git a/e2e/solid-start/solid-query-layout-suspense/src/routes/__root.tsx b/e2e/solid-start/solid-query-layout-suspense/src/routes/__root.tsx new file mode 100644 index 0000000000..510296694d --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/src/routes/__root.tsx @@ -0,0 +1,34 @@ +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRouteWithContext, +} from '@tanstack/solid-router' +import { Suspense } from 'solid-js' +import { HydrationScript } from 'solid-js/web' + +export const Route = createRootRouteWithContext()({ + head: () => ({ meta: [{ charset: 'utf-8' }] }), + shellComponent: RootDocument, +}) + +function RootDocument() { + return ( + + + + + + + + + + + + + + ) +} diff --git a/e2e/solid-start/solid-query-layout-suspense/src/routes/index.tsx b/e2e/solid-start/solid-query-layout-suspense/src/routes/index.tsx new file mode 100644 index 0000000000..285c0530e0 --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/src/routes/index.tsx @@ -0,0 +1,5 @@ +import { createFileRoute } from '@tanstack/solid-router' + +export const Route = createFileRoute('/')({ + component: () =>
Home page
, +}) diff --git a/e2e/solid-start/solid-query-layout-suspense/src/routes/layout.page2.tsx b/e2e/solid-start/solid-query-layout-suspense/src/routes/layout.page2.tsx new file mode 100644 index 0000000000..759bfd59f6 --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/src/routes/layout.page2.tsx @@ -0,0 +1,19 @@ +import { useQuery } from '@tanstack/solid-query' +import { createFileRoute } from '@tanstack/solid-router' + +export const Route = createFileRoute('/layout/page2')({ + component: RouteComponent, +}) + +function RouteComponent() { + const query = useQuery(() => ({ + queryKey: ['page2'], + queryFn: async () => ({ data: 'page2-data' }), + })) + + return ( +
+ Page data: {JSON.stringify(query.data)} +
+ ) +} diff --git a/e2e/solid-start/solid-query-layout-suspense/src/routes/layout.tsx b/e2e/solid-start/solid-query-layout-suspense/src/routes/layout.tsx new file mode 100644 index 0000000000..172549a214 --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/src/routes/layout.tsx @@ -0,0 +1,25 @@ +import { useQuery } from '@tanstack/solid-query' +import { Outlet, createFileRoute } from '@tanstack/solid-router' + +export const Route = createFileRoute('/layout')({ + component: RouteComponent, +}) + +function RouteComponent() { + const query = useQuery(() => ({ + queryKey: ['layout'], + queryFn: async () => { + await new Promise((r) => setTimeout(r, 200)) + return { data: 'layout-data' } + }, + })) + + return ( +
+
+        Layout data: {JSON.stringify(query.data?.data)}
+      
+ +
+ ) +} diff --git a/e2e/solid-start/solid-query-layout-suspense/tests/app.spec.ts b/e2e/solid-start/solid-query-layout-suspense/tests/app.spec.ts new file mode 100644 index 0000000000..9552a71bf7 --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/tests/app.spec.ts @@ -0,0 +1,17 @@ +import { expect, test } from '@playwright/test' + +// Reproduces https://github.com/TanStack/router/issues/7195 +test('layout with useQuery renders child after client navigation', async ({ + page, +}) => { + await page.goto('/') + await expect(page.getByText('👉 To page2')).toBeVisible() + await page.waitForLoadState('networkidle') + + await page.getByText('👉 To page2').click() + + await expect(page.getByTestId('page2-content')).toBeVisible({ + timeout: 5_000, + }) + await expect(page.getByTestId('layout-content')).toBeVisible() +}) diff --git a/e2e/solid-start/solid-query-layout-suspense/tsconfig.json b/e2e/solid-start/solid-query-layout-suspense/tsconfig.json new file mode 100644 index 0000000000..a10b139295 --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/tsconfig.json @@ -0,0 +1,15 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "jsx": "preserve", + "jsxImportSource": "solid-js", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "target": "ES2022", + "skipLibCheck": true, + "noEmit": true, + "types": ["vite/client"] + } +} diff --git a/e2e/solid-start/solid-query-layout-suspense/vite.config.ts b/e2e/solid-start/solid-query-layout-suspense/vite.config.ts new file mode 100644 index 0000000000..e1c2d5526c --- /dev/null +++ b/e2e/solid-start/solid-query-layout-suspense/vite.config.ts @@ -0,0 +1,7 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' +import solid from 'vite-plugin-solid' + +export default defineConfig({ + plugins: [tanstackStart(), solid({ ssr: true })], +}) diff --git a/packages/solid-router/src/Match.tsx b/packages/solid-router/src/Match.tsx index e04d2877c8..294d64e0ca 100644 --- a/packages/solid-router/src/Match.tsx +++ b/packages/solid-router/src/Match.tsx @@ -469,13 +469,20 @@ export const Outlet = () => { return router.stores.matchStores.get(id)?.get().status }) - // Only show not-found if we're not in a redirected state const shouldShowNotFound = () => childMatchStatus() !== 'redirected' && parentGlobalNotFound() + const childRouteKey = Solid.createMemo(() => { + if (shouldShowNotFound()) return undefined + const cid = childMatchId() + if (!cid) return undefined + return router.stores.matchStores.get(cid)?.routeId ?? cid + }) + return ( {(resolvedRoute) => @@ -484,20 +491,18 @@ export const Outlet = () => { } > - {(childMatchIdAccessor) => { - const currentMatchId = Solid.createMemo(() => childMatchIdAccessor()) - + {(_routeKey: string) => { return ( } + fallback={} > } > - + ) diff --git a/packages/solid-router/tests/store-updates-during-navigation.test.tsx b/packages/solid-router/tests/store-updates-during-navigation.test.tsx index b341dcad29..69b570122d 100644 --- a/packages/solid-router/tests/store-updates-during-navigation.test.tsx +++ b/packages/solid-router/tests/store-updates-during-navigation.test.tsx @@ -136,7 +136,7 @@ describe("Store doesn't update *too many* times during navigation", () => { // This number should be as small as possible to minimize the amount of work // that needs to be done during a navigation. // Any change that increases this number should be investigated. - expect(updates).toBe(8) + expect(updates).toBe(9) }) test('redirection in preload', async () => { @@ -172,7 +172,7 @@ describe("Store doesn't update *too many* times during navigation", () => { // that needs to be done during a navigation. // Any change that increases this number should be investigated. // Note: Solid has different update counts than React due to different reactivity - expect(updates).toBe(4) + expect(updates).toBe(5) }) test('nothing', async () => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4cd1c6b677..13b206cac7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4666,6 +4666,40 @@ importers: specifier: ^2.11.11 version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + e2e/solid-start/solid-query-layout-suspense: + dependencies: + '@tanstack/solid-query': + specifier: ^5.99.0 + version: 5.99.0(solid-js@1.9.12) + '@tanstack/solid-router': + specifier: workspace:^ + version: link:../../../packages/solid-router + '@tanstack/solid-start': + specifier: workspace:* + version: link:../../../packages/solid-start + solid-js: + specifier: 1.9.12 + version: 1.9.12 + vite: + specifier: ^8.0.0 + version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + devDependencies: + '@playwright/test': + specifier: ^1.57.0 + version: 1.58.0 + '@tanstack/router-e2e-utils': + specifier: workspace:^ + version: link:../../e2e-utils + '@types/node': + specifier: 25.0.9 + version: 25.0.9 + typescript: + specifier: ^6.0.2 + version: 6.0.2 + vite-plugin-solid: + specifier: ^2.11.11 + version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + e2e/solid-start/spa-mode: dependencies: '@tanstack/solid-router': From 3485a880478e8baeae99002ee6b114ff38fd7b2a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 16 Apr 2026 21:54:11 +0000 Subject: [PATCH 011/597] ci: changeset release --- .changeset/wild-lies-marry.md | 5 - .../package.json | 2 +- .../solid/authenticated-routes/package.json | 2 +- .../basic-default-search-params/package.json | 2 +- .../solid/basic-devtools-panel/package.json | 2 +- examples/solid/basic-file-based/package.json | 2 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-solid-query-file-based/package.json | 2 +- examples/solid/basic-solid-query/package.json | 2 +- .../solid/basic-ssr-file-based/package.json | 2 +- .../package.json | 2 +- .../basic-virtual-file-based/package.json | 2 +- .../package.json | 2 +- examples/solid/basic/package.json | 2 +- examples/solid/deferred-data/package.json | 2 +- examples/solid/i18n-paraglide/package.json | 2 +- .../kitchen-sink-file-based/package.json | 2 +- .../package.json | 2 +- .../kitchen-sink-solid-query/package.json | 2 +- examples/solid/kitchen-sink/package.json | 2 +- examples/solid/large-file-based/package.json | 2 +- examples/solid/location-masking/package.json | 2 +- .../solid/navigation-blocking/package.json | 2 +- .../package.json | 2 +- .../solid/quickstart-file-based/package.json | 2 +- .../quickstart-rspack-file-based/package.json | 2 +- .../package.json | 2 +- examples/solid/quickstart/package.json | 2 +- .../router-monorepo-simple-lazy/package.json | 2 +- .../packages/router/package.json | 2 +- .../solid/router-monorepo-simple/package.json | 2 +- .../packages/router/package.json | 2 +- .../router-monorepo-solid-query/package.json | 2 +- .../packages/router/package.json | 2 +- .../solid/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 2 +- examples/solid/start-basic-auth/package.json | 4 +- .../solid/start-basic-authjs/package.json | 4 +- .../solid/start-basic-cloudflare/package.json | 4 +- .../solid/start-basic-netlify/package.json | 4 +- examples/solid/start-basic-nitro/package.json | 4 +- .../start-basic-solid-query/package.json | 4 +- .../solid/start-basic-static/package.json | 4 +- examples/solid/start-basic/package.json | 4 +- examples/solid/start-bun/package.json | 4 +- .../start-convex-better-auth/package.json | 4 +- examples/solid/start-counter/package.json | 4 +- .../solid/start-i18n-paraglide/package.json | 4 +- examples/solid/start-large/package.json | 4 +- .../package.json | 4 +- .../solid/start-supabase-basic/package.json | 4 +- examples/solid/start-tailwind-v4/package.json | 4 +- examples/solid/view-transitions/package.json | 2 +- .../solid/with-framer-motion/package.json | 2 +- examples/solid/with-trpc/package.json | 2 +- packages/solid-router/CHANGELOG.md | 6 ++ packages/solid-router/package.json | 2 +- packages/solid-start-client/CHANGELOG.md | 7 ++ packages/solid-start-client/package.json | 2 +- packages/solid-start-server/CHANGELOG.md | 7 ++ packages/solid-start-server/package.json | 2 +- packages/solid-start/CHANGELOG.md | 9 ++ packages/solid-start/package.json | 2 +- pnpm-lock.yaml | 102 +++++++++--------- 64 files changed, 154 insertions(+), 130 deletions(-) delete mode 100644 .changeset/wild-lies-marry.md diff --git a/.changeset/wild-lies-marry.md b/.changeset/wild-lies-marry.md deleted file mode 100644 index 979db8dac0..0000000000 --- a/.changeset/wild-lies-marry.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/solid-router': patch ---- - -fix: use keyed Show in Outlet to fix child route rendering with useQuery diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index 3da798cdd4..e61caad36f 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "firebase": "^11.4.0", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index 9d9881cf87..2abb9a278d 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index 90151f8754..e37001ccbf 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 902accf836..9274a3403c 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index e4af9403af..9e55038572 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 501686857a..9f03b5fb34 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index b886f7d0bf..9f65bed8ab 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 20d79164a8..96cab82b49 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index 82091ddb3a..41cd933e3e 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,7 +11,7 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/router-plugin": "^1.167.22", "compression": "^1.8.0", "express": "^4.21.2", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index 4ddfdaee05..e4a5cb1afc 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "compression": "^1.8.0", "express": "^4.21.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index bf3ec3b3cb..f03cb40b1b 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@tanstack/virtual-file-routes": "^1.161.7", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index 714f7c0642..bf2063c791 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@tanstack/virtual-file-routes": "^1.161.7", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 4c141199cc..51885f8a77 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index 68f68b669f..c8be371646 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index 9481b1d13c..4fdfc323a5 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/router-plugin": "^1.167.22", "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 49765faa05..4a5210179a 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "immer": "^10.1.1", "redaxios": "^0.5.1", 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 618679015d..b2c00d122f 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/router-plugin": "^1.167.22", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index 292aaaf962..29a68a126b 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "immer": "^10.1.1", "redaxios": "^0.5.1", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index 0434ce62f8..4d41779976 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "immer": "^10.1.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 3f8b6ea9de..e7104fa44d 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -13,7 +13,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "solid-js": "^1.9.10", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index 127a65e821..8748a0e9d0 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index 98b7116b3f..1bb28eb799 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index bd784f4da7..d8e9f425d0 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tanstack/router-plugin": "^1.167.22", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index c55c05db6a..58182511aa 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index 9129f3f1f6..24c093513e 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "postcss": "^8.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index 5ba9293e4a..1f2269fd47 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,7 +7,7 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index 7f61c0d701..5f7326c805 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "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 2e59740694..5b8e2af1d5 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,7 +8,7 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "solid-js": "^1.9.10", 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 0179b9772b..bdd76c0d7d 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -9,7 +9,7 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.161.6", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/router-plugin": "^1.167.22", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index fa6d0446cf..3a748a9f51 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,7 +8,7 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "solid-js": "^1.9.10", diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index e5dc734412..5727f16b68 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -9,7 +9,7 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.161.6", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/router-plugin": "^1.167.22", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index 44fe0904bd..7be14383b2 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "solid-js": "^1.9.10", 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 97ea1eafd2..02e4e67113 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.161.6", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/router-plugin": "^1.167.22", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index f481e5d962..8d8acfc52a 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index dde7ba1232..42cae0d975 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.166.9", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@tanstack/valibot-adapter": "^1.166.9", diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index 0a7eade2c2..b10ecb9f4f 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^2.6.0" diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index 20e3d0a654..43c873551b 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "start-authjs": "^1.0.0", "solid-js": "^1.9.10", "tailwind-merge": "^2.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index e0a1496657..d30e460f42 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "npm run cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "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 dfc2ba3f1a..bbe4ea2694 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "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 ba08517e56..b84e0d5b8d 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "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 6c305a6b8b..60e7214a74 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/solid-router-ssr-query": "^1.166.11", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^2.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 2c36674145..6173640257 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "@tanstack/start-static-server-functions": "^1.166.33", "solid-js": "^1.9.10", "redaxios": "^0.5.1", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 7d19310a36..b477a3adf5 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^2.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index 5fca643e01..917c07164a 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,10 +15,10 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/solid-router-ssr-query": "^1.166.11", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "@tanstack/router-plugin": "^1.167.22", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/start-convex-better-auth/package.json b/examples/solid/start-convex-better-auth/package.json index 1571d645de..139ac1b752 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "better-auth": "^1.3.27", "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 b68e05cc52..39a865df13 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "solid-js": "^1.9.10", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json index 76ce776c89..cd7eb9a2d7 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index 6ac116d7e6..fc4be7e3de 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "solid-js": "^1.9.10", "redaxios": "^0.5.1", "tailwind-merge": "^2.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 7d5867ea14..18e77a6e14 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "solid-js": "^1.9.10", "zod": "^3.24.2" }, diff --git a/examples/solid/start-supabase-basic/package.json b/examples/solid/start-supabase-basic/package.json index c9d52f9a5d..8a7421fd9c 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "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 37e539a918..42c3d85a67 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.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", - "@tanstack/solid-start": "^1.167.36", + "@tanstack/solid-start": "^1.167.37", "solid-js": "^1.9.10", "tailwind-merge": "^2.6.0", "zod": "^3.24.2" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index 3c42422f4b..b85418fd3d 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "solid-js": "^1.9.10", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index db77023373..c6a1bf55d4 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index 833dbca872..6dc28b8526 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.168.19", + "@tanstack/solid-router": "^1.168.20", "@tanstack/solid-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@trpc/client": "^11.4.3", diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md index adae20df2e..35a866a818 100644 --- a/packages/solid-router/CHANGELOG.md +++ b/packages/solid-router/CHANGELOG.md @@ -1,5 +1,11 @@ # @tanstack/solid-router +## 1.168.20 + +### Patch Changes + +- fix: use keyed Show in Outlet to fix child route rendering with useQuery ([#7204](https://github.com/TanStack/router/pull/7204)) + ## 1.168.19 ### Patch Changes diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 2c08cc516c..311832823a 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.168.19", + "version": "1.168.20", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md index 08913d70fe..bf84319a58 100644 --- a/packages/solid-start-client/CHANGELOG.md +++ b/packages/solid-start-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/solid-start-client +## 1.166.36 + +### Patch Changes + +- Updated dependencies [[`22dc152`](https://github.com/TanStack/router/commit/22dc15203379da15e6eaa225e61696039380aedd)]: + - @tanstack/solid-router@1.168.20 + ## 1.166.35 ### Patch Changes diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index fc634fdbb3..6eeb4ce196 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.166.35", + "version": "1.166.36", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md index e4bc56a0eb..eab14edec4 100644 --- a/packages/solid-start-server/CHANGELOG.md +++ b/packages/solid-start-server/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/solid-start-server +## 1.166.37 + +### Patch Changes + +- Updated dependencies [[`22dc152`](https://github.com/TanStack/router/commit/22dc15203379da15e6eaa225e61696039380aedd)]: + - @tanstack/solid-router@1.168.20 + ## 1.166.36 ### Patch Changes diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 2de2f26e03..42886cd282 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.166.36", + "version": "1.166.37", "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 0c3310b006..d54623717b 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,14 @@ # @tanstack/solid-start +## 1.167.37 + +### Patch Changes + +- Updated dependencies [[`22dc152`](https://github.com/TanStack/router/commit/22dc15203379da15e6eaa225e61696039380aedd)]: + - @tanstack/solid-router@1.168.20 + - @tanstack/solid-start-client@1.166.36 + - @tanstack/solid-start-server@1.166.37 + ## 1.167.36 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 0c3aead343..8b8e7488d0 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.167.36", + "version": "1.167.37", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13b206cac7..790edc7176 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9934,7 +9934,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -9971,7 +9971,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10011,7 +10011,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10051,7 +10051,7 @@ importers: specifier: ^5.99.0 version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10085,7 +10085,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10116,7 +10116,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10153,7 +10153,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10196,7 +10196,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10236,7 +10236,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10273,7 +10273,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -10313,7 +10313,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10368,7 +10368,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10408,7 +10408,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10445,7 +10445,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10482,7 +10482,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -10513,7 +10513,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10550,7 +10550,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10596,7 +10596,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10642,7 +10642,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10685,7 +10685,7 @@ importers: specifier: ^5.99.0 version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10722,7 +10722,7 @@ importers: specifier: ^5.99.0 version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10756,7 +10756,7 @@ importers: specifier: ^5.99.0 version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10787,7 +10787,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10815,7 +10815,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10846,7 +10846,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10883,7 +10883,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10917,7 +10917,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -10978,7 +10978,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11012,7 +11012,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11052,7 +11052,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11086,7 +11086,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11126,7 +11126,7 @@ importers: specifier: ^5.99.0 version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11172,7 +11172,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11224,7 +11224,7 @@ importers: specifier: ^7.0.0 version: 7.0.0(prisma@7.0.0(@types/react@19.2.9)(magicast@0.3.5)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2))(typescript@6.0.2) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11273,7 +11273,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11313,7 +11313,7 @@ importers: examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11353,7 +11353,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11390,7 +11390,7 @@ importers: examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11433,7 +11433,7 @@ importers: specifier: ^5.90.0 version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11476,7 +11476,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11528,7 +11528,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11592,7 +11592,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11647,7 +11647,7 @@ importers: examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11690,7 +11690,7 @@ importers: specifier: ^0.7.0 version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11730,7 +11730,7 @@ importers: specifier: ^5.99.0 version: 5.99.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11773,7 +11773,7 @@ importers: examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11810,7 +11810,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11847,7 +11847,7 @@ importers: examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11893,7 +11893,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11927,7 +11927,7 @@ importers: specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11967,7 +11967,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.168.19 + specifier: ^1.168.20 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From e2332b0c08b7be973f46fc12a9b0f78ae5161951 Mon Sep 17 00:00:00 2001 From: Pavan Shinde Date: Fri, 17 Apr 2026 23:09:32 +0530 Subject: [PATCH 012/597] docs(start): fix authenticated routes doc URL (#7214) --- docs/start/framework/react/guide/authentication-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/start/framework/react/guide/authentication-overview.md b/docs/start/framework/react/guide/authentication-overview.md index 16fc63090c..306bd4b8c8 100644 --- a/docs/start/framework/react/guide/authentication-overview.md +++ b/docs/start/framework/react/guide/authentication-overview.md @@ -227,7 +227,7 @@ Build your own authentication system using TanStack Start's server functions and **Implementation Guides:** - [Authentication Patterns](./authentication.md) -- [Router Authentication Guide](/router/latest/docs/framework/react/guide/authenticated-routes.md) +- [Router Authentication Guide](/router/latest/docs/framework/react/guide/authenticated-routes) **Foundation Concepts:** From b57e898e676654b056567f4097b9557b787b025c Mon Sep 17 00:00:00 2001 From: Flo Date: Fri, 17 Apr 2026 21:19:38 +0200 Subject: [PATCH 013/597] chore(deps): vitest 4.1.4 (#7212) --- benchmarks/client-nav/package.json | 2 +- benchmarks/ssr/package.json | 2 +- e2e/eslint-plugin-start/package.json | 2 +- examples/react/start-bun/package.json | 2 +- examples/solid/start-bun/package.json | 2 +- package.json | 6 +- .../src/client/hydrateStart.ts | 6 +- pnpm-lock.yaml | 659 +++++------------- 8 files changed, 204 insertions(+), 477 deletions(-) diff --git a/benchmarks/client-nav/package.json b/benchmarks/client-nav/package.json index 9537b10b95..5f83d6f02c 100644 --- a/benchmarks/client-nav/package.json +++ b/benchmarks/client-nav/package.json @@ -39,7 +39,7 @@ "typescript": "^6.0.2", "vite": "^8.0.0", "vite-plugin-solid": "^2.11.11", - "vitest": "^4.0.17" + "vitest": "^4.1.4" }, "nx": { "targets": { diff --git a/benchmarks/ssr/package.json b/benchmarks/ssr/package.json index 85858e36db..904e42be74 100644 --- a/benchmarks/ssr/package.json +++ b/benchmarks/ssr/package.json @@ -34,7 +34,7 @@ "typescript": "^6.0.2", "vite": "^8.0.0", "vite-plugin-solid": "^2.11.11", - "vitest": "^4.0.17" + "vitest": "^4.1.4" }, "nx": { "targets": { diff --git a/e2e/eslint-plugin-start/package.json b/e2e/eslint-plugin-start/package.json index c9b866df9a..87bc81bfe9 100644 --- a/e2e/eslint-plugin-start/package.json +++ b/e2e/eslint-plugin-start/package.json @@ -61,6 +61,6 @@ "eslint": "^9.22.0", "react": "^19.0.0", "typescript": "^5.7.2", - "vitest": "^3.2.4" + "vitest": "^4.1.4" } } diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index b2dfb5d825..ab538160e1 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -37,7 +37,7 @@ "prettier": "^3.6.2", "typescript": "^6.0.2", "vite": "^8.0.0", - "vitest": "^3.2.4", + "vitest": "^4.1.4", "web-vitals": "^5.1.0" } } diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index 917c07164a..76d259f1f8 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -34,7 +34,7 @@ "prettier": "^3.6.2", "typescript": "^6.0.2", "vite": "^8.0.0", - "vitest": "^3.2.4", + "vitest": "^4.1.4", "web-vitals": "^5.1.0" } } diff --git a/package.json b/package.json index 8c007f88fe..453492cbaf 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "@types/node": "25.0.9", "@types/react": "^19.2.8", "@types/react-dom": "^19.2.3", - "@vitest/browser": "^4.0.17", - "@vitest/ui": "^4.0.17", + "@vitest/browser": "^4.1.4", + "@vitest/ui": "^4.1.4", "eslint": "^9.22.0", "eslint-plugin-react-hooks": "^5.1.0", "eslint-plugin-unused-imports": "^4.1.4", @@ -84,7 +84,7 @@ "typescript58": "npm:typescript@5.8", "typescript59": "npm:typescript@5.9", "vite": "^8.0.0", - "vitest": "^4.0.17" + "vitest": "^4.1.4" }, "pnpm": { "overrides": { diff --git a/packages/start-client-core/src/client/hydrateStart.ts b/packages/start-client-core/src/client/hydrateStart.ts index 20ca5b1b0d..206b70505c 100644 --- a/packages/start-client-core/src/client/hydrateStart.ts +++ b/packages/start-client-core/src/client/hydrateStart.ts @@ -1,14 +1,14 @@ import { hydrate } from '@tanstack/router-core/ssr/client' -import { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter' -import type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core' -import type { AnyStartInstanceOptions } from '../createStart' import { startInstance } from '#tanstack-start-entry' import { hasPluginAdapters, pluginSerializationAdapters, } from '#tanstack-start-plugin-adapters' import { getRouter } from '#tanstack-router-entry' +import { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter' +import type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core' +import type { AnyStartInstanceOptions } from '../createStart' export async function hydrateStart(): Promise { const router = await getRouter() diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 790edc7176..2aaa9bd032 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -116,11 +116,11 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.9) '@vitest/browser': - specifier: ^4.0.17 - version: 4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18) + specifier: ^4.1.4 + version: 4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.1.4) '@vitest/ui': - specifier: ^4.0.17 - version: 4.0.18(vitest@4.0.18) + specifier: ^4.1.4 + version: 4.1.4(vitest@4.1.4) eslint: specifier: ^9.22.0 version: 9.22.0(jiti@2.6.1) @@ -182,8 +182,8 @@ importers: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vitest: - specifier: ^4.0.17 - version: 4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@25.0.1)(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1)(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) benchmarks/bundle-size: dependencies: @@ -272,7 +272,7 @@ importers: devDependencies: '@codspeed/vitest-plugin': specifier: ^5.0.1 - version: 5.2.0(tinybench@2.9.0)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18) + version: 5.2.0(tinybench@2.9.0)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.1.4) '@platformatic/flame': specifier: ^1.6.0 version: 1.6.0 @@ -301,8 +301,8 @@ importers: specifier: ^2.11.11 version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vitest: - specifier: ^4.0.17 - version: 4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) benchmarks/ssr: dependencies: @@ -339,7 +339,7 @@ importers: devDependencies: '@codspeed/vitest-plugin': specifier: ^5.0.1 - version: 5.2.0(tinybench@2.9.0)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18) + version: 5.2.0(tinybench@2.9.0)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.1.4) '@vitejs/plugin-react': specifier: ^6.0.1 version: 6.0.1(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) @@ -356,8 +356,8 @@ importers: specifier: ^2.11.11 version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vitest: - specifier: ^4.0.17 - version: 4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/e2e-utils: devDependencies: @@ -401,8 +401,8 @@ importers: specifier: ^5.7.2 version: 5.9.2 vitest: - specifier: ^3.2.4 - version: 3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(@vitest/browser@4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18))(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) e2e/react-router/basepath-file-based: dependencies: @@ -9063,8 +9063,8 @@ importers: specifier: ^8.0.0 version: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vitest: - specifier: ^3.2.4 - version: 3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(@vitest/browser@4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18))(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -11577,8 +11577,8 @@ importers: specifier: ^2.11.11 version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) vitest: - specifier: ^3.2.4 - version: 3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(@vitest/browser@4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18))(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -11587,7 +11587,7 @@ importers: dependencies: '@convex-dev/better-auth': specifier: ^0.9.7 - version: 0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2) + version: 0.9.7(@standard-schema/spec@1.1.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) @@ -13806,6 +13806,9 @@ packages: '@better-fetch/fetch@1.1.18': resolution: {integrity: sha512-rEFOE1MYIsBmoMJtQbl32PGHHXuG2hDxvEd7rUHE0vCBoFQVSDqaVs9hkZEtHCxRoY+CljXKFCOuJ8uxqw1LcA==} + '@blazediff/core@1.9.1': + resolution: {integrity: sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==} + '@braidai/lang@1.1.2': resolution: {integrity: sha512-qBcknbBufNHlui137Hft8xauQMTZDKdophmLFv05r2eNmdIv/MlPuP4TdUknHG68UdWLgVZwgxVe735HzJNIwA==} @@ -18524,6 +18527,9 @@ packages: '@standard-schema/spec@1.0.0': resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==} + '@standard-schema/spec@1.1.0': + resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==} + '@stylistic/eslint-plugin@5.10.0': resolution: {integrity: sha512-nPK52ZHvot8Ju/0A4ucSX1dcPV2/1clx0kLcH5wDmrE4naKso7TUC/voUyU1O9OTKTrR6MYip6LP0ogEMQ9jPQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -19058,9 +19064,6 @@ packages: '@types/cookie@0.6.0': resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} - '@types/debug@4.1.12': - resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} - '@types/deep-eql@4.0.2': resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==} @@ -19115,9 +19118,6 @@ packages: '@types/mime@1.3.5': resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==} - '@types/ms@2.1.0': - resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==} - '@types/node-forge@1.3.11': resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==} @@ -19578,19 +19578,16 @@ packages: vite: ^8.0.0 vue: ^3.2.25 - '@vitest/browser@4.0.18': - resolution: {integrity: sha512-gVQqh7paBz3gC+ZdcCmNSWJMk70IUjDeVqi+5m5vYpEHsIwRgw3Y545jljtajhkekIpIp5Gg8oK7bctgY0E2Ng==} + '@vitest/browser@4.1.4': + resolution: {integrity: sha512-TrNaY/yVOwxtrxNsDUC/wQ56xSwplpytTeRAqF/197xV/ZddxxulBsxR6TrhVMyniJmp9in8d5u0AcDaNRY30w==} peerDependencies: - vitest: 4.0.18 + vitest: 4.1.4 - '@vitest/expect@3.2.4': - resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==} + '@vitest/expect@4.1.4': + resolution: {integrity: sha512-iPBpra+VDuXmBFI3FMKHSFXp3Gx5HfmSCE8X67Dn+bwephCnQCaB7qWK2ldHa+8ncN8hJU8VTMcxjPpyMkUjww==} - '@vitest/expect@4.0.18': - resolution: {integrity: sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==} - - '@vitest/mocker@3.2.4': - resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==} + '@vitest/mocker@4.1.4': + resolution: {integrity: sha512-R9HTZBhW6yCSGbGQnDnH3QHfJxokKN4KB+Yvk9Q1le7eQNYwiCyKxmLmurSpFy6BzJanSLuEUDrD+j97Q+ZLPg==} peerDependencies: msw: ^2.4.9 vite: ^8.0.0 @@ -19600,51 +19597,25 @@ packages: vite: optional: true - '@vitest/mocker@4.0.18': - resolution: {integrity: sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==} + '@vitest/pretty-format@4.1.4': + resolution: {integrity: sha512-ddmDHU0gjEUyEVLxtZa7xamrpIefdEETu3nZjWtHeZX4QxqJ7tRxSteHVXJOcr8jhiLoGAhkK4WJ3WqBpjx42A==} + + '@vitest/runner@4.1.4': + resolution: {integrity: sha512-xTp7VZ5aXP5ZJrn15UtJUWlx6qXLnGtF6jNxHepdPHpMfz/aVPx+htHtgcAL2mDXJgKhpoo2e9/hVJsIeFbytQ==} + + '@vitest/snapshot@4.1.4': + resolution: {integrity: sha512-MCjCFgaS8aZz+m5nTcEcgk/xhWv0rEH4Yl53PPlMXOZ1/Ka2VcZU6CJ+MgYCZbcJvzGhQRjVrGQNZqkGPttIKw==} + + '@vitest/spy@4.1.4': + resolution: {integrity: sha512-XxNdAsKW7C+FLydqFJLb5KhJtl3PGCMmYwFRfhvIgxJvLSXhhVI1zM8f1qD3Zg7RCjTSzDVyct6sghs9UEgBEQ==} + + '@vitest/ui@4.1.4': + resolution: {integrity: sha512-EgFR7nlj5iTDYZYCvavjFokNYwr3c3ry0sFiCg+N7B233Nwp+NNx7eoF/XvMWDCKY71xXAG3kFkt97ZHBJVL8A==} peerDependencies: - msw: ^2.4.9 - vite: ^8.0.0 - peerDependenciesMeta: - msw: - optional: true - vite: - optional: true + vitest: 4.1.4 - '@vitest/pretty-format@3.2.4': - resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==} - - '@vitest/pretty-format@4.0.18': - resolution: {integrity: sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==} - - '@vitest/runner@3.2.4': - resolution: {integrity: sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==} - - '@vitest/runner@4.0.18': - resolution: {integrity: sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==} - - '@vitest/snapshot@3.2.4': - resolution: {integrity: sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==} - - '@vitest/snapshot@4.0.18': - resolution: {integrity: sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==} - - '@vitest/spy@3.2.4': - resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==} - - '@vitest/spy@4.0.18': - resolution: {integrity: sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==} - - '@vitest/ui@4.0.18': - resolution: {integrity: sha512-CGJ25bc8fRi8Lod/3GHSvXRKi7nBo3kxh0ApW4yCjmrWmRmlT53B5E08XRSZRliygG0aVNxLrBEqPYdz/KcCtQ==} - peerDependencies: - vitest: 4.0.18 - - '@vitest/utils@3.2.4': - resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==} - - '@vitest/utils@4.0.18': - resolution: {integrity: sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==} + '@vitest/utils@4.1.4': + resolution: {integrity: sha512-13QMT+eysM5uVGa1rG4kegGYNp6cnQcsTc67ELFbhNLQO+vgsygtYJx2khvdt4gVQqSSpC/KT5FZZxUpP3Oatw==} '@volar/language-core@2.4.23': resolution: {integrity: sha512-hEEd5ET/oSmBC6pi1j6NaNYRWoAiDhINbT8rmwtINugR39loROSlufGdYMF9TaKGfz+ViGs1Idi3mAhnuPcoGQ==} @@ -20090,10 +20061,6 @@ packages: resolution: {integrity: sha512-UOCGPYbl0tv8+006qks/dTgV9ajs97X2p0FAbyS2iyCRrmLSRolDaHdp+v/CLgnzHc3fVB+CwYiUmei7ndFcgA==} engines: {node: '>=12.0.0'} - assertion-error@2.0.1: - resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} - engines: {node: '>=12'} - ast-module-types@6.0.1: resolution: {integrity: sha512-WHw67kLXYbZuHTmcdbIrVArCq5wxo6NEuj3hiYAWr8mwJeC+C2mMCIBIWCiDoCye/OF/xelc+teJ1ERoWmnEIA==} engines: {node: '>=18'} @@ -20339,10 +20306,6 @@ packages: magicast: optional: true - cac@6.7.14: - resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} - engines: {node: '>=8'} - call-bind-apply-helpers@1.0.2: resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} engines: {node: '>= 0.4'} @@ -20371,10 +20334,6 @@ packages: caniuse-lite@1.0.30001760: resolution: {integrity: sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==} - chai@5.2.0: - resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==} - engines: {node: '>=12'} - chai@6.2.2: resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==} engines: {node: '>=18'} @@ -20401,10 +20360,6 @@ packages: chardet@2.1.1: resolution: {integrity: sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==} - check-error@2.1.1: - resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} - engines: {node: '>= 16'} - cheerio-select@2.1.0: resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==} @@ -20959,10 +20914,6 @@ packages: babel-plugin-macros: optional: true - deep-eql@5.0.2: - resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} - engines: {node: '>=6'} - deep-equal@2.2.3: resolution: {integrity: sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==} engines: {node: '>= 0.4'} @@ -21669,8 +21620,8 @@ packages: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - expect-type@1.2.2: - resolution: {integrity: sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==} + expect-type@1.3.0: + resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==} engines: {node: '>=12.0.0'} express@4.21.2: @@ -21841,12 +21792,12 @@ packages: resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} hasBin: true - flatted@3.3.2: - resolution: {integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==} - flatted@3.3.3: resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==} + flatted@3.4.2: + resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==} + fn.name@1.1.0: resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==} @@ -23058,12 +23009,6 @@ packages: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true - loupe@3.1.3: - resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==} - - loupe@3.2.1: - resolution: {integrity: sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==} - lower-case@2.0.2: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} @@ -23097,9 +23042,6 @@ packages: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} hasBin: true - magic-string@0.30.17: - resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} - magic-string@0.30.21: resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} @@ -23860,10 +23802,6 @@ packages: pathe@2.0.3: resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} - pathval@2.0.0: - resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} - engines: {node: '>= 14.16'} - pend@1.2.0: resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==} @@ -23912,10 +23850,6 @@ packages: resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} engines: {node: '>= 6'} - pixelmatch@7.1.0: - resolution: {integrity: sha512-1wrVzJ2STrpmONHKBy228LM1b84msXDUoAzVEl0R8Mz4Ce6EPr+IVtxm8+yvrqLYMHswREkjYFaMxnyGnaY3Ng==} - hasBin: true - pkg-dir@4.2.0: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} @@ -25046,6 +24980,9 @@ packages: std-env@3.9.0: resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==} + std-env@4.1.0: + resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==} + stop-iteration-iterator@1.1.0: resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==} engines: {node: '>= 0.4'} @@ -25284,20 +25221,8 @@ packages: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} - tinypool@1.1.1: - resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==} - engines: {node: ^18.0.0 || >=20.0.0} - - tinyrainbow@2.0.0: - resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==} - engines: {node: '>=14.0.0'} - - tinyrainbow@3.0.3: - resolution: {integrity: sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==} - engines: {node: '>=14.0.0'} - - tinyspy@4.0.4: - resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==} + tinyrainbow@3.1.0: + resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} tldts-core@6.1.76: @@ -26046,11 +25971,6 @@ packages: resolution: {integrity: sha512-CVGXHyKRvDeC3S6SywxTcNGuckmSjwB+2q/v8eDSmwDBTlz0ziRqm49eI5ELLy4djKq6DdCSYvV4EGcwzsHRog==} hasBin: true - vite-node@3.2.4: - resolution: {integrity: sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} - hasBin: true - vite-plugin-dts@4.2.3: resolution: {integrity: sha512-O5NalzHANQRwVw1xj8KQun3Bv8OSDAlNJXrnqoAz10BOuW8FVvY5g4ygj+DlJZL5mtSPuMu9vd3OfrdW5d4k6w==} engines: {node: ^14.18.0 || >=16.0.0} @@ -26142,48 +26062,23 @@ packages: vite: optional: true - vitest@3.2.4: - resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@types/debug': ^4.1.12 - '@types/node': 25.0.9 - '@vitest/browser': 3.2.4 - '@vitest/ui': 3.2.4 - happy-dom: '*' - jsdom: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@types/debug': - optional: true - '@types/node': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - - vitest@4.0.18: - resolution: {integrity: sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==} + vitest@4.1.4: + resolution: {integrity: sha512-tFuJqTxKb8AvfyqMfnavXdzfy3h3sWZRWwfluGbkeR7n0HUev+FmNgZ8SDrRBTVrVCjgH5cA21qGbCffMNtWvg==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': 25.0.9 - '@vitest/browser-playwright': 4.0.18 - '@vitest/browser-preview': 4.0.18 - '@vitest/browser-webdriverio': 4.0.18 - '@vitest/ui': 4.0.18 + '@vitest/browser-playwright': 4.1.4 + '@vitest/browser-preview': 4.1.4 + '@vitest/browser-webdriverio': 4.1.4 + '@vitest/coverage-istanbul': 4.1.4 + '@vitest/coverage-v8': 4.1.4 + '@vitest/ui': 4.1.4 happy-dom: '*' jsdom: '*' + vite: ^8.0.0 peerDependenciesMeta: '@edge-runtime/vm': optional: true @@ -26197,6 +26092,10 @@ packages: optional: true '@vitest/browser-webdriverio': optional: true + '@vitest/coverage-istanbul': + optional: true + '@vitest/coverage-v8': + optional: true '@vitest/ui': optional: true happy-dom: @@ -26497,6 +26396,18 @@ packages: utf-8-validate: optional: true + ws@8.20.0: + resolution: {integrity: sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + xml-name-validator@4.0.0: resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} engines: {node: '>=12'} @@ -27136,6 +27047,8 @@ snapshots: '@better-fetch/fetch@1.1.18': {} + '@blazediff/core@1.9.1': {} + '@braidai/lang@1.1.2': {} '@bufbuild/protobuf@2.10.2': @@ -27361,7 +27274,7 @@ snapshots: dequal: 2.0.3 glob-to-regexp: 0.4.1 js-cookie: 3.0.5 - std-env: 3.9.0 + std-env: 3.10.0 swr: 2.3.4(react@19.2.3) optionalDependencies: react: 19.2.3 @@ -27373,7 +27286,7 @@ snapshots: dequal: 2.0.3 glob-to-regexp: 0.4.1 js-cookie: 3.0.5 - std-env: 3.9.0 + std-env: 3.10.0 swr: 2.3.4(react@19.2.3) optionalDependencies: react: 19.2.3 @@ -27459,12 +27372,12 @@ snapshots: transitivePeerDependencies: - debug - '@codspeed/vitest-plugin@5.2.0(tinybench@2.9.0)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18)': + '@codspeed/vitest-plugin@5.2.0(tinybench@2.9.0)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.1.4)': dependencies: '@codspeed/core': 5.2.0 tinybench: 2.9.0 vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - vitest: 4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) transitivePeerDependencies: - debug @@ -27473,12 +27386,12 @@ snapshots: '@colors/colors@1.6.0': {} - '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.0.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2)': + '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(better-auth@1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)))(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2)': dependencies: better-auth: 1.3.27(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12)(vue@3.5.25(typescript@6.0.2)) common-tags: 1.8.2 convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) - convex-helpers: 0.1.104(@standard-schema/spec@1.0.0)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(typescript@6.0.2)(zod@3.25.57) + convex-helpers: 0.1.104(@standard-schema/spec@1.1.0)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(typescript@6.0.2)(zod@3.25.57) jose: 6.1.0 react: 19.2.3 react-dom: 19.2.3(react@19.2.3) @@ -31784,6 +31697,8 @@ snapshots: '@standard-schema/spec@1.0.0': {} + '@standard-schema/spec@1.1.0': {} + '@stylistic/eslint-plugin@5.10.0(eslint@9.22.0(jiti@2.6.1))': dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@9.22.0(jiti@2.6.1)) @@ -32410,11 +32325,6 @@ snapshots: '@types/cookie@0.6.0': {} - '@types/debug@4.1.12': - dependencies: - '@types/ms': 2.1.0 - optional: true - '@types/deep-eql@4.0.2': {} '@types/diff@7.0.2': {} @@ -32483,9 +32393,6 @@ snapshots: '@types/mime@1.3.5': {} - '@types/ms@2.1.0': - optional: true - '@types/node-forge@1.3.11': dependencies: '@types/node': 25.0.9 @@ -33301,125 +33208,84 @@ snapshots: vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) vue: 3.5.25(typescript@6.0.2) - '@vitest/browser@4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18)': + '@vitest/browser@4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.1.4)': dependencies: - '@vitest/mocker': 4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) - '@vitest/utils': 4.0.18 + '@blazediff/core': 1.9.1 + '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + '@vitest/utils': 4.1.4 magic-string: 0.30.21 - pixelmatch: 7.1.0 pngjs: 7.0.0 sirv: 3.0.2 - tinyrainbow: 3.0.3 - vitest: 4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@25.0.1)(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - ws: 8.18.3 + tinyrainbow: 3.1.0 + vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1)(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + ws: 8.20.0 transitivePeerDependencies: - bufferutil - msw - utf-8-validate - vite - '@vitest/expect@3.2.4': + '@vitest/expect@4.1.4': dependencies: + '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.2 - '@vitest/spy': 3.2.4 - '@vitest/utils': 3.2.4 - chai: 5.2.0 - tinyrainbow: 2.0.0 - - '@vitest/expect@4.0.18': - dependencies: - '@standard-schema/spec': 1.0.0 - '@types/chai': 5.2.2 - '@vitest/spy': 4.0.18 - '@vitest/utils': 4.0.18 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 chai: 6.2.2 - tinyrainbow: 3.0.3 + tinyrainbow: 3.1.0 - '@vitest/mocker@3.2.4(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))': + '@vitest/mocker@4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))': dependencies: - '@vitest/spy': 3.2.4 + '@vitest/spy': 4.1.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.7.0(@types/node@25.0.9)(typescript@5.9.2) vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - '@vitest/mocker@3.2.4(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))': + '@vitest/mocker@4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))': dependencies: - '@vitest/spy': 3.2.4 + '@vitest/spy': 4.1.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.7.0(@types/node@25.0.9)(typescript@6.0.2) vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - '@vitest/mocker@4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))': + '@vitest/pretty-format@4.1.4': dependencies: - '@vitest/spy': 4.0.18 - estree-walker: 3.0.3 - magic-string: 0.30.21 - optionalDependencies: - msw: 2.7.0(@types/node@25.0.9)(typescript@6.0.2) - vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + tinyrainbow: 3.1.0 - '@vitest/pretty-format@3.2.4': + '@vitest/runner@4.1.4': dependencies: - tinyrainbow: 2.0.0 - - '@vitest/pretty-format@4.0.18': - dependencies: - tinyrainbow: 3.0.3 - - '@vitest/runner@3.2.4': - dependencies: - '@vitest/utils': 3.2.4 - pathe: 2.0.3 - strip-literal: 3.1.0 - - '@vitest/runner@4.0.18': - dependencies: - '@vitest/utils': 4.0.18 + '@vitest/utils': 4.1.4 pathe: 2.0.3 - '@vitest/snapshot@3.2.4': + '@vitest/snapshot@4.1.4': dependencies: - '@vitest/pretty-format': 3.2.4 + '@vitest/pretty-format': 4.1.4 + '@vitest/utils': 4.1.4 magic-string: 0.30.21 pathe: 2.0.3 - '@vitest/snapshot@4.0.18': - dependencies: - '@vitest/pretty-format': 4.0.18 - magic-string: 0.30.21 - pathe: 2.0.3 + '@vitest/spy@4.1.4': {} - '@vitest/spy@3.2.4': + '@vitest/ui@4.1.4(vitest@4.1.4)': dependencies: - tinyspy: 4.0.4 - - '@vitest/spy@4.0.18': {} - - '@vitest/ui@4.0.18(vitest@4.0.18)': - dependencies: - '@vitest/utils': 4.0.18 + '@vitest/utils': 4.1.4 fflate: 0.8.2 - flatted: 3.3.3 + flatted: 3.4.2 pathe: 2.0.3 sirv: 3.0.2 tinyglobby: 0.2.15 - tinyrainbow: 3.0.3 - vitest: 4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + tinyrainbow: 3.1.0 + vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) - '@vitest/utils@3.2.4': + '@vitest/utils@4.1.4': dependencies: - '@vitest/pretty-format': 3.2.4 - loupe: 3.2.1 - tinyrainbow: 2.0.0 - - '@vitest/utils@4.0.18': - dependencies: - '@vitest/pretty-format': 4.0.18 - tinyrainbow: 3.0.3 + '@vitest/pretty-format': 4.1.4 + convert-source-map: 2.0.0 + tinyrainbow: 3.1.0 '@volar/language-core@2.4.23': dependencies: @@ -34023,8 +33889,6 @@ snapshots: pvutils: 1.1.3 tslib: 2.8.1 - assertion-error@2.0.1: {} - ast-module-types@6.0.1: {} async-mutex@0.5.0: @@ -34365,8 +34229,6 @@ snapshots: optionalDependencies: magicast: 0.5.1 - cac@6.7.14: {} - call-bind-apply-helpers@1.0.2: dependencies: es-errors: 1.3.0 @@ -34397,14 +34259,6 @@ snapshots: caniuse-lite@1.0.30001760: {} - chai@5.2.0: - dependencies: - assertion-error: 2.0.1 - check-error: 2.1.1 - deep-eql: 5.0.2 - loupe: 3.1.3 - pathval: 2.0.0 - chai@6.2.2: {} chalk@3.0.0: @@ -34425,8 +34279,6 @@ snapshots: chardet@2.1.1: {} - check-error@2.1.1: {} - cheerio-select@2.1.0: dependencies: boolbase: 1.0.0 @@ -34690,11 +34542,11 @@ snapshots: convert-source-map@2.0.0: {} - convex-helpers@0.1.104(@standard-schema/spec@1.0.0)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(typescript@6.0.2)(zod@3.25.57): + convex-helpers@0.1.104(@standard-schema/spec@1.1.0)(convex@1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3))(hono@4.7.10)(react@19.2.3)(typescript@6.0.2)(zod@3.25.57): dependencies: convex: 1.28.2(@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(react@19.2.3) optionalDependencies: - '@standard-schema/spec': 1.0.0 + '@standard-schema/spec': 1.1.0 hono: 4.7.10 react: 19.2.3 typescript: 6.0.2 @@ -34934,8 +34786,6 @@ snapshots: optionalDependencies: babel-plugin-macros: 3.1.0 - deep-eql@5.0.2: {} - deep-equal@2.2.3: dependencies: array-buffer-byte-length: 1.0.2 @@ -35876,7 +35726,7 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 - expect-type@1.2.2: {} + expect-type@1.3.0: {} express@4.21.2: dependencies: @@ -36159,15 +36009,15 @@ snapshots: flat-cache@4.0.1: dependencies: - flatted: 3.3.2 + flatted: 3.3.3 keyv: 4.5.4 flat@5.0.2: {} - flatted@3.3.2: {} - flatted@3.3.3: {} + flatted@3.4.2: {} + fn.name@1.1.0: {} follow-redirects@1.15.9(debug@4.4.3): @@ -37377,10 +37227,6 @@ snapshots: dependencies: js-tokens: 4.0.0 - loupe@3.1.3: {} - - loupe@3.2.1: {} - lower-case@2.0.2: dependencies: tslib: 2.8.1 @@ -37405,10 +37251,6 @@ snapshots: lz-string@1.5.0: {} - magic-string@0.30.17: - dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 - magic-string@0.30.21: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 @@ -38431,8 +38273,6 @@ snapshots: pathe@2.0.3: {} - pathval@2.0.0: {} - pend@1.2.0: {} perfect-debounce@1.0.0: {} @@ -38479,10 +38319,6 @@ snapshots: pirates@4.0.7: {} - pixelmatch@7.1.0: - dependencies: - pngjs: 7.0.0 - pkg-dir@4.2.0: dependencies: find-up: 4.1.0 @@ -39794,6 +39630,8 @@ snapshots: std-env@3.9.0: {} + std-env@4.1.0: {} + stop-iteration-iterator@1.1.0: dependencies: es-errors: 1.3.0 @@ -40032,13 +39870,7 @@ snapshots: fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 - tinypool@1.1.1: {} - - tinyrainbow@2.0.0: {} - - tinyrainbow@3.0.3: {} - - tinyspy@4.0.4: {} + tinyrainbow@3.1.0: {} tldts-core@6.1.76: {} @@ -40517,28 +40349,6 @@ snapshots: import-meta-resolve: 4.1.0 zod: 3.25.57 - vite-node@3.2.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1): - dependencies: - cac: 6.7.14 - debug: 4.4.3 - es-module-lexer: 1.7.0 - pathe: 2.0.3 - vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - transitivePeerDependencies: - - '@types/node' - - '@vitejs/devtools' - - esbuild - - jiti - - less - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - tsx - - yaml - vite-plugin-dts@4.2.3(@types/node@25.0.9)(rollup@4.56.0)(typescript@6.0.2)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) @@ -40644,177 +40454,92 @@ snapshots: optionalDependencies: vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(@vitest/browser@4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18))(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1): + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1)(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)): dependencies: - '@types/chai': 5.2.2 - '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) - '@vitest/pretty-format': 3.2.4 - '@vitest/runner': 3.2.4 - '@vitest/snapshot': 3.2.4 - '@vitest/spy': 3.2.4 - '@vitest/utils': 3.2.4 - chai: 5.2.0 - debug: 4.4.3 - expect-type: 1.2.2 - magic-string: 0.30.17 - pathe: 2.0.3 - picomatch: 4.0.2 - std-env: 3.9.0 - tinybench: 2.9.0 - tinyexec: 0.3.2 - tinyglobby: 0.2.15 - tinypool: 1.1.1 - tinyrainbow: 2.0.0 - vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - vite-node: 3.2.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/debug': 4.1.12 - '@types/node': 25.0.9 - '@vitest/browser': 4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18) - '@vitest/ui': 4.0.18(vitest@4.0.18) - jsdom: 27.0.0(postcss@8.5.8) - transitivePeerDependencies: - - '@vitejs/devtools' - - esbuild - - jiti - - less - - msw - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - tsx - - yaml - - vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(@vitest/browser@4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18))(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1): - dependencies: - '@types/chai': 5.2.2 - '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) - '@vitest/pretty-format': 3.2.4 - '@vitest/runner': 3.2.4 - '@vitest/snapshot': 3.2.4 - '@vitest/spy': 3.2.4 - '@vitest/utils': 3.2.4 - chai: 5.2.0 - debug: 4.4.3 - expect-type: 1.2.2 - magic-string: 0.30.17 - pathe: 2.0.3 - picomatch: 4.0.2 - std-env: 3.9.0 - tinybench: 2.9.0 - tinyexec: 0.3.2 - tinyglobby: 0.2.15 - tinypool: 1.1.1 - tinyrainbow: 2.0.0 - vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - vite-node: 3.2.4(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/debug': 4.1.12 - '@types/node': 25.0.9 - '@vitest/browser': 4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))(vitest@4.0.18) - '@vitest/ui': 4.0.18(vitest@4.0.18) - jsdom: 27.0.0(postcss@8.5.8) - transitivePeerDependencies: - - '@vitejs/devtools' - - esbuild - - jiti - - less - - msw - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - tsx - - yaml - - vitest@4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@25.0.1)(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1): - dependencies: - '@vitest/expect': 4.0.18 - '@vitest/mocker': 4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) - '@vitest/pretty-format': 4.0.18 - '@vitest/runner': 4.0.18 - '@vitest/snapshot': 4.0.18 - '@vitest/spy': 4.0.18 - '@vitest/utils': 4.0.18 - es-module-lexer: 1.7.0 - expect-type: 1.2.2 + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + '@vitest/pretty-format': 4.1.4 + '@vitest/runner': 4.1.4 + '@vitest/snapshot': 4.1.4 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 + es-module-lexer: 2.0.0 + expect-type: 1.3.0 magic-string: 0.30.21 obug: 2.1.1 pathe: 2.0.3 picomatch: 4.0.3 - std-env: 3.10.0 + std-env: 4.1.0 tinybench: 2.9.0 tinyexec: 1.0.2 tinyglobby: 0.2.15 - tinyrainbow: 3.0.3 + tinyrainbow: 3.1.0 vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 25.0.9 - '@vitest/ui': 4.0.18(vitest@4.0.18) + '@vitest/ui': 4.1.4(vitest@4.1.4) jsdom: 25.0.1 transitivePeerDependencies: - - '@vitejs/devtools' - - esbuild - - jiti - - less - msw - - sass - - sass-embedded - - stylus - - sugarss - - terser - - tsx - - yaml - vitest@4.0.18(@types/node@25.0.9)(@vitest/ui@4.0.18)(esbuild@0.27.4)(jiti@2.6.1)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1): + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)): dependencies: - '@vitest/expect': 4.0.18 - '@vitest/mocker': 4.0.18(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) - '@vitest/pretty-format': 4.0.18 - '@vitest/runner': 4.0.18 - '@vitest/snapshot': 4.0.18 - '@vitest/spy': 4.0.18 - '@vitest/utils': 4.0.18 - es-module-lexer: 1.7.0 - expect-type: 1.2.2 + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + '@vitest/pretty-format': 4.1.4 + '@vitest/runner': 4.1.4 + '@vitest/snapshot': 4.1.4 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 + es-module-lexer: 2.0.0 + expect-type: 1.3.0 magic-string: 0.30.21 obug: 2.1.1 pathe: 2.0.3 picomatch: 4.0.3 - std-env: 3.10.0 + std-env: 4.1.0 tinybench: 2.9.0 tinyexec: 1.0.2 tinyglobby: 0.2.15 - tinyrainbow: 3.0.3 + tinyrainbow: 3.1.0 vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 25.0.9 - '@vitest/ui': 4.0.18(vitest@4.0.18) + '@vitest/ui': 4.1.4(vitest@4.1.4) + jsdom: 27.0.0(postcss@8.5.8) + transitivePeerDependencies: + - msw + + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)): + dependencies: + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) + '@vitest/pretty-format': 4.1.4 + '@vitest/runner': 4.1.4 + '@vitest/snapshot': 4.1.4 + '@vitest/spy': 4.1.4 + '@vitest/utils': 4.1.4 + es-module-lexer: 2.0.0 + expect-type: 1.3.0 + magic-string: 0.30.21 + obug: 2.1.1 + pathe: 2.0.3 + picomatch: 4.0.3 + std-env: 4.1.0 + tinybench: 2.9.0 + tinyexec: 1.0.2 + tinyglobby: 0.2.15 + tinyrainbow: 3.1.0 + vite: 8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) + why-is-node-running: 2.3.0 + optionalDependencies: + '@types/node': 25.0.9 + '@vitest/ui': 4.1.4(vitest@4.1.4) jsdom: 27.0.0(postcss@8.5.8) transitivePeerDependencies: - - '@vitejs/devtools' - - esbuild - - jiti - - less - msw - - sass - - sass-embedded - - stylus - - sugarss - - terser - - tsx - - yaml vscode-uri@3.0.8: {} @@ -41269,6 +40994,8 @@ snapshots: ws@8.18.3: {} + ws@8.20.0: {} + xml-name-validator@4.0.0: {} xml-name-validator@5.0.0: {} From c19571fd5de0e4544206d92c1d84e4e8c455f1fb Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Fri, 17 Apr 2026 21:20:16 +0200 Subject: [PATCH 014/597] stabilize rsc tests (#7217) --- e2e/react-start/rsc/tests/hydration.ts | 7 +++++ .../rsc/tests/rsc-async-bundle.spec.ts | 5 ++-- e2e/react-start/rsc/tests/rsc-basic.spec.ts | 3 +- e2e/react-start/rsc/tests/rsc-bundle.spec.ts | 9 +++--- e2e/react-start/rsc/tests/rsc-caching.spec.ts | 11 +++---- .../rsc/tests/rsc-client-preload.spec.ts | 5 ++-- .../rsc/tests/rsc-component-slot.spec.ts | 15 +++++----- e2e/react-start/rsc/tests/rsc-context.spec.ts | 11 +++---- .../rsc/tests/rsc-css-modules.spec.ts | 5 ++-- .../rsc/tests/rsc-deferred.spec.ts | 7 +++-- e2e/react-start/rsc/tests/rsc-forms.spec.ts | 13 +++++---- .../rsc/tests/rsc-global-css.spec.ts | 7 +++-- .../rsc/tests/rsc-hydration.spec.ts | 3 +- e2e/react-start/rsc/tests/rsc-link.spec.ts | 7 +++-- .../rsc/tests/rsc-nested-structure.spec.ts | 29 ++++++++++--------- e2e/react-start/rsc/tests/rsc-nested.spec.ts | 9 +++--- .../rsc/tests/rsc-parallel-flash.spec.ts | 9 +++--- .../rsc/tests/rsc-param-remount.spec.ts | 5 ++-- .../rsc/tests/rsc-react-cache.spec.ts | 3 +- .../rsc/tests/rsc-server-not-found.spec.ts | 3 +- .../rsc/tests/rsc-server-redirect.spec.ts | 3 +- .../rsc/tests/rsc-slot-jsx-args.spec.ts | 3 +- e2e/react-start/rsc/tests/rsc-slots.spec.ts | 9 +++--- .../rsc/tests/rsc-ssr-data-only.spec.ts | 3 +- .../rsc/tests/rsc-ssr-false.spec.ts | 27 ++++++++--------- .../rsc/tests/rsc-stream-flash.spec.ts | 9 +++--- .../rsc/tests/rsc-stream-generator.spec.ts | 15 +++++----- .../rsc/tests/rsc-stream-readable.spec.ts | 13 +++++---- .../rsc/tests/rsc-suspense.spec.ts | 5 ++-- e2e/react-start/rsc/tests/rsc-tree.spec.ts | 11 +++---- 30 files changed, 150 insertions(+), 114 deletions(-) create mode 100644 e2e/react-start/rsc/tests/hydration.ts diff --git a/e2e/react-start/rsc/tests/hydration.ts b/e2e/react-start/rsc/tests/hydration.ts new file mode 100644 index 0000000000..ed6e97c673 --- /dev/null +++ b/e2e/react-start/rsc/tests/hydration.ts @@ -0,0 +1,7 @@ +import { expect, type Page } from '@playwright/test' + +export async function waitForHydration(page: Page) { + await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated', { + timeout: 15000, + }) +} diff --git a/e2e/react-start/rsc/tests/rsc-async-bundle.spec.ts b/e2e/react-start/rsc/tests/rsc-async-bundle.spec.ts index ce12d22ad3..452ba404bd 100644 --- a/e2e/react-start/rsc/tests/rsc-async-bundle.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-async-bundle.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Async Bundle Tests - Multiple RSC Promises with React.use()', () => { test('Loading states appear for each RSC before they resolve', async ({ @@ -222,7 +223,7 @@ test.describe('RSC Async Bundle Tests - Multiple RSC Promises with React.use()', // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to async bundle page via link (if nav exists) or direct navigation await page.goto('/rsc-async-bundle') @@ -265,7 +266,7 @@ test.describe('RSC Async Bundle Tests - Multiple RSC Promises with React.use()', // Navigate away await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Second visit (force new request) await page.goto('/rsc-async-bundle') diff --git a/e2e/react-start/rsc/tests/rsc-basic.spec.ts b/e2e/react-start/rsc/tests/rsc-basic.spec.ts index 6833eedac3..6bfa18e96b 100644 --- a/e2e/react-start/rsc/tests/rsc-basic.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-basic.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Basic Tests', () => { test('RSC renders with server timestamp', async ({ page }) => { @@ -29,7 +30,7 @@ test.describe('RSC Basic Tests', () => { // Start from home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to RSC page via nav bar (need to be specific to avoid matching example cards) await page.getByTestId('nav-basic').click() diff --git a/e2e/react-start/rsc/tests/rsc-bundle.spec.ts b/e2e/react-start/rsc/tests/rsc-bundle.spec.ts index 9dd5cdd0fa..346264b89c 100644 --- a/e2e/react-start/rsc/tests/rsc-bundle.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-bundle.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Bundle Tests - Multiple RSCs from single server function', () => { test('All bundled RSCs render correctly on initial load', async ({ @@ -49,7 +50,7 @@ test.describe('RSC Bundle Tests - Multiple RSCs from single server function', () test('Client slots in bundled RSCs work correctly', async ({ page }) => { await page.goto('/rsc-bundle') await page.waitForURL('/rsc-bundle') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify client actions area is rendered await expect(page.getByTestId('content-actions')).toBeVisible() @@ -81,7 +82,7 @@ test.describe('RSC Bundle Tests - Multiple RSCs from single server function', () test('Client interactions do not reload bundled RSCs', async ({ page }) => { await page.goto('/rsc-bundle') await page.waitForURL('/rsc-bundle') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial timestamp const initialTimestamp = await page @@ -120,7 +121,7 @@ test.describe('RSC Bundle Tests - Multiple RSCs from single server function', () // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to bundle page via nav bar (use exact match to avoid 'Async Bundle') await page.getByTestId('nav-bundle').click() @@ -145,7 +146,7 @@ test.describe('RSC Bundle Tests - Multiple RSCs from single server function', () // Navigate away await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Second visit (force reload) await page.goto('/rsc-bundle') diff --git a/e2e/react-start/rsc/tests/rsc-caching.spec.ts b/e2e/react-start/rsc/tests/rsc-caching.spec.ts index 90ce9e232b..6a9c39aa38 100644 --- a/e2e/react-start/rsc/tests/rsc-caching.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-caching.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Caching Tests - staleTime behavior', () => { test('Page loads with cache controls visible', async ({ page }) => { @@ -24,7 +25,7 @@ test.describe('RSC Caching Tests - staleTime behavior', () => { test('Force refresh button triggers RSC refetch', async ({ page }) => { await page.goto('/rsc-caching') await page.waitForURL('/rsc-caching') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial timestamp const initialTimestamp = await page @@ -51,7 +52,7 @@ test.describe('RSC Caching Tests - staleTime behavior', () => { test('Multiple force refreshes increment counter', async ({ page }) => { await page.goto('/rsc-caching') await page.waitForURL('/rsc-caching') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Click force refresh multiple times await page.getByTestId('force-refresh-btn').click() @@ -75,7 +76,7 @@ test.describe('RSC Caching Tests - staleTime behavior', () => { }) => { await page.goto('/rsc-caching') await page.waitForURL('/rsc-caching') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial timestamp const initialTimestamp = await page @@ -104,7 +105,7 @@ test.describe('RSC Caching Tests - staleTime behavior', () => { test('Each force refresh updates the timestamp', async ({ page }) => { await page.goto('/rsc-caching') await page.waitForURL('/rsc-caching') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) const timestamps: number[] = [] @@ -148,7 +149,7 @@ test.describe('RSC Caching Tests - staleTime behavior', () => { // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to caching page via nav bar await page.getByTestId('nav-caching').click() diff --git a/e2e/react-start/rsc/tests/rsc-client-preload.spec.ts b/e2e/react-start/rsc/tests/rsc-client-preload.spec.ts index b398321f4e..16b561e0db 100644 --- a/e2e/react-start/rsc/tests/rsc-client-preload.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-client-preload.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Client Component Preload Tests', () => { function getModulePreloads(html: string): Array { @@ -76,7 +77,7 @@ test.describe('RSC Client Component Preload Tests', () => { test('client component is interactive after hydration', async ({ page }) => { await page.goto('/rsc-client-preload') await page.waitForURL('/rsc-client-preload') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify initial count is 0 await expect(page.getByTestId('client-widget-count')).toHaveText('0') @@ -104,7 +105,7 @@ test.describe('RSC Client Component Preload Tests', () => { await page.goto('/rsc-client-preload') await page.waitForURL('/rsc-client-preload') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify content is visible await expect(page.getByTestId('client-widget')).toBeVisible() diff --git a/e2e/react-start/rsc/tests/rsc-component-slot.spec.ts b/e2e/react-start/rsc/tests/rsc-component-slot.spec.ts index 8e3666e8de..92b99373bb 100644 --- a/e2e/react-start/rsc/tests/rsc-component-slot.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-component-slot.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Component Slot Tests - Passing components as props', () => { test('Renders server product card with client component slots', async ({ @@ -7,7 +8,7 @@ test.describe('RSC Component Slot Tests - Passing components as props', () => { }) => { await page.goto('/rsc-component-slot') await page.waitForURL('/rsc-component-slot') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify server-rendered product card await expect(page.getByTestId('rsc-product-card')).toBeVisible() @@ -27,7 +28,7 @@ test.describe('RSC Component Slot Tests - Passing components as props', () => { test('Changing quantity does not reload RSC', async ({ page }) => { await page.goto('/rsc-component-slot') await page.waitForURL('/rsc-component-slot') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialTimestamp = await page @@ -64,7 +65,7 @@ test.describe('RSC Component Slot Tests - Passing components as props', () => { test('Toggling badge details does not reload RSC', async ({ page }) => { await page.goto('/rsc-component-slot') await page.waitForURL('/rsc-component-slot') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialTimestamp = await page @@ -94,7 +95,7 @@ test.describe('RSC Component Slot Tests - Passing components as props', () => { test('Add to cart interaction does not reload RSC', async ({ page }) => { await page.goto('/rsc-component-slot') await page.waitForURL('/rsc-component-slot') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialTimestamp = await page @@ -129,7 +130,7 @@ test.describe('RSC Component Slot Tests - Passing components as props', () => { }) => { await page.goto('/rsc-component-slot') await page.waitForURL('/rsc-component-slot') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialTimestamp = await page @@ -159,7 +160,7 @@ test.describe('RSC Component Slot Tests - Passing components as props', () => { test('Reset quantity works without reloading RSC', async ({ page }) => { await page.goto('/rsc-component-slot') await page.waitForURL('/rsc-component-slot') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialTimestamp = await page @@ -191,7 +192,7 @@ test.describe('RSC Component Slot Tests - Passing components as props', () => { }) => { await page.goto('/rsc-component-slot') await page.waitForURL('/rsc-component-slot') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify server-provided data is passed to client components // Product ID comes from server and is displayed in client component diff --git a/e2e/react-start/rsc/tests/rsc-context.spec.ts b/e2e/react-start/rsc/tests/rsc-context.spec.ts index dd56fa3ec2..85492318eb 100644 --- a/e2e/react-start/rsc/tests/rsc-context.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-context.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Context Tests - React Context interaction', () => { test('Page loads with context controls visible', async ({ page }) => { @@ -25,7 +26,7 @@ test.describe('RSC Context Tests - React Context interaction', () => { test('Theme toggle changes context', async ({ page }) => { await page.goto('/rsc-context') await page.waitForURL('/rsc-context') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify initial theme await expect(page.getByTestId('current-theme')).toContainText( @@ -53,7 +54,7 @@ test.describe('RSC Context Tests - React Context interaction', () => { test('Notifications toggle works correctly', async ({ page }) => { await page.goto('/rsc-context') await page.waitForURL('/rsc-context') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify initial notifications state is ON await expect(page.getByTestId('toggle-notifications-btn')).toContainText( @@ -83,7 +84,7 @@ test.describe('RSC Context Tests - React Context interaction', () => { test('Theme changes do not refetch RSC', async ({ page }) => { await page.goto('/rsc-context') await page.waitForURL('/rsc-context') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial timestamp const initialTimestamp = await page @@ -121,7 +122,7 @@ test.describe('RSC Context Tests - React Context interaction', () => { }) => { await page.goto('/rsc-context') await page.waitForURL('/rsc-context') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify context consumer is visible await expect(page.getByTestId('context-consumer')).toBeVisible() @@ -144,7 +145,7 @@ test.describe('RSC Context Tests - React Context interaction', () => { test('Multiple context changes work correctly', async ({ page }) => { await page.goto('/rsc-context') await page.waitForURL('/rsc-context') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Change both theme and notifications await page.getByTestId('toggle-theme-btn').click() diff --git a/e2e/react-start/rsc/tests/rsc-css-modules.spec.ts b/e2e/react-start/rsc/tests/rsc-css-modules.spec.ts index 01a499a70f..1065770f2f 100644 --- a/e2e/react-start/rsc/tests/rsc-css-modules.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-css-modules.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC CSS Modules Tests', () => { test('RSC with CSS modules hydrates without errors', async ({ page }) => { @@ -13,7 +14,7 @@ test.describe('RSC CSS Modules Tests', () => { await page.goto('/rsc-css-modules') await page.waitForURL('/rsc-css-modules') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify content is visible await expect(page.getByTestId('rsc-css-modules-content')).toBeVisible() @@ -106,7 +107,7 @@ test.describe('RSC CSS Modules Tests', () => { }) => { await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await page.getByTestId('nav-css-modules').click() await page.waitForURL('/rsc-css-modules') diff --git a/e2e/react-start/rsc/tests/rsc-deferred.spec.ts b/e2e/react-start/rsc/tests/rsc-deferred.spec.ts index 1bdf7d2cf3..b6a52d7879 100644 --- a/e2e/react-start/rsc/tests/rsc-deferred.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-deferred.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' const DEFERRED_DATA_TIMEOUT = 5000 // Deferred data takes ~2 seconds test.describe('RSC Deferred Tests - RSC with streamed Promise data', () => { @@ -64,7 +65,7 @@ test.describe('RSC Deferred Tests - RSC with streamed Promise data', () => { await expect(page.getByTestId('analytics-display')).toBeVisible({ timeout: DEFERRED_DATA_TIMEOUT, }) - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Initially no metric selected await expect(page.getByTestId('selected-metric')).not.toBeVisible() @@ -126,7 +127,7 @@ test.describe('RSC Deferred Tests - RSC with streamed Promise data', () => { await expect(page.getByTestId('analytics-display')).toBeVisible({ timeout: DEFERRED_DATA_TIMEOUT, }) - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial values const initialTimestamp = await page @@ -158,7 +159,7 @@ test.describe('RSC Deferred Tests - RSC with streamed Promise data', () => { // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to deferred page via nav bar await page.getByTestId('nav-deferred').click() diff --git a/e2e/react-start/rsc/tests/rsc-forms.spec.ts b/e2e/react-start/rsc/tests/rsc-forms.spec.ts index 61fd391d42..c6a8a6e4cd 100644 --- a/e2e/react-start/rsc/tests/rsc-forms.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-forms.spec.ts @@ -1,5 +1,6 @@ import { expect, type Page } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' async function getTodoCount(page: Page) { const countText = await page.getByTestId('rsc-todo-count').textContent() @@ -31,7 +32,7 @@ test.describe('RSC Forms Tests - Todo list with mutations', () => { test('Add todo button is disabled when input is empty', async ({ page }) => { await page.goto('/rsc-forms') await page.waitForURL('/rsc-forms') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify button is disabled with empty input await expect(page.getByTestId('add-todo-btn')).toBeDisabled() @@ -52,7 +53,7 @@ test.describe('RSC Forms Tests - Todo list with mutations', () => { test('Adding a todo refreshes the RSC', async ({ page }) => { await page.goto('/rsc-forms') await page.waitForURL('/rsc-forms') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) const initialCount = await getTodoCount(page) @@ -75,7 +76,7 @@ test.describe('RSC Forms Tests - Todo list with mutations', () => { test('Todo input clears after successful submission', async ({ page }) => { await page.goto('/rsc-forms') await page.waitForURL('/rsc-forms') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Type and submit await page.getByTestId('todo-input').fill('Clear test todo') @@ -90,7 +91,7 @@ test.describe('RSC Forms Tests - Todo list with mutations', () => { test('Form submission works via Enter key', async ({ page }) => { await page.goto('/rsc-forms') await page.waitForURL('/rsc-forms') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) const initialCount = await getTodoCount(page) @@ -112,7 +113,7 @@ test.describe('RSC Forms Tests - Todo list with mutations', () => { test('Multiple todos can be added in sequence', async ({ page }) => { await page.goto('/rsc-forms') await page.waitForURL('/rsc-forms') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) let expectedCount = await getTodoCount(page) @@ -153,7 +154,7 @@ test.describe('RSC Forms Tests - Todo list with mutations', () => { test('Whitespace-only input does not submit', async ({ page }) => { await page.goto('/rsc-forms') await page.waitForURL('/rsc-forms') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Type whitespace only await page.getByTestId('todo-input').fill(' ') diff --git a/e2e/react-start/rsc/tests/rsc-global-css.spec.ts b/e2e/react-start/rsc/tests/rsc-global-css.spec.ts index 95ff870ec0..b72b80747b 100644 --- a/e2e/react-start/rsc/tests/rsc-global-css.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-global-css.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Global CSS Tests', () => { test('RSC with global CSS hydrates without errors', async ({ page }) => { @@ -13,7 +14,7 @@ test.describe('RSC Global CSS Tests', () => { await page.goto('/rsc-global-css') await page.waitForURL('/rsc-global-css') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify content is visible await expect(page.getByTestId('rsc-global-css-content')).toBeVisible() @@ -42,7 +43,7 @@ test.describe('RSC Global CSS Tests', () => { // Start from home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to RSC global CSS page via nav bar await page.getByTestId('nav-global-css').click() @@ -133,7 +134,7 @@ test.describe('RSC Global CSS Tests', () => { // Start from home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to RSC global CSS page via nav bar await page.getByTestId('nav-global-css').click() diff --git a/e2e/react-start/rsc/tests/rsc-hydration.spec.ts b/e2e/react-start/rsc/tests/rsc-hydration.spec.ts index 26cc6709eb..4bc59e0990 100644 --- a/e2e/react-start/rsc/tests/rsc-hydration.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-hydration.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Hydration Tests - Hydration mismatch detection', () => { test('Page loads with hydration status visible', async ({ page }) => { @@ -105,7 +106,7 @@ test.describe('RSC Hydration Tests - Hydration mismatch detection', () => { // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to hydration page via nav await page.getByTestId('nav-hydration').click() diff --git a/e2e/react-start/rsc/tests/rsc-link.spec.ts b/e2e/react-start/rsc/tests/rsc-link.spec.ts index ca0a7e8c5d..bd4264210c 100644 --- a/e2e/react-start/rsc/tests/rsc-link.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-link.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Link Tests', () => { test('RSC renders with Link component', async ({ page }) => { @@ -24,7 +25,7 @@ test.describe('RSC Link Tests', () => { test('Link inside RSC navigates correctly on click', async ({ page }) => { await page.goto('/rsc-link') await page.waitForURL('/rsc-link') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify we're on the RSC link page await expect(page.getByTestId('rsc-link-title')).toBeVisible() @@ -49,7 +50,7 @@ test.describe('RSC Link Tests', () => { // Start from home page await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to RSC link page via nav bar (need to be specific to avoid matching example cards) await page.getByTestId('nav-link').click() @@ -72,7 +73,7 @@ test.describe('RSC Link Tests', () => { }) => { await page.goto('/rsc-link') await page.waitForURL('/rsc-link') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Set a marker in window to detect full page reload await page.evaluate(() => { diff --git a/e2e/react-start/rsc/tests/rsc-nested-structure.spec.ts b/e2e/react-start/rsc/tests/rsc-nested-structure.spec.ts index 9e513ccc98..938d77cd1c 100644 --- a/e2e/react-start/rsc/tests/rsc-nested-structure.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-nested-structure.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Nested Structure Tests', () => { test('Nested renderServerComponent parts render via dot access', async ({ @@ -24,7 +25,7 @@ test.describe('RSC Nested Structure Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify Header component await expect(page.getByTestId('rsc-nested-header')).toBeVisible() @@ -45,7 +46,7 @@ test.describe('RSC Nested Structure Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify Stats component await expect(page.getByTestId('rsc-nested-stats')).toBeVisible() @@ -69,7 +70,7 @@ test.describe('RSC Nested Structure Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify Info component await expect(page.getByTestId('rsc-nested-info')).toBeVisible() @@ -89,7 +90,7 @@ test.describe('RSC Nested Structure Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify Footer component await expect(page.getByTestId('rsc-nested-footer')).toBeVisible() @@ -115,7 +116,7 @@ test.describe('RSC Nested Structure Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial server timestamp const initialTimestamp = await page @@ -148,7 +149,7 @@ test.describe('RSC Nested Structure Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Initial: 13624 * 1 = 13624 await expect(page.getByTestId('stats-computed-value')).toContainText( @@ -177,7 +178,7 @@ test.describe('RSC Nested Structure Tests', () => { test('Nested slot visibility can be toggled', async ({ page }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Initially visible await expect(page.getByTestId('info-slot-content')).toBeVisible() @@ -198,7 +199,7 @@ test.describe('RSC Nested Structure Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial server timestamp from footer const initialVersion = await page @@ -232,7 +233,7 @@ test.describe('RSC Nested Structure Tests', () => { // Start from home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate via nav link await page.getByTestId('nav-nested-structure').click() @@ -257,7 +258,7 @@ test.describe('RSC Destructured Access Tests', () => { test('Destructured components render correctly', async ({ page }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify destructured Header await expect(page.getByTestId('rsc-destructured-header')).toBeVisible() @@ -275,7 +276,7 @@ test.describe('RSC Destructured Access Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify header slot await expect(page.getByTestId('destructured-header-slot')).toBeVisible() @@ -295,7 +296,7 @@ test.describe('RSC Destructured Access Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify render prop slot with server data (count = 42) await expect(page.getByTestId('destructured-content-slot')).toBeVisible() @@ -313,7 +314,7 @@ test.describe('RSC Destructured Access Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial timestamp const initialTimestamp = await page @@ -346,7 +347,7 @@ test.describe('RSC Destructured Access Tests', () => { }) => { await page.goto('/rsc-nested-structure') await page.waitForURL('/rsc-nested-structure') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Initial: 42 * 1 = 42 await expect(page.getByTestId('destructured-computed-value')).toContainText( diff --git a/e2e/react-start/rsc/tests/rsc-nested.spec.ts b/e2e/react-start/rsc/tests/rsc-nested.spec.ts index 957336f530..1baca3228c 100644 --- a/e2e/react-start/rsc/tests/rsc-nested.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-nested.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Nested Tests - RSCs composed inside each other via client', () => { test('Nested RSCs render correctly on initial load', async ({ page }) => { @@ -46,7 +47,7 @@ test.describe('RSC Nested Tests - RSCs composed inside each other via client', ( }) => { await page.goto('/rsc-nested') await page.waitForURL('/rsc-nested') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial timestamps for both RSCs const initialProductTimestamp = await page @@ -84,7 +85,7 @@ test.describe('RSC Nested Tests - RSCs composed inside each other via client', ( }) => { await page.goto('/rsc-nested') await page.waitForURL('/rsc-nested') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial timestamps const initialProductTimestamp = await page @@ -144,7 +145,7 @@ test.describe('RSC Nested Tests - RSCs composed inside each other via client', ( // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to nested RSC page via nav bar await page.getByTestId('nav-nested').click() @@ -189,7 +190,7 @@ test.describe('RSC Nested Tests - RSCs composed inside each other via client', ( }) => { await page.goto('/rsc-nested') await page.waitForURL('/rsc-nested') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial timestamps const initialProductTimestamp = await page diff --git a/e2e/react-start/rsc/tests/rsc-parallel-flash.spec.ts b/e2e/react-start/rsc/tests/rsc-parallel-flash.spec.ts index 5aa0c90726..80c6082b76 100644 --- a/e2e/react-start/rsc/tests/rsc-parallel-flash.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-parallel-flash.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' /** * RSC Parallel Flash Prevention Tests @@ -78,7 +79,7 @@ test.describe('RSC Parallel Flash Prevention', () => { await expect(page.getByTestId('rsc-basic-content')).toBeVisible({ timeout: 10000, }) - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to parallel route and monitor for flash const flashDetected = await monitorForFlash( @@ -102,7 +103,7 @@ test.describe('RSC Parallel Flash Prevention', () => { page, }) => { await page.goto('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await page.getByTestId('nav-parallel').click() await page.waitForURL('/rsc-parallel') @@ -133,7 +134,7 @@ test.describe('RSC Parallel Flash Prevention', () => { await expect(page.getByTestId('rsc-basic-content')).toBeVisible({ timeout: 10000, }) - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Monitor all three RSC elements for flash const flashADetected = await monitorForFlash( @@ -151,7 +152,7 @@ test.describe('RSC Parallel Flash Prevention', () => { await page.getByTestId('nav-basic').click() await page.waitForURL('/rsc-basic') await expect(page.getByTestId('rsc-basic-content')).toBeVisible() - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) const flashBDetected = await monitorForFlash( page, diff --git a/e2e/react-start/rsc/tests/rsc-param-remount.spec.ts b/e2e/react-start/rsc/tests/rsc-param-remount.spec.ts index 4f037f9d04..5943e588be 100644 --- a/e2e/react-start/rsc/tests/rsc-param-remount.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-param-remount.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Param - no remount / state preserved', () => { test('full load hydrates without mismatch', async ({ page }) => { @@ -14,7 +15,7 @@ test.describe('RSC Param - no remount / state preserved', () => { 'id: bravo', ) - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await page.getByTestId('rsc-param-direct-inc').click() await expect(page.getByTestId('rsc-param-direct-count')).toHaveText('1') }) @@ -27,7 +28,7 @@ test.describe('RSC Param - no remount / state preserved', () => { await page.goto('/rsc-param/alpha') await page.waitForURL('/rsc-param/alpha') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await expect(page.getByTestId('rsc-param-renderable-id')).toContainText( 'id: alpha', diff --git a/e2e/react-start/rsc/tests/rsc-react-cache.spec.ts b/e2e/react-start/rsc/tests/rsc-react-cache.spec.ts index ca581fc0fe..98281f23dc 100644 --- a/e2e/react-start/rsc/tests/rsc-react-cache.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-react-cache.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC React.cache Tests', () => { test('Page loads with React.cache test button', async ({ page }) => { @@ -96,7 +97,7 @@ test.describe('RSC React.cache Tests', () => { // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to React.cache page via nav bar await page.getByTestId('nav-react-cache').click() diff --git a/e2e/react-start/rsc/tests/rsc-server-not-found.spec.ts b/e2e/react-start/rsc/tests/rsc-server-not-found.spec.ts index c760b40140..162c39bf38 100644 --- a/e2e/react-start/rsc/tests/rsc-server-not-found.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-server-not-found.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Server Not Found Tests', () => { test.use({ @@ -32,7 +33,7 @@ test.describe('RSC Server Not Found Tests', () => { }) => { await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await page.getByTestId('nav-server-not-found').click() await page.waitForURL('/rsc-server-not-found') diff --git a/e2e/react-start/rsc/tests/rsc-server-redirect.spec.ts b/e2e/react-start/rsc/tests/rsc-server-redirect.spec.ts index da0a84fb94..8794852219 100644 --- a/e2e/react-start/rsc/tests/rsc-server-redirect.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-server-redirect.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Server Redirect Tests', () => { test('SSR follows route redirect when a server function throws redirect', async ({ @@ -17,7 +18,7 @@ test.describe('RSC Server Redirect Tests', () => { }) => { await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await page.getByTestId('nav-server-redirect').click() await page.waitForURL('/rsc-basic') diff --git a/e2e/react-start/rsc/tests/rsc-slot-jsx-args.spec.ts b/e2e/react-start/rsc/tests/rsc-slot-jsx-args.spec.ts index 52d7ce0cc4..7cadf0f1ba 100644 --- a/e2e/react-start/rsc/tests/rsc-slot-jsx-args.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-slot-jsx-args.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Slot Arg Tests - JSX element argument', () => { test('Client slot receives and renders JSX arg from server', async ({ @@ -7,7 +8,7 @@ test.describe('RSC Slot Arg Tests - JSX element argument', () => { }) => { await page.goto('/rsc-slot-jsx-args') await page.waitForURL('/rsc-slot-jsx-args') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await expect(page.getByTestId('rsc-jsx-args-server')).toBeVisible() await expect(page.getByTestId('rsc-jsx-args-client')).toBeVisible() diff --git a/e2e/react-start/rsc/tests/rsc-slots.spec.ts b/e2e/react-start/rsc/tests/rsc-slots.spec.ts index 484b62a588..1d55174067 100644 --- a/e2e/react-start/rsc/tests/rsc-slots.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-slots.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Slot Tests - Client-side slot changes without RSC reload', () => { test('SSR HTML includes modulepreload links for composite route client modules', async ({ @@ -23,7 +24,7 @@ test.describe('RSC Slot Tests - Client-side slot changes without RSC reload', () test('Changing child content does not reload RSC', async ({ page }) => { await page.goto('/rsc-slots') await page.waitForURL('/rsc-slots') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialRscTimestamp = await page @@ -53,7 +54,7 @@ test.describe('RSC Slot Tests - Client-side slot changes without RSC reload', () test('Changing footer render prop does not reload RSC', async ({ page }) => { await page.goto('/rsc-slots') await page.waitForURL('/rsc-slots') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp and footer value const initialRscTimestamp = await page @@ -81,7 +82,7 @@ test.describe('RSC Slot Tests - Client-side slot changes without RSC reload', () test('Adding/removing extra child does not reload RSC', async ({ page }) => { await page.goto('/rsc-slots') await page.waitForURL('/rsc-slots') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialRscTimestamp = await page @@ -120,7 +121,7 @@ test.describe('RSC Slot Tests - Client-side slot changes without RSC reload', () }) => { await page.goto('/rsc-slots') await page.waitForURL('/rsc-slots') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialRscTimestamp = await page diff --git a/e2e/react-start/rsc/tests/rsc-ssr-data-only.spec.ts b/e2e/react-start/rsc/tests/rsc-ssr-data-only.spec.ts index 4cfc094c5c..34fe963283 100644 --- a/e2e/react-start/rsc/tests/rsc-ssr-data-only.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-ssr-data-only.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC SSR Data-Only Tests - Loader on server, component on client', () => { test('Page renders with RSC content after initial load', async ({ page }) => { @@ -122,7 +123,7 @@ test.describe('RSC SSR Data-Only Tests - Loader on server, component on client', // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to the page via nav bar await page.getByTestId('nav-ssr-data-only').click() diff --git a/e2e/react-start/rsc/tests/rsc-ssr-false.spec.ts b/e2e/react-start/rsc/tests/rsc-ssr-false.spec.ts index 71490dd6b6..509e599efb 100644 --- a/e2e/react-start/rsc/tests/rsc-ssr-false.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-ssr-false.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' type Point = { x: number @@ -96,7 +97,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => test('Canvas is rendered and visible', async ({ page }) => { await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify canvas container await expect(page.getByTestId('canvas-container')).toBeVisible() @@ -108,7 +109,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => test('Brush size selection works', async ({ page }) => { await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await expect(page.getByTestId('canvas-container')).toBeVisible() @@ -125,7 +126,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => test('Color selection works', async ({ page }) => { await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await expect(page.getByTestId('canvas-container')).toBeVisible() @@ -143,7 +144,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => test('Drawing on canvas updates stroke count', async ({ page }) => { await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await expect(page.getByTestId('canvas-container')).toBeVisible() @@ -167,7 +168,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => test('Clear canvas button works', async ({ page }) => { await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await expect(page.getByTestId('canvas-container')).toBeVisible() @@ -191,7 +192,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => test('Save controls are visible and functional', async ({ page }) => { await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify save controls section exists await expect(page.getByTestId('save-controls')).toBeVisible() @@ -219,7 +220,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => }) => { await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) await expect(page.getByTestId('rsc-ssr-false-content')).toBeVisible() @@ -248,7 +249,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to the page via nav bar await page.getByTestId('nav-ssr-false').click() @@ -272,7 +273,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => // First visit - clear any previous state and save a name await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Clear canvas to reset state await page.getByTestId('clear-canvas-btn').click() @@ -292,12 +293,12 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => // Navigate away await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate back await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify saved name is restored await expect(page.getByTestId('rsc-saved-name')).toBeVisible() @@ -317,7 +318,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => test('Full page reload works correctly', async ({ page }) => { await page.goto('/rsc-ssr-false') await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify initial load await expect(page.getByTestId('rsc-ssr-false-content')).toBeVisible() @@ -336,7 +337,7 @@ test.describe('RSC SSR False Tests - Both loader and component on client', () => // Reload page await page.reload() await page.waitForURL('/rsc-ssr-false') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Verify content reloads and drawing was restored from localStorage await expect(page.getByTestId('rsc-ssr-false-content')).toBeVisible() diff --git a/e2e/react-start/rsc/tests/rsc-stream-flash.spec.ts b/e2e/react-start/rsc/tests/rsc-stream-flash.spec.ts index 9986897928..cf494ff75c 100644 --- a/e2e/react-start/rsc/tests/rsc-stream-flash.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-stream-flash.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' /** * RSC Stream Flash Prevention Tests @@ -57,7 +58,7 @@ test.describe('RSC Stream Flash Prevention', () => { test('no flash when RSCs stream via ReadableStream', async ({ page }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming and monitor for flash on notification elements const flashDetected = await monitorElementsForFlash( @@ -82,7 +83,7 @@ test.describe('RSC Stream Flash Prevention', () => { test('no flash when RSCs stream via async generator', async ({ page }) => { await page.goto('/rsc-stream-generator') await page.waitForURL('/rsc-stream-generator') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) const flashDetected = await monitorElementsForFlash( page, @@ -124,7 +125,7 @@ test.describe('RSC Stream Flash Prevention', () => { test('streamed RSCs have SERVER COMPONENT badge', async ({ page }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming await page.getByTestId('start-stream-btn').click() @@ -147,7 +148,7 @@ test.describe('RSC Stream Flash Prevention', () => { test('client interactivity works on streamed RSCs', async ({ page }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming await page.getByTestId('start-stream-btn').click() 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 302bf64695..5faa6b1508 100644 --- a/e2e/react-start/rsc/tests/rsc-stream-generator.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-stream-generator.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', () => { test('Page loads with empty state and controls visible', async ({ page }) => { @@ -30,7 +31,7 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', }) => { await page.goto('/rsc-stream-generator') await page.waitForURL('/rsc-stream-generator') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming await page.getByTestId('start-stream-btn').click() @@ -61,7 +62,7 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', test('Notifications stream in progressively', async ({ page }) => { await page.goto('/rsc-stream-generator') await page.waitForURL('/rsc-stream-generator') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming await page.getByTestId('start-stream-btn').click() @@ -96,7 +97,7 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', }) => { await page.goto('/rsc-stream-generator') await page.waitForURL('/rsc-stream-generator') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming and wait for completion await page.getByTestId('start-stream-btn').click() @@ -122,7 +123,7 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', }) => { await page.goto('/rsc-stream-generator') await page.waitForURL('/rsc-stream-generator') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming and wait for completion await page.getByTestId('start-stream-btn').click() @@ -158,7 +159,7 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', }) => { await page.goto('/rsc-stream-generator') await page.waitForURL('/rsc-stream-generator') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming and wait for completion await page.getByTestId('start-stream-btn').click() @@ -182,7 +183,7 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', }) => { await page.goto('/rsc-stream-generator') await page.waitForURL('/rsc-stream-generator') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming and wait for completion await page.getByTestId('start-stream-btn').click() @@ -213,7 +214,7 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', test('Can restart streaming after completion', async ({ page }) => { await page.goto('/rsc-stream-generator') await page.waitForURL('/rsc-stream-generator') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // First stream await page.getByTestId('start-stream-btn').click() 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 9e330d2636..356907e311 100644 --- a/e2e/react-start/rsc/tests/rsc-stream-readable.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-stream-readable.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', () => { test('Page loads with empty state and controls visible', async ({ page }) => { @@ -30,7 +31,7 @@ test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', ( }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming await page.getByTestId('start-stream-btn').click() @@ -61,7 +62,7 @@ test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', ( test('Notifications stream in progressively', async ({ page }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming await page.getByTestId('start-stream-btn').click() @@ -96,7 +97,7 @@ test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', ( }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming and wait for completion await page.getByTestId('start-stream-btn').click() @@ -120,7 +121,7 @@ test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', ( test('Client slots (actions) work on each streamed RSC', async ({ page }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming and wait for completion await page.getByTestId('start-stream-btn').click() @@ -152,7 +153,7 @@ test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', ( }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Start streaming and wait for completion await page.getByTestId('start-stream-btn').click() @@ -180,7 +181,7 @@ test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', ( test('Can restart streaming after completion', async ({ page }) => { await page.goto('/rsc-stream-readable') await page.waitForURL('/rsc-stream-readable') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // First stream await page.getByTestId('start-stream-btn').click() diff --git a/e2e/react-start/rsc/tests/rsc-suspense.spec.ts b/e2e/react-start/rsc/tests/rsc-suspense.spec.ts index 708c68eb41..b8673fdee4 100644 --- a/e2e/react-start/rsc/tests/rsc-suspense.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-suspense.spec.ts @@ -1,5 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Suspense Tests - Async RSC with streaming', () => { // Increase timeout for tests with longer delays @@ -61,7 +62,7 @@ test.describe('RSC Suspense Tests - Async RSC with streaming', () => { // Start at home await page.goto('/') await page.waitForURL('/') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to suspense page via nav bar (need to be specific to avoid matching example cards) await page.getByTestId('nav-suspense').click() @@ -81,7 +82,7 @@ test.describe('RSC Suspense Tests - Async RSC with streaming', () => { // Start at a different page await page.goto('/rsc-basic') await expect(page.getByTestId('rsc-basic-title')).toBeVisible() - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Navigate to suspense page await page.getByTestId('nav-suspense').click() diff --git a/e2e/react-start/rsc/tests/rsc-tree.spec.ts b/e2e/react-start/rsc/tests/rsc-tree.spec.ts index 31381d4f33..9ba548bda5 100644 --- a/e2e/react-start/rsc/tests/rsc-tree.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-tree.spec.ts @@ -1,11 +1,12 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' +import { waitForHydration } from './hydration' test.describe('RSC Tree Restructuring - Moving RSC without reload', () => { test('Changing parent element type does not reload RSC', async ({ page }) => { await page.goto('/rsc-tree') await page.waitForURL('/rsc-tree') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp and instance ID const initialRscTimestamp = await page @@ -60,7 +61,7 @@ test.describe('RSC Tree Restructuring - Moving RSC without reload', () => { test('Adding wrapper elements does not reload RSC', async ({ page }) => { await page.goto('/rsc-tree') await page.waitForURL('/rsc-tree') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialRscTimestamp = await page @@ -95,7 +96,7 @@ test.describe('RSC Tree Restructuring - Moving RSC without reload', () => { test('Removing wrapper elements does not reload RSC', async ({ page }) => { await page.goto('/rsc-tree') await page.waitForURL('/rsc-tree') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Add some wrappers first await page.getByTestId('add-wrapper').click() @@ -131,7 +132,7 @@ test.describe('RSC Tree Restructuring - Moving RSC without reload', () => { }) => { await page.goto('/rsc-tree') await page.waitForURL('/rsc-tree') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialRscTimestamp = await page @@ -160,7 +161,7 @@ test.describe('RSC Tree Restructuring - Moving RSC without reload', () => { test('RSC position prop updates without reload', async ({ page }) => { await page.goto('/rsc-tree') await page.waitForURL('/rsc-tree') - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated') + await waitForHydration(page) // Get initial RSC timestamp const initialRscTimestamp = await page From cd91ceebb84b7b752b5ee09ac14e89ad2beb2259 Mon Sep 17 00:00:00 2001 From: mixelburg <52622705+mixelburg@users.noreply.github.com> Date: Sat, 18 Apr 2026 22:55:58 +0300 Subject: [PATCH 015/597] fix(react-router): prevent webpack static analysis of React.use with let binding (#7182) --- .changeset/fix-react-router-webpack-use-analysis.md | 5 +++++ packages/react-router/src/utils.ts | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changeset/fix-react-router-webpack-use-analysis.md diff --git a/.changeset/fix-react-router-webpack-use-analysis.md b/.changeset/fix-react-router-webpack-use-analysis.md new file mode 100644 index 0000000000..fd9f53572b --- /dev/null +++ b/.changeset/fix-react-router-webpack-use-analysis.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +fix(react-router): prevent webpack static analysis of `React.use` with let binding diff --git a/packages/react-router/src/utils.ts b/packages/react-router/src/utils.ts index beed649bb9..f3cbf54613 100644 --- a/packages/react-router/src/utils.ts +++ b/packages/react-router/src/utils.ts @@ -5,7 +5,8 @@ import * as React from 'react' // React 18 with Webpack, which statically analyzes imports and fails when it // sees React.use referenced (since 'use' is not exported from React 18). // This uses a dynamic string lookup to avoid the static analysis. -const REACT_USE = 'use' +// eslint-disable-next-line prefer-const -- Must be `let` to prevent bundler constant-folding +let REACT_USE = 'use' /** * React.use if available (React 19+), undefined otherwise. From 4d66d42aaf2e4b2edc3cef4a83b92e15ed59edc4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 18 Apr 2026 20:08:10 +0000 Subject: [PATCH 016/597] ci: changeset release --- .changeset/fix-react-router-webpack-use-analysis.md | 5 ----- .../react/authenticated-routes-firebase/package.json | 2 +- examples/react/authenticated-routes/package.json | 2 +- .../react/basic-default-search-params/package.json | 2 +- examples/react/basic-devtools-panel/package.json | 2 +- examples/react/basic-file-based/package.json | 2 +- examples/react/basic-non-nested-devtools/package.json | 2 +- .../react/basic-react-query-file-based/package.json | 2 +- examples/react/basic-react-query/package.json | 2 +- examples/react/basic-ssr-file-based/package.json | 2 +- .../react/basic-ssr-streaming-file-based/package.json | 2 +- examples/react/basic-virtual-file-based/package.json | 2 +- .../react/basic-virtual-inside-file-based/package.json | 2 +- examples/react/basic/package.json | 2 +- examples/react/deferred-data/package.json | 2 +- examples/react/i18n-paraglide/package.json | 2 +- examples/react/kitchen-sink-file-based/package.json | 2 +- .../kitchen-sink-react-query-file-based/package.json | 2 +- examples/react/kitchen-sink-react-query/package.json | 2 +- examples/react/kitchen-sink/package.json | 2 +- examples/react/large-file-based/package.json | 2 +- examples/react/location-masking/package.json | 2 +- examples/react/navigation-blocking/package.json | 2 +- .../react/quickstart-esbuild-file-based/package.json | 2 +- examples/react/quickstart-file-based/package.json | 2 +- .../react/quickstart-rspack-file-based/package.json | 2 +- .../react/quickstart-webpack-file-based/package.json | 2 +- examples/react/quickstart/package.json | 2 +- .../react/router-monorepo-react-query/package.json | 2 +- .../packages/router/package.json | 2 +- .../react/router-monorepo-simple-lazy/package.json | 2 +- .../packages/router/package.json | 2 +- examples/react/router-monorepo-simple/package.json | 2 +- .../packages/router/package.json | 2 +- examples/react/scroll-restoration/package.json | 2 +- examples/react/search-validator-adapters/package.json | 2 +- examples/react/start-bare/package.json | 4 ++-- examples/react/start-basic-auth/package.json | 4 ++-- examples/react/start-basic-authjs/package.json | 4 ++-- examples/react/start-basic-cloudflare/package.json | 4 ++-- examples/react/start-basic-react-query/package.json | 4 ++-- examples/react/start-basic-static/package.json | 4 ++-- examples/react/start-basic/package.json | 4 ++-- examples/react/start-bun/package.json | 4 ++-- examples/react/start-clerk-basic/package.json | 4 ++-- examples/react/start-convex-trellaux/package.json | 4 ++-- examples/react/start-counter/package.json | 4 ++-- examples/react/start-i18n-paraglide/package.json | 4 ++-- examples/react/start-large/package.json | 4 ++-- examples/react/start-material-ui/package.json | 4 ++-- examples/react/start-rscs/package.json | 4 ++-- .../package.json | 4 ++-- examples/react/start-supabase-basic/package.json | 4 ++-- examples/react/start-tailwind-v4/package.json | 4 ++-- examples/react/start-trellaux/package.json | 4 ++-- examples/react/start-workos/package.json | 4 ++-- examples/react/view-transitions/package.json | 2 +- examples/react/with-framer-motion/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- packages/react-router/CHANGELOG.md | 6 ++++++ packages/react-router/package.json | 2 +- packages/react-start-client/CHANGELOG.md | 7 +++++++ packages/react-start-client/package.json | 2 +- packages/react-start-rsc/CHANGELOG.md | 8 ++++++++ packages/react-start-rsc/package.json | 2 +- packages/react-start-server/CHANGELOG.md | 7 +++++++ packages/react-start-server/package.json | 2 +- packages/react-start/CHANGELOG.md | 10 ++++++++++ packages/react-start/package.json | 2 +- 70 files changed, 122 insertions(+), 89 deletions(-) delete mode 100644 .changeset/fix-react-router-webpack-use-analysis.md diff --git a/.changeset/fix-react-router-webpack-use-analysis.md b/.changeset/fix-react-router-webpack-use-analysis.md deleted file mode 100644 index fd9f53572b..0000000000 --- a/.changeset/fix-react-router-webpack-use-analysis.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tanstack/react-router': patch ---- - -fix(react-router): prevent webpack static analysis of `React.use` with let binding diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index d7a7d8e2f3..60f0ac7be0 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "firebase": "^11.4.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 1fa4e06209..250abb353d 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 3e1fc4483c..00513d7a69 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 499efe9879..5c71774445 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 665e487e53..6ad0190b46 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 5c7e4f3800..ee4bbf86b9 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 66e806019c..b239855fd6 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index f11a58bcd2..cb95847c2d 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index e21c563c32..7e511cf79b 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,7 +11,7 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/router-plugin": "^1.167.22", "compression": "^1.8.0", "express": "^4.21.2", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index d4efd662df..a87bf46f89 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,7 +11,7 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/router-plugin": "^1.167.22", "compression": "^1.8.0", "express": "^4.21.2", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 0bab2879af..03854e25ae 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@tanstack/virtual-file-routes": "^1.161.7", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 0b4fc0648c..381d466f03 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@tanstack/virtual-file-routes": "^1.161.7", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index c672850040..cba55e65ab 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 876308e295..9b0c2c4fc7 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index b2d740602e..f8ed1aed84 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/router-plugin": "^1.167.22", "react": "^19.1.1", "react-dom": "^19.1.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index c6bf4fadca..9936eda1bd 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "immer": "^10.1.1", 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 ceaff5257d..b7918c3a55 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "immer": "^10.1.1", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 8199c25201..a617641cd0 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,7 +12,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index e48188fa05..5a0b1fabd6 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "immer": "^10.1.1", "react": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index e1cb6711ce..24d2438b34 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,7 +13,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 5f70554e70..1c565b95c0 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,7 +12,7 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 03ed7e52da..e0ce3deea9 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 1f21cba823..6d09c5da6b 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,7 +9,7 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 961a09f39f..0ab6924281 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index f219911083..d059407736 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "postcss": "^8.5.1", "react": "^19.0.0", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 728509aa78..c3235f6ec7 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,7 +7,7 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 6cb393db6b..a7b874c20f 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index b2fd9d1c5d..bc22be75d0 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-query": "^5.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", 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 001eb02bad..d3baf8f7f6 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.161.6", "@tanstack/react-query": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/router-plugin": "^1.167.22", "@router-mono-react-query/post-query": "workspace:*", "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 1fd530b80b..2f30dbf43a 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,7 +8,7 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", 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 8458591dfc..841831ad2d 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,7 +9,7 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.161.6", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/router-plugin": "^1.167.22", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 4b8eb6d205..db003b19ae 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,7 +8,7 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 83a4c1b0d7..3009786e3e 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,7 +9,7 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.161.6", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/router-plugin": "^1.167.22", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index ead41f25f2..8921e43fc2 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index fc6cae96bb..3bc42d411e 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.166.9", "@tanstack/react-query": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@tanstack/valibot-adapter": "^1.166.9", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 25beb5c487..9e265811dc 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 11af22ae10..16f3136ec0 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index e6aa1132ea..9d4f1fed44 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "start-authjs": "^1.0.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index 430ab174cd..bad72c01cf 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "npm run cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "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 a1a378dcb8..12a61e08f5 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/react-router-ssr-query": "^1.166.11", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 33dc869b80..8dc1a41f01 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "@tanstack/start-static-server-functions": "^1.166.33", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index e41b0a2de0..5224215e84 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index ab538160e1..a4bd121c5b 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,10 +15,10 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/react-router-ssr-query": "^1.166.11", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "@tanstack/router-plugin": "^1.167.22", "react": "^19.1.1", "react-dom": "^19.1.1", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 3d3777fe9d..497dc7bf45 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 8dd34c9f3e..f7a5e32652 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.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/react-router-ssr-query": "^1.166.11", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "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 e4228781c1..cc472904de 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "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 b1de4947c6..0d19465a77 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "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 3d828ec0f0..2c9650a52f 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "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 9471f53b58..8f8c842585 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,8 +15,8 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.168.22", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-router": "^1.168.23", + "@tanstack/react-start": "^1.167.42", "@tanstack/react-router-devtools": "^1.166.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index ff986b8a2a..c85165b38e 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "dexie": "^4.0.10", "react": "^19.2.0", "react-dom": "^19.2.0", 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 26e6ae671f..47f24c68d0 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 7a794e4c75..7ddf9568ee 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "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 ae2cedc2aa..0eb651447c 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 4d66626266..d6d8bb7f1c 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/react-router-ssr-query": "^1.166.11", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "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 59be5660d6..8574a5a2a3 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.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", - "@tanstack/react-start": "^1.167.41", + "@tanstack/react-start": "^1.167.42", "@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 1cd8df2ebf..58c6c90064 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "react": "^19.0.0", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 4d056d1090..af7db24ff5 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "framer-motion": "^11.18.2", "react": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 3db3725c58..71ac980281 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.90.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@trpc/client": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 04f1d076e3..27a532c8e4 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.168.22", + "@tanstack/react-router": "^1.168.23", "@tanstack/react-router-devtools": "^1.166.13", "@tanstack/router-plugin": "^1.167.22", "@trpc/client": "^11.4.3", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 66bb8798b9..518b546c5c 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,11 @@ # @tanstack/react-router +## 1.168.23 + +### Patch Changes + +- fix(react-router): prevent webpack static analysis of `React.use` with let binding ([#7182](https://github.com/TanStack/router/pull/7182)) + ## 1.168.22 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 8a917953ce..05e0950616 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.168.22", + "version": "1.168.23", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 431f2f41ec..e91d877ade 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-start-client +## 1.166.40 + +### Patch Changes + +- Updated dependencies [[`cd91cee`](https://github.com/TanStack/router/commit/cd91ceebb84b7b752b5ee09ac14e89ad2beb2259)]: + - @tanstack/react-router@1.168.23 + ## 1.166.39 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 9295bd7e17..304c6fdbc4 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.166.39", + "version": "1.166.40", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index f1743dab74..6bad206b7f 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,13 @@ # @tanstack/react-start-rsc +## 0.0.21 + +### Patch Changes + +- Updated dependencies [[`cd91cee`](https://github.com/TanStack/router/commit/cd91ceebb84b7b752b5ee09ac14e89ad2beb2259)]: + - @tanstack/react-router@1.168.23 + - @tanstack/react-start-server@1.166.41 + ## 0.0.20 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 0da7649e55..51573861f9 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.0.20", + "version": "0.0.21", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 69b2aafa7c..2d6c24816e 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-start-server +## 1.166.41 + +### Patch Changes + +- Updated dependencies [[`cd91cee`](https://github.com/TanStack/router/commit/cd91ceebb84b7b752b5ee09ac14e89ad2beb2259)]: + - @tanstack/react-router@1.168.23 + ## 1.166.40 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index f4d2af1b1b..4509b968c3 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.166.40", + "version": "1.166.41", "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 facb27613c..1e3df9e58e 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,15 @@ # @tanstack/react-start +## 1.167.42 + +### Patch Changes + +- Updated dependencies [[`cd91cee`](https://github.com/TanStack/router/commit/cd91ceebb84b7b752b5ee09ac14e89ad2beb2259)]: + - @tanstack/react-router@1.168.23 + - @tanstack/react-start-client@1.166.40 + - @tanstack/react-start-rsc@0.0.21 + - @tanstack/react-start-server@1.166.41 + ## 1.167.41 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 1b0311bb8f..596a460ef2 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.167.41", + "version": "1.167.42", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 5edd7e532a0846add3d0b2186254f769c1dac5c5 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sat, 18 Apr 2026 22:38:55 +0200 Subject: [PATCH 017/597] stabilize test (#7220) --- .../rsc-query/tests/rsc-query-no-loader-css.spec.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/e2e/react-start/rsc-query/tests/rsc-query-no-loader-css.spec.ts b/e2e/react-start/rsc-query/tests/rsc-query-no-loader-css.spec.ts index 698fd55ec0..e2ae940419 100644 --- a/e2e/react-start/rsc-query/tests/rsc-query-no-loader-css.spec.ts +++ b/e2e/react-start/rsc-query/tests/rsc-query-no-loader-css.spec.ts @@ -36,10 +36,7 @@ test.describe('RSC Query Without Loader CSS Tests', () => { 'CSS Modules via Render-Time Suspense Query', ) - const backgroundColor = await container.evaluate( - (el) => getComputedStyle(el).backgroundColor, - ) - expect(backgroundColor).toBe('rgb(224, 242, 254)') + await expect(container).toHaveCSS('background-color', 'rgb(224, 242, 254)') }) test('client-side navigation keeps streamed query CSS intact', async ({ @@ -55,9 +52,6 @@ test.describe('RSC Query Without Loader CSS Tests', () => { const container = page.getByTestId('rsc-css-modules-content') await expect(container).toBeVisible() - const backgroundColor = await container.evaluate( - (el) => getComputedStyle(el).backgroundColor, - ) - expect(backgroundColor).toBe('rgb(224, 242, 254)') + await expect(container).toHaveCSS('background-color', 'rgb(224, 242, 254)') }) }) From bd97d092ef37498adb64e92d4ba0550ee562a726 Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Sat, 18 Apr 2026 22:52:56 +0200 Subject: [PATCH 018/597] chore: unify react-start basic e2e mode projects (#7206) --- e2e/react-start/basic-prerender/.gitignore | 5 - e2e/react-start/basic-prerender/package.json | 24 -- .../basic-prerender/playwright.config.ts | 48 ---- e2e/react-start/basic-preview/.gitignore | 5 - e2e/react-start/basic-preview/package.json | 24 -- .../basic-preview/playwright.config.ts | 47 --- e2e/react-start/basic-spa/.gitignore | 5 - e2e/react-start/basic-spa/package.json | 24 -- .../basic-spa/playwright.config.ts | 48 ---- e2e/react-start/basic-test-suite/.gitignore | 5 - e2e/react-start/basic-test-suite/package.json | 12 - .../src/utils/getBasicAppRoot.ts | 8 - .../basic-test-suite/src/utils/isPrerender.ts | 1 - .../basic-test-suite/src/utils/isPreview.ts | 1 - .../basic-test-suite/src/utils/isSpaMode.ts | 1 - .../basic-test-suite/tsconfig.json | 18 -- e2e/react-start/basic/.gitignore | 1 + e2e/react-start/basic/package.json | 32 ++- e2e/react-start/basic/playwright.config.ts | 36 ++- e2e/react-start/basic/server.js | 11 +- .../src => basic/tests}/client-only.spec.ts | 0 .../src => basic/tests}/navigation.spec.ts | 0 .../src => basic/tests}/not-found.spec.ts | 0 .../tests}/open-redirect-prevention.spec.ts | 0 .../basic/tests}/prerendering.spec.ts | 10 +- .../src => basic/tests}/raw-stream.spec.ts | 0 .../src => basic/tests}/redirect.spec.ts | 8 +- .../src => basic/tests}/root-scripts.spec.ts | 0 .../tests}/script-duplication.spec.ts | 0 .../src => basic/tests}/search-params.spec.ts | 0 .../basic/tests}/setup/global.setup.ts | 4 +- .../basic/tests}/setup/global.teardown.ts | 4 +- .../basic/tests}/setup/waitForDummyServer.ts | 4 +- .../tests}/special-characters.spec.ts | 0 .../src => basic/tests}/streaming.spec.ts | 0 .../tests}/type-only-reexport.spec.ts | 0 .../basic/tests/utils/getE2EPortKey.ts | 5 + .../tests}/utils/getPackageName.ts | 0 e2e/react-start/basic/tsconfig.json | 2 + e2e/react-start/basic/vite.config.ts | 5 + e2e/solid-start/basic-prerender/.gitignore | 5 - e2e/solid-start/basic-prerender/package.json | 24 -- .../basic-prerender/playwright.config.ts | 48 ---- e2e/solid-start/basic-preview/.gitignore | 5 - e2e/solid-start/basic-preview/package.json | 24 -- .../basic-preview/playwright.config.ts | 47 --- e2e/solid-start/basic-spa/.gitignore | 5 - e2e/solid-start/basic-spa/package.json | 24 -- .../basic-spa/playwright.config.ts | 48 ---- e2e/solid-start/basic-test-suite/.gitignore | 5 - e2e/solid-start/basic-test-suite/package.json | 12 - .../src/utils/getBasicAppRoot.ts | 8 - .../basic-test-suite/src/utils/isPrerender.ts | 1 - .../basic-test-suite/src/utils/isPreview.ts | 1 - .../basic-test-suite/src/utils/isSpaMode.ts | 1 - .../basic-test-suite/tsconfig.json | 18 -- e2e/solid-start/basic/.gitignore | 1 + e2e/solid-start/basic/package.json | 33 ++- e2e/solid-start/basic/playwright.config.ts | 36 ++- e2e/solid-start/basic/server.js | 11 +- .../src => basic/tests}/navigation.spec.ts | 0 .../src => basic/tests}/not-found.spec.ts | 0 .../basic/tests}/prerendering.spec.ts | 10 +- .../src => basic/tests}/redirect.spec.ts | 8 +- .../tests}/script-duplication.spec.ts | 0 .../src => basic/tests}/search-params.spec.ts | 0 .../basic/tests}/setup/global.setup.ts | 4 +- .../basic/tests}/setup/global.teardown.ts | 4 +- .../basic/tests}/setup/waitForDummyServer.ts | 4 +- .../tests}/special-characters.spec.ts | 0 .../src => basic/tests}/streaming.spec.ts | 0 .../src => basic/tests}/transition.spec.ts | 0 .../basic/tests/utils/getE2EPortKey.ts | 5 + .../tests}/utils/getPackageName.ts | 0 e2e/solid-start/basic/tsconfig.json | 1 + e2e/solid-start/basic/vite.config.ts | 5 + e2e/vue-start/basic-prerender/.gitignore | 5 - e2e/vue-start/basic-prerender/package.json | 24 -- .../basic-prerender/playwright.config.ts | 48 ---- e2e/vue-start/basic-preview/.gitignore | 5 - e2e/vue-start/basic-preview/package.json | 24 -- .../basic-preview/playwright.config.ts | 47 --- e2e/vue-start/basic-spa/.gitignore | 5 - e2e/vue-start/basic-spa/package.json | 24 -- e2e/vue-start/basic-spa/playwright.config.ts | 48 ---- e2e/vue-start/basic-test-suite/.gitignore | 5 - e2e/vue-start/basic-test-suite/package.json | 12 - .../src/utils/getBasicAppRoot.ts | 8 - .../basic-test-suite/src/utils/isPrerender.ts | 1 - .../basic-test-suite/src/utils/isPreview.ts | 1 - .../basic-test-suite/src/utils/isSpaMode.ts | 1 - e2e/vue-start/basic-test-suite/tsconfig.json | 18 -- e2e/vue-start/basic/.gitignore | 1 + e2e/vue-start/basic/package.json | 33 ++- e2e/vue-start/basic/playwright.config.ts | 36 ++- e2e/vue-start/basic/server.js | 11 +- .../src => basic/tests}/navigation.spec.ts | 0 .../src => basic/tests}/not-found.spec.ts | 0 .../basic/tests}/prerendering.spec.ts | 10 +- .../src => basic/tests}/redirect.spec.ts | 8 +- .../tests}/script-duplication.spec.ts | 0 .../src => basic/tests}/search-params.spec.ts | 0 .../src => basic/tests}/setup/global.setup.ts | 4 +- .../basic/tests}/setup/global.teardown.ts | 4 +- .../basic/tests}/setup/waitForDummyServer.ts | 4 +- .../tests}/special-characters.spec.ts | 0 .../src => basic/tests}/streaming.spec.ts | 0 .../basic/tests/utils/getE2EPortKey.ts | 5 + .../tests}/utils/getPackageName.ts | 0 e2e/vue-start/basic/tsconfig.json | 1 + e2e/vue-start/basic/vite.config.ts | 5 + package.json | 2 +- pnpm-lock.yaml | 189 ------------ scripts/nx/playwright-plugin.md | 184 +++++++----- scripts/nx/playwright-plugin.ts | 270 +++++++++++++++++- 115 files changed, 637 insertions(+), 1202 deletions(-) delete mode 100644 e2e/react-start/basic-prerender/.gitignore delete mode 100644 e2e/react-start/basic-prerender/package.json delete mode 100644 e2e/react-start/basic-prerender/playwright.config.ts delete mode 100644 e2e/react-start/basic-preview/.gitignore delete mode 100644 e2e/react-start/basic-preview/package.json delete mode 100644 e2e/react-start/basic-preview/playwright.config.ts delete mode 100644 e2e/react-start/basic-spa/.gitignore delete mode 100644 e2e/react-start/basic-spa/package.json delete mode 100644 e2e/react-start/basic-spa/playwright.config.ts delete mode 100644 e2e/react-start/basic-test-suite/.gitignore delete mode 100644 e2e/react-start/basic-test-suite/package.json delete mode 100644 e2e/react-start/basic-test-suite/src/utils/getBasicAppRoot.ts delete mode 100644 e2e/react-start/basic-test-suite/src/utils/isPrerender.ts delete mode 100644 e2e/react-start/basic-test-suite/src/utils/isPreview.ts delete mode 100644 e2e/react-start/basic-test-suite/src/utils/isSpaMode.ts delete mode 100644 e2e/react-start/basic-test-suite/tsconfig.json rename e2e/react-start/{basic-test-suite/src => basic/tests}/client-only.spec.ts (100%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/navigation.spec.ts (100%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/not-found.spec.ts (100%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/open-redirect-prevention.spec.ts (100%) rename e2e/{solid-start/basic-test-suite/src => react-start/basic/tests}/prerendering.spec.ts (90%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/raw-stream.spec.ts (100%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/redirect.spec.ts (97%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/root-scripts.spec.ts (100%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/script-duplication.spec.ts (100%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/search-params.spec.ts (100%) rename e2e/{solid-start/basic-test-suite/src => react-start/basic/tests}/setup/global.setup.ts (50%) rename e2e/{vue-start/basic-test-suite/src => react-start/basic/tests}/setup/global.teardown.ts (55%) rename e2e/{solid-start/basic-test-suite/src => react-start/basic/tests}/setup/waitForDummyServer.ts (82%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/special-characters.spec.ts (100%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/streaming.spec.ts (100%) rename e2e/react-start/{basic-test-suite/src => basic/tests}/type-only-reexport.spec.ts (100%) create mode 100644 e2e/react-start/basic/tests/utils/getE2EPortKey.ts rename e2e/react-start/{basic-test-suite/src => basic/tests}/utils/getPackageName.ts (100%) delete mode 100644 e2e/solid-start/basic-prerender/.gitignore delete mode 100644 e2e/solid-start/basic-prerender/package.json delete mode 100644 e2e/solid-start/basic-prerender/playwright.config.ts delete mode 100644 e2e/solid-start/basic-preview/.gitignore delete mode 100644 e2e/solid-start/basic-preview/package.json delete mode 100644 e2e/solid-start/basic-preview/playwright.config.ts delete mode 100644 e2e/solid-start/basic-spa/.gitignore delete mode 100644 e2e/solid-start/basic-spa/package.json delete mode 100644 e2e/solid-start/basic-spa/playwright.config.ts delete mode 100644 e2e/solid-start/basic-test-suite/.gitignore delete mode 100644 e2e/solid-start/basic-test-suite/package.json delete mode 100644 e2e/solid-start/basic-test-suite/src/utils/getBasicAppRoot.ts delete mode 100644 e2e/solid-start/basic-test-suite/src/utils/isPrerender.ts delete mode 100644 e2e/solid-start/basic-test-suite/src/utils/isPreview.ts delete mode 100644 e2e/solid-start/basic-test-suite/src/utils/isSpaMode.ts delete mode 100644 e2e/solid-start/basic-test-suite/tsconfig.json rename e2e/solid-start/{basic-test-suite/src => basic/tests}/navigation.spec.ts (100%) rename e2e/solid-start/{basic-test-suite/src => basic/tests}/not-found.spec.ts (100%) rename e2e/{vue-start/basic-test-suite/src => solid-start/basic/tests}/prerendering.spec.ts (90%) rename e2e/solid-start/{basic-test-suite/src => basic/tests}/redirect.spec.ts (97%) rename e2e/solid-start/{basic-test-suite/src => basic/tests}/script-duplication.spec.ts (100%) rename e2e/solid-start/{basic-test-suite/src => basic/tests}/search-params.spec.ts (100%) rename e2e/{react-start/basic-test-suite/src => solid-start/basic/tests}/setup/global.setup.ts (50%) rename e2e/{react-start/basic-test-suite/src => solid-start/basic/tests}/setup/global.teardown.ts (55%) rename e2e/{vue-start/basic-test-suite/src => solid-start/basic/tests}/setup/waitForDummyServer.ts (82%) rename e2e/solid-start/{basic-test-suite/src => basic/tests}/special-characters.spec.ts (100%) rename e2e/solid-start/{basic-test-suite/src => basic/tests}/streaming.spec.ts (100%) rename e2e/solid-start/{basic-test-suite/src => basic/tests}/transition.spec.ts (100%) create mode 100644 e2e/solid-start/basic/tests/utils/getE2EPortKey.ts rename e2e/solid-start/{basic-test-suite/src => basic/tests}/utils/getPackageName.ts (100%) delete mode 100644 e2e/vue-start/basic-prerender/.gitignore delete mode 100644 e2e/vue-start/basic-prerender/package.json delete mode 100644 e2e/vue-start/basic-prerender/playwright.config.ts delete mode 100644 e2e/vue-start/basic-preview/.gitignore delete mode 100644 e2e/vue-start/basic-preview/package.json delete mode 100644 e2e/vue-start/basic-preview/playwright.config.ts delete mode 100644 e2e/vue-start/basic-spa/.gitignore delete mode 100644 e2e/vue-start/basic-spa/package.json delete mode 100644 e2e/vue-start/basic-spa/playwright.config.ts delete mode 100644 e2e/vue-start/basic-test-suite/.gitignore delete mode 100644 e2e/vue-start/basic-test-suite/package.json delete mode 100644 e2e/vue-start/basic-test-suite/src/utils/getBasicAppRoot.ts delete mode 100644 e2e/vue-start/basic-test-suite/src/utils/isPrerender.ts delete mode 100644 e2e/vue-start/basic-test-suite/src/utils/isPreview.ts delete mode 100644 e2e/vue-start/basic-test-suite/src/utils/isSpaMode.ts delete mode 100644 e2e/vue-start/basic-test-suite/tsconfig.json rename e2e/vue-start/{basic-test-suite/src => basic/tests}/navigation.spec.ts (100%) rename e2e/vue-start/{basic-test-suite/src => basic/tests}/not-found.spec.ts (100%) rename e2e/{react-start/basic-test-suite/src => vue-start/basic/tests}/prerendering.spec.ts (90%) rename e2e/vue-start/{basic-test-suite/src => basic/tests}/redirect.spec.ts (97%) rename e2e/vue-start/{basic-test-suite/src => basic/tests}/script-duplication.spec.ts (100%) rename e2e/vue-start/{basic-test-suite/src => basic/tests}/search-params.spec.ts (100%) rename e2e/vue-start/{basic-test-suite/src => basic/tests}/setup/global.setup.ts (50%) rename e2e/{solid-start/basic-test-suite/src => vue-start/basic/tests}/setup/global.teardown.ts (55%) rename e2e/{react-start/basic-test-suite/src => vue-start/basic/tests}/setup/waitForDummyServer.ts (82%) rename e2e/vue-start/{basic-test-suite/src => basic/tests}/special-characters.spec.ts (100%) rename e2e/vue-start/{basic-test-suite/src => basic/tests}/streaming.spec.ts (100%) create mode 100644 e2e/vue-start/basic/tests/utils/getE2EPortKey.ts rename e2e/vue-start/{basic-test-suite/src => basic/tests}/utils/getPackageName.ts (100%) diff --git a/e2e/react-start/basic-prerender/.gitignore b/e2e/react-start/basic-prerender/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/react-start/basic-prerender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/react-start/basic-prerender/package.json b/e2e/react-start/basic-prerender/package.json deleted file mode 100644 index 415e0f4739..0000000000 --- a/e2e/react-start/basic-prerender/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-react-start-e2e-basic-prerender", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=prerender playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-react-start-e2e-basic": "workspace:*", - "tanstack-react-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/react-start/basic-prerender/playwright.config.ts b/e2e/react-start/basic-prerender/playwright.config.ts deleted file mode 100644 index cf2cf5d396..0000000000 --- a/e2e/react-start/basic-prerender/playwright.config.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: - 'pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build:prerender && pnpm --dir ../basic start', - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'prerender', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/react-start/basic-preview/.gitignore b/e2e/react-start/basic-preview/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/react-start/basic-preview/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/react-start/basic-preview/package.json b/e2e/react-start/basic-preview/package.json deleted file mode 100644 index ba24e8a41a..0000000000 --- a/e2e/react-start/basic-preview/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-react-start-e2e-basic-preview", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=preview playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-react-start-e2e-basic": "workspace:*", - "tanstack-react-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/react-start/basic-preview/playwright.config.ts b/e2e/react-start/basic-preview/playwright.config.ts deleted file mode 100644 index 071f336f9f..0000000000 --- a/e2e/react-start/basic-preview/playwright.config.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: `pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build && pnpm --dir ../basic preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'preview', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/react-start/basic-spa/.gitignore b/e2e/react-start/basic-spa/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/react-start/basic-spa/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/react-start/basic-spa/package.json b/e2e/react-start/basic-spa/package.json deleted file mode 100644 index 709ce8a0d6..0000000000 --- a/e2e/react-start/basic-spa/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-react-start-e2e-basic-spa", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=spa playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-react-start-e2e-basic": "workspace:*", - "tanstack-react-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/react-start/basic-spa/playwright.config.ts b/e2e/react-start/basic-spa/playwright.config.ts deleted file mode 100644 index 27e85e1f1a..0000000000 --- a/e2e/react-start/basic-spa/playwright.config.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: - 'pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build:spa && pnpm --dir ../basic start', - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'spa', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/react-start/basic-test-suite/.gitignore b/e2e/react-start/basic-test-suite/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/react-start/basic-test-suite/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/react-start/basic-test-suite/package.json b/e2e/react-start/basic-test-suite/package.json deleted file mode 100644 index aaf431e09d..0000000000 --- a/e2e/react-start/basic-test-suite/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "tanstack-react-start-e2e-basic-test-suite", - "private": true, - "sideEffects": false, - "type": "module", - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:*", - "@types/node": "^22.10.2", - "combinate": "^1.1.11" - } -} diff --git a/e2e/react-start/basic-test-suite/src/utils/getBasicAppRoot.ts b/e2e/react-start/basic-test-suite/src/utils/getBasicAppRoot.ts deleted file mode 100644 index 4725f532ed..0000000000 --- a/e2e/react-start/basic-test-suite/src/utils/getBasicAppRoot.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { join } from 'node:path' -import { getPackageName } from './getPackageName.ts' - -export function getBasicAppRoot() { - return getPackageName() === 'tanstack-react-start-e2e-basic' - ? process.cwd() - : join(process.cwd(), '../basic') -} diff --git a/e2e/react-start/basic-test-suite/src/utils/isPrerender.ts b/e2e/react-start/basic-test-suite/src/utils/isPrerender.ts deleted file mode 100644 index d5d991d454..0000000000 --- a/e2e/react-start/basic-test-suite/src/utils/isPrerender.ts +++ /dev/null @@ -1 +0,0 @@ -export const isPrerender: boolean = process.env.MODE === 'prerender' diff --git a/e2e/react-start/basic-test-suite/src/utils/isPreview.ts b/e2e/react-start/basic-test-suite/src/utils/isPreview.ts deleted file mode 100644 index 7ea362a83e..0000000000 --- a/e2e/react-start/basic-test-suite/src/utils/isPreview.ts +++ /dev/null @@ -1 +0,0 @@ -export const isPreview: boolean = process.env.MODE === 'preview' diff --git a/e2e/react-start/basic-test-suite/src/utils/isSpaMode.ts b/e2e/react-start/basic-test-suite/src/utils/isSpaMode.ts deleted file mode 100644 index b4edb829a8..0000000000 --- a/e2e/react-start/basic-test-suite/src/utils/isSpaMode.ts +++ /dev/null @@ -1 +0,0 @@ -export const isSpaMode: boolean = process.env.MODE === 'spa' diff --git a/e2e/react-start/basic-test-suite/tsconfig.json b/e2e/react-start/basic-test-suite/tsconfig.json deleted file mode 100644 index 3f3dbe6bcd..0000000000 --- a/e2e/react-start/basic-test-suite/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "include": ["src/**/*.ts"], - "compilerOptions": { - "strict": true, - "esModuleInterop": true, - "module": "ESNext", - "moduleResolution": "Bundler", - "lib": ["DOM", "DOM.Iterable", "ES2022"], - "isolatedModules": true, - "allowImportingTsExtensions": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "target": "ES2022", - "types": ["node"], - "forceConsistentCasingInFileNames": true, - "noEmit": true - } -} diff --git a/e2e/react-start/basic/.gitignore b/e2e/react-start/basic/.gitignore index a79d5cf129..b9c2c7e5f6 100644 --- a/e2e/react-start/basic/.gitignore +++ b/e2e/react-start/basic/.gitignore @@ -18,3 +18,4 @@ yarn.lock /playwright-report/ /blob-report/ /playwright/.cache/ +/dist-vite-*/ diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json index 957372b08e..6646dc03a3 100644 --- a/e2e/react-start/basic/package.json +++ b/e2e/react-start/basic/package.json @@ -7,13 +7,11 @@ "dev": "vite dev --port 3000", "dev:e2e": "vite dev", "build": "vite build && tsc --noEmit", - "build:spa": "MODE=spa vite build && tsc --noEmit", - "build:prerender": "MODE=prerender vite build && tsc --noEmit", "preview": "vite preview", "start": "node server.js", - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf dist; rm -rf port*.txt; playwright test --project=chromium" + "test:e2e:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", + "test:e2e:stopDummyServer": "node -e 'import(\"./tests/setup/global.teardown.ts\").then(m => m.default())'", + "test:e2e:local": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -31,7 +29,6 @@ "@playwright/test": "^1.50.1", "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-react-start-e2e-basic-test-suite": "workspace:*", "@types/js-cookie": "^3.0.6", "@types/node": "^22.10.2", "@types/react": "^19.0.8", @@ -45,10 +42,25 @@ "zod": "^3.24.2" }, "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "vite", + "mode": "spa" + }, + { + "toolchain": "vite", + "mode": "prerender" + }, + { + "toolchain": "vite", + "mode": "preview" + } + ] } } } diff --git a/e2e/react-start/basic/playwright.config.ts b/e2e/react-start/basic/playwright.config.ts index bf22363c94..5e46a2b1c7 100644 --- a/e2e/react-start/basic/playwright.config.ts +++ b/e2e/react-start/basic/playwright.config.ts @@ -1,3 +1,4 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' import { getDummyServerPort, @@ -5,20 +6,37 @@ import { } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) +const mode = process.env.MODE ?? 'ssr' +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name +const distDir = process.env.E2E_DIST_DIR ?? 'dist' + +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}_start.txt`, + `port-${e2ePortKey}-external.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} + +const PORT = await getTestServerPort(e2ePortKey) +const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) +const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` -const ssrModeCommand = `pnpm build && pnpm start` +const commandByMode = + mode === 'preview' + ? `pnpm run test:e2e:startDummyServer && pnpm preview --outDir ${distDir} --port ${PORT}` + : `pnpm run test:e2e:startDummyServer && pnpm start` /** * See https://playwright.dev/docs/test-configuration. */ export default defineConfig({ - testDir: '../basic-test-suite/src', + testDir: './tests', workers: 1, reporter: [['line']], - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { /* Base URL to use in actions like `await page.goto('/')`. */ @@ -26,17 +44,19 @@ export default defineConfig({ }, webServer: { - command: `pnpm run test:e2e:startDummyServer && ${ssrModeCommand}`, + command: commandByMode, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { - MODE: '', + MODE: mode, VITE_NODE_ENV: 'test', VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), START_PORT: String(START_PORT), PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/react-start/basic/server.js b/e2e/react-start/basic/server.js index 83f5ff0079..9db7619ae1 100644 --- a/e2e/react-start/basic/server.js +++ b/e2e/react-start/basic/server.js @@ -9,16 +9,19 @@ const startPort = process.env.START_PORT || 3001 const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' +const distDir = process.env.E2E_DIST_DIR || 'dist' +const distClientDir = path.resolve(distDir, 'client') +const distServerEntryPath = path.resolve(distDir, 'server', 'server.js') export async function createStartServer() { - const server = (await import('./dist/server/server.js')).default + const server = (await import(distServerEntryPath)).default const nodeHandler = toNodeHandler(server.fetch) const app = express() // to keep testing uniform stop express from redirecting /posts to /posts/ // when serving pre-rendered pages - app.use(express.static('./dist/client', { redirect: !isPrerender })) + app.use(express.static(distClientDir, { redirect: !isPrerender })) app.use(async (req, res, next) => { try { @@ -50,10 +53,10 @@ export async function createSpaServer() { }), ) - app.use(express.static('./dist/client')) + app.use(express.static(distClientDir)) app.get('/{*splat}', (req, res) => { - res.sendFile(path.resolve('./dist/client/index.html')) + res.sendFile(path.resolve(distClientDir, 'index.html')) }) return { app } diff --git a/e2e/react-start/basic-test-suite/src/client-only.spec.ts b/e2e/react-start/basic/tests/client-only.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/client-only.spec.ts rename to e2e/react-start/basic/tests/client-only.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/navigation.spec.ts b/e2e/react-start/basic/tests/navigation.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/navigation.spec.ts rename to e2e/react-start/basic/tests/navigation.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/not-found.spec.ts b/e2e/react-start/basic/tests/not-found.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/not-found.spec.ts rename to e2e/react-start/basic/tests/not-found.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/open-redirect-prevention.spec.ts b/e2e/react-start/basic/tests/open-redirect-prevention.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/open-redirect-prevention.spec.ts rename to e2e/react-start/basic/tests/open-redirect-prevention.spec.ts diff --git a/e2e/solid-start/basic-test-suite/src/prerendering.spec.ts b/e2e/react-start/basic/tests/prerendering.spec.ts similarity index 90% rename from e2e/solid-start/basic-test-suite/src/prerendering.spec.ts rename to e2e/react-start/basic/tests/prerendering.spec.ts index 66cc1f68ff..ddcf720a4c 100644 --- a/e2e/solid-start/basic-test-suite/src/prerendering.spec.ts +++ b/e2e/react-start/basic/tests/prerendering.spec.ts @@ -3,15 +3,18 @@ import { join } from 'node:path' import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' import { isPrerender } from './utils/isPrerender' -import { getBasicAppRoot } from './utils/getBasicAppRoot' + +const distDir = join( + process.cwd(), + process.env.E2E_DIST_DIR ?? 'dist', + 'client', +) test.describe('Prerender Static Path Discovery', () => { test.skip(!isPrerender, 'Skipping since not in prerender mode') test.describe('Build Output Verification', () => { test('should automatically discover and prerender static routes', () => { // Check that static routes were automatically discovered and prerendered - const distDir = join(getBasicAppRoot(), 'dist', 'client') - // These static routes should be automatically discovered and prerendered expect(existsSync(join(distDir, 'index.html'))).toBe(true) expect(existsSync(join(distDir, 'posts/index.html'))).toBe(true) @@ -35,7 +38,6 @@ test.describe('Prerender Static Path Discovery', () => { test.describe('Static Files Verification', () => { test('should contain prerendered content in posts.html', () => { - const distDir = join(getBasicAppRoot(), 'dist', 'client') expect(existsSync(join(distDir, 'posts/index.html'))).toBe(true) // "Select a post." should be in the prerendered HTML diff --git a/e2e/react-start/basic-test-suite/src/raw-stream.spec.ts b/e2e/react-start/basic/tests/raw-stream.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/raw-stream.spec.ts rename to e2e/react-start/basic/tests/raw-stream.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/redirect.spec.ts b/e2e/react-start/basic/tests/redirect.spec.ts similarity index 97% rename from e2e/react-start/basic-test-suite/src/redirect.spec.ts rename to e2e/react-start/basic/tests/redirect.spec.ts index 0763a901a2..1915388b0d 100644 --- a/e2e/react-start/basic-test-suite/src/redirect.spec.ts +++ b/e2e/react-start/basic/tests/redirect.spec.ts @@ -6,15 +6,15 @@ import { getTestServerPort, test, } from '@tanstack/router-e2e-utils' -import { getPackageName } from './utils/getPackageName.ts' +import { getE2EPortKey } from './utils/getE2EPortKey.ts' // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const packageName = getPackageName() +const e2ePortKey = getE2EPortKey() -const PORT = await getTestServerPort(packageName) +const PORT = await getTestServerPort(e2ePortKey) -const EXTERNAL_HOST_PORT = await getDummyServerPort(packageName) +const EXTERNAL_HOST_PORT = await getDummyServerPort(e2ePortKey) test.describe('redirects', () => { test.describe('internal', () => { diff --git a/e2e/react-start/basic-test-suite/src/root-scripts.spec.ts b/e2e/react-start/basic/tests/root-scripts.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/root-scripts.spec.ts rename to e2e/react-start/basic/tests/root-scripts.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/script-duplication.spec.ts b/e2e/react-start/basic/tests/script-duplication.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/script-duplication.spec.ts rename to e2e/react-start/basic/tests/script-duplication.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/search-params.spec.ts b/e2e/react-start/basic/tests/search-params.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/search-params.spec.ts rename to e2e/react-start/basic/tests/search-params.spec.ts diff --git a/e2e/solid-start/basic-test-suite/src/setup/global.setup.ts b/e2e/react-start/basic/tests/setup/global.setup.ts similarity index 50% rename from e2e/solid-start/basic-test-suite/src/setup/global.setup.ts rename to e2e/react-start/basic/tests/setup/global.setup.ts index fc06a65591..cd38c35885 100644 --- a/e2e/solid-start/basic-test-suite/src/setup/global.setup.ts +++ b/e2e/react-start/basic/tests/setup/global.setup.ts @@ -1,6 +1,6 @@ import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' export default async function setup() { - await e2eStartDummyServer(getPackageName()) + await e2eStartDummyServer(getE2EPortKey()) } diff --git a/e2e/vue-start/basic-test-suite/src/setup/global.teardown.ts b/e2e/react-start/basic/tests/setup/global.teardown.ts similarity index 55% rename from e2e/vue-start/basic-test-suite/src/setup/global.teardown.ts rename to e2e/react-start/basic/tests/setup/global.teardown.ts index a8a6899700..36e5c92858 100644 --- a/e2e/vue-start/basic-test-suite/src/setup/global.teardown.ts +++ b/e2e/react-start/basic/tests/setup/global.teardown.ts @@ -1,8 +1,8 @@ import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' export default async function teardown() { try { - await e2eStopDummyServer(getPackageName()) + await e2eStopDummyServer(getE2EPortKey()) } catch {} } diff --git a/e2e/solid-start/basic-test-suite/src/setup/waitForDummyServer.ts b/e2e/react-start/basic/tests/setup/waitForDummyServer.ts similarity index 82% rename from e2e/solid-start/basic-test-suite/src/setup/waitForDummyServer.ts rename to e2e/react-start/basic/tests/setup/waitForDummyServer.ts index f27dc86d5b..88c18fd79e 100644 --- a/e2e/solid-start/basic-test-suite/src/setup/waitForDummyServer.ts +++ b/e2e/react-start/basic/tests/setup/waitForDummyServer.ts @@ -1,11 +1,11 @@ import { getDummyServerPort } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' const timeoutMs = 10_000 const retryIntervalMs = 100 export default async function waitForDummyServer() { - const port = await getDummyServerPort(getPackageName()) + const port = await getDummyServerPort(getE2EPortKey()) const deadline = Date.now() + timeoutMs while (Date.now() < deadline) { diff --git a/e2e/react-start/basic-test-suite/src/special-characters.spec.ts b/e2e/react-start/basic/tests/special-characters.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/special-characters.spec.ts rename to e2e/react-start/basic/tests/special-characters.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/streaming.spec.ts b/e2e/react-start/basic/tests/streaming.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/streaming.spec.ts rename to e2e/react-start/basic/tests/streaming.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/type-only-reexport.spec.ts b/e2e/react-start/basic/tests/type-only-reexport.spec.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/type-only-reexport.spec.ts rename to e2e/react-start/basic/tests/type-only-reexport.spec.ts diff --git a/e2e/react-start/basic/tests/utils/getE2EPortKey.ts b/e2e/react-start/basic/tests/utils/getE2EPortKey.ts new file mode 100644 index 0000000000..48be6a9027 --- /dev/null +++ b/e2e/react-start/basic/tests/utils/getE2EPortKey.ts @@ -0,0 +1,5 @@ +import { getPackageName } from './getPackageName.ts' + +export function getE2EPortKey() { + return process.env.E2E_PORT_KEY ?? getPackageName() +} diff --git a/e2e/react-start/basic-test-suite/src/utils/getPackageName.ts b/e2e/react-start/basic/tests/utils/getPackageName.ts similarity index 100% rename from e2e/react-start/basic-test-suite/src/utils/getPackageName.ts rename to e2e/react-start/basic/tests/utils/getPackageName.ts diff --git a/e2e/react-start/basic/tsconfig.json b/e2e/react-start/basic/tsconfig.json index af81492efb..e486543b96 100644 --- a/e2e/react-start/basic/tsconfig.json +++ b/e2e/react-start/basic/tsconfig.json @@ -8,9 +8,11 @@ "moduleResolution": "Bundler", "lib": ["DOM", "DOM.Iterable", "ES2022"], "isolatedModules": true, + "allowImportingTsExtensions": true, "resolveJsonModule": true, "skipLibCheck": true, "target": "ES2022", + "types": ["node"], "allowJs": true, "forceConsistentCasingInFileNames": true, "paths": { diff --git a/e2e/react-start/basic/vite.config.ts b/e2e/react-start/basic/vite.config.ts index 8ac18ef504..f88efe304f 100644 --- a/e2e/react-start/basic/vite.config.ts +++ b/e2e/react-start/basic/vite.config.ts @@ -28,8 +28,13 @@ const prerenderConfiguration = { maxRedirects: 100, } +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + export default defineConfig({ resolve: { tsconfigPaths: true }, + build: { + outDir, + }, server: { port: 3000, }, diff --git a/e2e/solid-start/basic-prerender/.gitignore b/e2e/solid-start/basic-prerender/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/solid-start/basic-prerender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/solid-start/basic-prerender/package.json b/e2e/solid-start/basic-prerender/package.json deleted file mode 100644 index eda156f8e3..0000000000 --- a/e2e/solid-start/basic-prerender/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-solid-start-e2e-basic-prerender", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=prerender playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-solid-start-e2e-basic": "workspace:*", - "tanstack-solid-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/solid-start/basic-prerender/playwright.config.ts b/e2e/solid-start/basic-prerender/playwright.config.ts deleted file mode 100644 index cf2cf5d396..0000000000 --- a/e2e/solid-start/basic-prerender/playwright.config.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: - 'pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build:prerender && pnpm --dir ../basic start', - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'prerender', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/solid-start/basic-preview/.gitignore b/e2e/solid-start/basic-preview/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/solid-start/basic-preview/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/solid-start/basic-preview/package.json b/e2e/solid-start/basic-preview/package.json deleted file mode 100644 index 233d6af609..0000000000 --- a/e2e/solid-start/basic-preview/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-solid-start-e2e-basic-preview", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=preview playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-solid-start-e2e-basic": "workspace:*", - "tanstack-solid-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/solid-start/basic-preview/playwright.config.ts b/e2e/solid-start/basic-preview/playwright.config.ts deleted file mode 100644 index 071f336f9f..0000000000 --- a/e2e/solid-start/basic-preview/playwright.config.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: `pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build && pnpm --dir ../basic preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'preview', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/solid-start/basic-spa/.gitignore b/e2e/solid-start/basic-spa/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/solid-start/basic-spa/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/solid-start/basic-spa/package.json b/e2e/solid-start/basic-spa/package.json deleted file mode 100644 index c9f0283736..0000000000 --- a/e2e/solid-start/basic-spa/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-solid-start-e2e-basic-spa", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=spa playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-solid-start-e2e-basic": "workspace:*", - "tanstack-solid-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/solid-start/basic-spa/playwright.config.ts b/e2e/solid-start/basic-spa/playwright.config.ts deleted file mode 100644 index 27e85e1f1a..0000000000 --- a/e2e/solid-start/basic-spa/playwright.config.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: - 'pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build:spa && pnpm --dir ../basic start', - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'spa', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/solid-start/basic-test-suite/.gitignore b/e2e/solid-start/basic-test-suite/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/solid-start/basic-test-suite/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/solid-start/basic-test-suite/package.json b/e2e/solid-start/basic-test-suite/package.json deleted file mode 100644 index 775f9fc598..0000000000 --- a/e2e/solid-start/basic-test-suite/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "tanstack-solid-start-e2e-basic-test-suite", - "private": true, - "sideEffects": false, - "type": "module", - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "@types/node": "^22.10.2", - "combinate": "^1.1.11" - } -} diff --git a/e2e/solid-start/basic-test-suite/src/utils/getBasicAppRoot.ts b/e2e/solid-start/basic-test-suite/src/utils/getBasicAppRoot.ts deleted file mode 100644 index 12a411989a..0000000000 --- a/e2e/solid-start/basic-test-suite/src/utils/getBasicAppRoot.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { join } from 'node:path' -import { getPackageName } from './getPackageName.ts' - -export function getBasicAppRoot() { - return getPackageName().endsWith('-basic') - ? process.cwd() - : join(process.cwd(), '../basic') -} diff --git a/e2e/solid-start/basic-test-suite/src/utils/isPrerender.ts b/e2e/solid-start/basic-test-suite/src/utils/isPrerender.ts deleted file mode 100644 index d5d991d454..0000000000 --- a/e2e/solid-start/basic-test-suite/src/utils/isPrerender.ts +++ /dev/null @@ -1 +0,0 @@ -export const isPrerender: boolean = process.env.MODE === 'prerender' diff --git a/e2e/solid-start/basic-test-suite/src/utils/isPreview.ts b/e2e/solid-start/basic-test-suite/src/utils/isPreview.ts deleted file mode 100644 index 7ea362a83e..0000000000 --- a/e2e/solid-start/basic-test-suite/src/utils/isPreview.ts +++ /dev/null @@ -1 +0,0 @@ -export const isPreview: boolean = process.env.MODE === 'preview' diff --git a/e2e/solid-start/basic-test-suite/src/utils/isSpaMode.ts b/e2e/solid-start/basic-test-suite/src/utils/isSpaMode.ts deleted file mode 100644 index b4edb829a8..0000000000 --- a/e2e/solid-start/basic-test-suite/src/utils/isSpaMode.ts +++ /dev/null @@ -1 +0,0 @@ -export const isSpaMode: boolean = process.env.MODE === 'spa' diff --git a/e2e/solid-start/basic-test-suite/tsconfig.json b/e2e/solid-start/basic-test-suite/tsconfig.json deleted file mode 100644 index 3f3dbe6bcd..0000000000 --- a/e2e/solid-start/basic-test-suite/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "include": ["src/**/*.ts"], - "compilerOptions": { - "strict": true, - "esModuleInterop": true, - "module": "ESNext", - "moduleResolution": "Bundler", - "lib": ["DOM", "DOM.Iterable", "ES2022"], - "isolatedModules": true, - "allowImportingTsExtensions": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "target": "ES2022", - "types": ["node"], - "forceConsistentCasingInFileNames": true, - "noEmit": true - } -} diff --git a/e2e/solid-start/basic/.gitignore b/e2e/solid-start/basic/.gitignore index a79d5cf129..b9c2c7e5f6 100644 --- a/e2e/solid-start/basic/.gitignore +++ b/e2e/solid-start/basic/.gitignore @@ -18,3 +18,4 @@ yarn.lock /playwright-report/ /blob-report/ /playwright/.cache/ +/dist-vite-*/ diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json index 09e4b11f6b..e166a886ba 100644 --- a/e2e/solid-start/basic/package.json +++ b/e2e/solid-start/basic/package.json @@ -7,13 +7,11 @@ "dev": "vite dev --port 3000", "dev:e2e": "vite dev", "build": "vite build && tsc --noEmit", - "build:spa": "MODE=spa vite build && tsc --noEmit", - "build:prerender": "MODE=prerender vite build && tsc --noEmit", "preview": "vite preview", "start": "node server.js", - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf dist; rm -rf port*.txt; playwright test --project=chromium" + "test:e2e:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", + "test:e2e:stopDummyServer": "node -e 'import(\"./tests/setup/global.teardown.ts\").then(m => m.default())'", + "test:e2e:local": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", @@ -37,15 +35,30 @@ "combinate": "^1.1.11", "srvx": "^0.11.9", "tailwindcss": "^4.2.2", - "tanstack-solid-start-e2e-basic-test-suite": "workspace:*", "typescript": "^6.0.2", "vite-plugin-solid": "^2.11.11" }, "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr", + "shards": 4 + }, + { + "toolchain": "vite", + "mode": "spa" + }, + { + "toolchain": "vite", + "mode": "prerender" + }, + { + "toolchain": "vite", + "mode": "preview" + } + ] } } } diff --git a/e2e/solid-start/basic/playwright.config.ts b/e2e/solid-start/basic/playwright.config.ts index 0bc99a1ec4..6924134cd1 100644 --- a/e2e/solid-start/basic/playwright.config.ts +++ b/e2e/solid-start/basic/playwright.config.ts @@ -1,3 +1,4 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' import { getDummyServerPort, @@ -5,35 +6,54 @@ import { } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) +const mode = process.env.MODE ?? 'ssr' +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name +const distDir = process.env.E2E_DIST_DIR ?? 'dist' + +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}_start.txt`, + `port-${e2ePortKey}-external.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} + +const PORT = await getTestServerPort(e2ePortKey) +const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) +const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` -const ssrModeCommand = `pnpm build && pnpm start` +const commandByMode = + mode === 'preview' + ? `pnpm run test:e2e:startDummyServer && pnpm preview --outDir ${distDir} --port ${PORT}` + : `pnpm run test:e2e:startDummyServer && pnpm start` export default defineConfig({ - testDir: '../basic-test-suite/src', + testDir: './tests', workers: 1, reporter: [['line']], - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL, }, webServer: { - command: `pnpm run test:e2e:startDummyServer && ${ssrModeCommand}`, + command: commandByMode, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { - MODE: '', + MODE: mode, VITE_NODE_ENV: 'test', VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), START_PORT: String(START_PORT), PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/solid-start/basic/server.js b/e2e/solid-start/basic/server.js index 83f5ff0079..9db7619ae1 100644 --- a/e2e/solid-start/basic/server.js +++ b/e2e/solid-start/basic/server.js @@ -9,16 +9,19 @@ const startPort = process.env.START_PORT || 3001 const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' +const distDir = process.env.E2E_DIST_DIR || 'dist' +const distClientDir = path.resolve(distDir, 'client') +const distServerEntryPath = path.resolve(distDir, 'server', 'server.js') export async function createStartServer() { - const server = (await import('./dist/server/server.js')).default + const server = (await import(distServerEntryPath)).default const nodeHandler = toNodeHandler(server.fetch) const app = express() // to keep testing uniform stop express from redirecting /posts to /posts/ // when serving pre-rendered pages - app.use(express.static('./dist/client', { redirect: !isPrerender })) + app.use(express.static(distClientDir, { redirect: !isPrerender })) app.use(async (req, res, next) => { try { @@ -50,10 +53,10 @@ export async function createSpaServer() { }), ) - app.use(express.static('./dist/client')) + app.use(express.static(distClientDir)) app.get('/{*splat}', (req, res) => { - res.sendFile(path.resolve('./dist/client/index.html')) + res.sendFile(path.resolve(distClientDir, 'index.html')) }) return { app } diff --git a/e2e/solid-start/basic-test-suite/src/navigation.spec.ts b/e2e/solid-start/basic/tests/navigation.spec.ts similarity index 100% rename from e2e/solid-start/basic-test-suite/src/navigation.spec.ts rename to e2e/solid-start/basic/tests/navigation.spec.ts diff --git a/e2e/solid-start/basic-test-suite/src/not-found.spec.ts b/e2e/solid-start/basic/tests/not-found.spec.ts similarity index 100% rename from e2e/solid-start/basic-test-suite/src/not-found.spec.ts rename to e2e/solid-start/basic/tests/not-found.spec.ts diff --git a/e2e/vue-start/basic-test-suite/src/prerendering.spec.ts b/e2e/solid-start/basic/tests/prerendering.spec.ts similarity index 90% rename from e2e/vue-start/basic-test-suite/src/prerendering.spec.ts rename to e2e/solid-start/basic/tests/prerendering.spec.ts index 66cc1f68ff..ddcf720a4c 100644 --- a/e2e/vue-start/basic-test-suite/src/prerendering.spec.ts +++ b/e2e/solid-start/basic/tests/prerendering.spec.ts @@ -3,15 +3,18 @@ import { join } from 'node:path' import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' import { isPrerender } from './utils/isPrerender' -import { getBasicAppRoot } from './utils/getBasicAppRoot' + +const distDir = join( + process.cwd(), + process.env.E2E_DIST_DIR ?? 'dist', + 'client', +) test.describe('Prerender Static Path Discovery', () => { test.skip(!isPrerender, 'Skipping since not in prerender mode') test.describe('Build Output Verification', () => { test('should automatically discover and prerender static routes', () => { // Check that static routes were automatically discovered and prerendered - const distDir = join(getBasicAppRoot(), 'dist', 'client') - // These static routes should be automatically discovered and prerendered expect(existsSync(join(distDir, 'index.html'))).toBe(true) expect(existsSync(join(distDir, 'posts/index.html'))).toBe(true) @@ -35,7 +38,6 @@ test.describe('Prerender Static Path Discovery', () => { test.describe('Static Files Verification', () => { test('should contain prerendered content in posts.html', () => { - const distDir = join(getBasicAppRoot(), 'dist', 'client') expect(existsSync(join(distDir, 'posts/index.html'))).toBe(true) // "Select a post." should be in the prerendered HTML diff --git a/e2e/solid-start/basic-test-suite/src/redirect.spec.ts b/e2e/solid-start/basic/tests/redirect.spec.ts similarity index 97% rename from e2e/solid-start/basic-test-suite/src/redirect.spec.ts rename to e2e/solid-start/basic/tests/redirect.spec.ts index c25a6b0dbf..2cad7d8f9d 100644 --- a/e2e/solid-start/basic-test-suite/src/redirect.spec.ts +++ b/e2e/solid-start/basic/tests/redirect.spec.ts @@ -6,14 +6,14 @@ import { getTestServerPort, test, } from '@tanstack/router-e2e-utils' -import { getPackageName } from './utils/getPackageName.ts' +import { getE2EPortKey } from './utils/getE2EPortKey.ts' // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const packageName = getPackageName() -const PORT = await getTestServerPort(packageName) -const EXTERNAL_HOST_PORT = await getDummyServerPort(packageName) +const e2ePortKey = getE2EPortKey() +const PORT = await getTestServerPort(e2ePortKey) +const EXTERNAL_HOST_PORT = await getDummyServerPort(e2ePortKey) test.describe('redirects', () => { const internalNavigationTestMatrix = combinate({ diff --git a/e2e/solid-start/basic-test-suite/src/script-duplication.spec.ts b/e2e/solid-start/basic/tests/script-duplication.spec.ts similarity index 100% rename from e2e/solid-start/basic-test-suite/src/script-duplication.spec.ts rename to e2e/solid-start/basic/tests/script-duplication.spec.ts diff --git a/e2e/solid-start/basic-test-suite/src/search-params.spec.ts b/e2e/solid-start/basic/tests/search-params.spec.ts similarity index 100% rename from e2e/solid-start/basic-test-suite/src/search-params.spec.ts rename to e2e/solid-start/basic/tests/search-params.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/setup/global.setup.ts b/e2e/solid-start/basic/tests/setup/global.setup.ts similarity index 50% rename from e2e/react-start/basic-test-suite/src/setup/global.setup.ts rename to e2e/solid-start/basic/tests/setup/global.setup.ts index fc06a65591..cd38c35885 100644 --- a/e2e/react-start/basic-test-suite/src/setup/global.setup.ts +++ b/e2e/solid-start/basic/tests/setup/global.setup.ts @@ -1,6 +1,6 @@ import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' export default async function setup() { - await e2eStartDummyServer(getPackageName()) + await e2eStartDummyServer(getE2EPortKey()) } diff --git a/e2e/react-start/basic-test-suite/src/setup/global.teardown.ts b/e2e/solid-start/basic/tests/setup/global.teardown.ts similarity index 55% rename from e2e/react-start/basic-test-suite/src/setup/global.teardown.ts rename to e2e/solid-start/basic/tests/setup/global.teardown.ts index a8a6899700..36e5c92858 100644 --- a/e2e/react-start/basic-test-suite/src/setup/global.teardown.ts +++ b/e2e/solid-start/basic/tests/setup/global.teardown.ts @@ -1,8 +1,8 @@ import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' export default async function teardown() { try { - await e2eStopDummyServer(getPackageName()) + await e2eStopDummyServer(getE2EPortKey()) } catch {} } diff --git a/e2e/vue-start/basic-test-suite/src/setup/waitForDummyServer.ts b/e2e/solid-start/basic/tests/setup/waitForDummyServer.ts similarity index 82% rename from e2e/vue-start/basic-test-suite/src/setup/waitForDummyServer.ts rename to e2e/solid-start/basic/tests/setup/waitForDummyServer.ts index f27dc86d5b..88c18fd79e 100644 --- a/e2e/vue-start/basic-test-suite/src/setup/waitForDummyServer.ts +++ b/e2e/solid-start/basic/tests/setup/waitForDummyServer.ts @@ -1,11 +1,11 @@ import { getDummyServerPort } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' const timeoutMs = 10_000 const retryIntervalMs = 100 export default async function waitForDummyServer() { - const port = await getDummyServerPort(getPackageName()) + const port = await getDummyServerPort(getE2EPortKey()) const deadline = Date.now() + timeoutMs while (Date.now() < deadline) { diff --git a/e2e/solid-start/basic-test-suite/src/special-characters.spec.ts b/e2e/solid-start/basic/tests/special-characters.spec.ts similarity index 100% rename from e2e/solid-start/basic-test-suite/src/special-characters.spec.ts rename to e2e/solid-start/basic/tests/special-characters.spec.ts diff --git a/e2e/solid-start/basic-test-suite/src/streaming.spec.ts b/e2e/solid-start/basic/tests/streaming.spec.ts similarity index 100% rename from e2e/solid-start/basic-test-suite/src/streaming.spec.ts rename to e2e/solid-start/basic/tests/streaming.spec.ts diff --git a/e2e/solid-start/basic-test-suite/src/transition.spec.ts b/e2e/solid-start/basic/tests/transition.spec.ts similarity index 100% rename from e2e/solid-start/basic-test-suite/src/transition.spec.ts rename to e2e/solid-start/basic/tests/transition.spec.ts diff --git a/e2e/solid-start/basic/tests/utils/getE2EPortKey.ts b/e2e/solid-start/basic/tests/utils/getE2EPortKey.ts new file mode 100644 index 0000000000..48be6a9027 --- /dev/null +++ b/e2e/solid-start/basic/tests/utils/getE2EPortKey.ts @@ -0,0 +1,5 @@ +import { getPackageName } from './getPackageName.ts' + +export function getE2EPortKey() { + return process.env.E2E_PORT_KEY ?? getPackageName() +} diff --git a/e2e/solid-start/basic-test-suite/src/utils/getPackageName.ts b/e2e/solid-start/basic/tests/utils/getPackageName.ts similarity index 100% rename from e2e/solid-start/basic-test-suite/src/utils/getPackageName.ts rename to e2e/solid-start/basic/tests/utils/getPackageName.ts diff --git a/e2e/solid-start/basic/tsconfig.json b/e2e/solid-start/basic/tsconfig.json index cb1a0b80dd..0543683c33 100644 --- a/e2e/solid-start/basic/tsconfig.json +++ b/e2e/solid-start/basic/tsconfig.json @@ -9,6 +9,7 @@ "moduleResolution": "Bundler", "lib": ["DOM", "DOM.Iterable", "ES2022"], "isolatedModules": true, + "allowImportingTsExtensions": true, "resolveJsonModule": true, "skipLibCheck": true, "target": "ES2022", diff --git a/e2e/solid-start/basic/vite.config.ts b/e2e/solid-start/basic/vite.config.ts index 3cca892d57..9e26483d04 100644 --- a/e2e/solid-start/basic/vite.config.ts +++ b/e2e/solid-start/basic/vite.config.ts @@ -30,8 +30,13 @@ const prerenderConfiguration = { maxRedirects: 100, } +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + export default defineConfig({ resolve: { tsconfigPaths: true }, + build: { + outDir, + }, server: { port: 3000, }, diff --git a/e2e/vue-start/basic-prerender/.gitignore b/e2e/vue-start/basic-prerender/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/vue-start/basic-prerender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/vue-start/basic-prerender/package.json b/e2e/vue-start/basic-prerender/package.json deleted file mode 100644 index 5b05d8f771..0000000000 --- a/e2e/vue-start/basic-prerender/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-vue-start-e2e-basic-prerender", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=prerender playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-vue-start-e2e-basic": "workspace:*", - "tanstack-vue-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/vue-start/basic-prerender/playwright.config.ts b/e2e/vue-start/basic-prerender/playwright.config.ts deleted file mode 100644 index cf2cf5d396..0000000000 --- a/e2e/vue-start/basic-prerender/playwright.config.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: - 'pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build:prerender && pnpm --dir ../basic start', - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'prerender', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/vue-start/basic-preview/.gitignore b/e2e/vue-start/basic-preview/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/vue-start/basic-preview/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/vue-start/basic-preview/package.json b/e2e/vue-start/basic-preview/package.json deleted file mode 100644 index 663b1365f1..0000000000 --- a/e2e/vue-start/basic-preview/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-vue-start-e2e-basic-preview", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=preview playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-vue-start-e2e-basic": "workspace:*", - "tanstack-vue-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/vue-start/basic-preview/playwright.config.ts b/e2e/vue-start/basic-preview/playwright.config.ts deleted file mode 100644 index 071f336f9f..0000000000 --- a/e2e/vue-start/basic-preview/playwright.config.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: `pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build && pnpm --dir ../basic preview --port ${PORT}`, - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'preview', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/vue-start/basic-spa/.gitignore b/e2e/vue-start/basic-spa/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/vue-start/basic-spa/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/vue-start/basic-spa/package.json b/e2e/vue-start/basic-spa/package.json deleted file mode 100644 index 2186636549..0000000000 --- a/e2e/vue-start/basic-spa/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "tanstack-vue-start-e2e-basic-spa", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf port*.txt; MODE=spa playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "tanstack-vue-start-e2e-basic": "workspace:*", - "tanstack-vue-start-e2e-basic-test-suite": "workspace:*" - }, - "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } - } - } -} diff --git a/e2e/vue-start/basic-spa/playwright.config.ts b/e2e/vue-start/basic-spa/playwright.config.ts deleted file mode 100644 index 27e85e1f1a..0000000000 --- a/e2e/vue-start/basic-spa/playwright.config.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: '../basic-test-suite/src', - workers: 1, - reporter: [['line']], - - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: - 'pnpm run test:e2e:startDummyServer && pnpm --dir ../basic build:spa && pnpm --dir ../basic start', - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - MODE: 'spa', - VITE_NODE_ENV: 'test', - VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), - VITE_SERVER_PORT: String(PORT), - START_PORT: String(START_PORT), - PORT: String(PORT), - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/vue-start/basic-test-suite/.gitignore b/e2e/vue-start/basic-test-suite/.gitignore deleted file mode 100644 index 6381bf3860..0000000000 --- a/e2e/vue-start/basic-test-suite/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -/test-results/ -/playwright-report/ -/blob-report/ diff --git a/e2e/vue-start/basic-test-suite/package.json b/e2e/vue-start/basic-test-suite/package.json deleted file mode 100644 index 7d5ea7c002..0000000000 --- a/e2e/vue-start/basic-test-suite/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "tanstack-vue-start-e2e-basic-test-suite", - "private": true, - "sideEffects": false, - "type": "module", - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/router-e2e-utils": "workspace:^", - "@types/node": "^22.10.2", - "combinate": "^1.1.11" - } -} diff --git a/e2e/vue-start/basic-test-suite/src/utils/getBasicAppRoot.ts b/e2e/vue-start/basic-test-suite/src/utils/getBasicAppRoot.ts deleted file mode 100644 index 12a411989a..0000000000 --- a/e2e/vue-start/basic-test-suite/src/utils/getBasicAppRoot.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { join } from 'node:path' -import { getPackageName } from './getPackageName.ts' - -export function getBasicAppRoot() { - return getPackageName().endsWith('-basic') - ? process.cwd() - : join(process.cwd(), '../basic') -} diff --git a/e2e/vue-start/basic-test-suite/src/utils/isPrerender.ts b/e2e/vue-start/basic-test-suite/src/utils/isPrerender.ts deleted file mode 100644 index d5d991d454..0000000000 --- a/e2e/vue-start/basic-test-suite/src/utils/isPrerender.ts +++ /dev/null @@ -1 +0,0 @@ -export const isPrerender: boolean = process.env.MODE === 'prerender' diff --git a/e2e/vue-start/basic-test-suite/src/utils/isPreview.ts b/e2e/vue-start/basic-test-suite/src/utils/isPreview.ts deleted file mode 100644 index 7ea362a83e..0000000000 --- a/e2e/vue-start/basic-test-suite/src/utils/isPreview.ts +++ /dev/null @@ -1 +0,0 @@ -export const isPreview: boolean = process.env.MODE === 'preview' diff --git a/e2e/vue-start/basic-test-suite/src/utils/isSpaMode.ts b/e2e/vue-start/basic-test-suite/src/utils/isSpaMode.ts deleted file mode 100644 index b4edb829a8..0000000000 --- a/e2e/vue-start/basic-test-suite/src/utils/isSpaMode.ts +++ /dev/null @@ -1 +0,0 @@ -export const isSpaMode: boolean = process.env.MODE === 'spa' diff --git a/e2e/vue-start/basic-test-suite/tsconfig.json b/e2e/vue-start/basic-test-suite/tsconfig.json deleted file mode 100644 index 3f3dbe6bcd..0000000000 --- a/e2e/vue-start/basic-test-suite/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "include": ["src/**/*.ts"], - "compilerOptions": { - "strict": true, - "esModuleInterop": true, - "module": "ESNext", - "moduleResolution": "Bundler", - "lib": ["DOM", "DOM.Iterable", "ES2022"], - "isolatedModules": true, - "allowImportingTsExtensions": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "target": "ES2022", - "types": ["node"], - "forceConsistentCasingInFileNames": true, - "noEmit": true - } -} diff --git a/e2e/vue-start/basic/.gitignore b/e2e/vue-start/basic/.gitignore index a79d5cf129..b9c2c7e5f6 100644 --- a/e2e/vue-start/basic/.gitignore +++ b/e2e/vue-start/basic/.gitignore @@ -18,3 +18,4 @@ yarn.lock /playwright-report/ /blob-report/ /playwright/.cache/ +/dist-vite-*/ diff --git a/e2e/vue-start/basic/package.json b/e2e/vue-start/basic/package.json index ab56c475ef..6950d738ea 100644 --- a/e2e/vue-start/basic/package.json +++ b/e2e/vue-start/basic/package.json @@ -7,13 +7,11 @@ "dev": "vite dev --port 3000", "dev:e2e": "vite dev", "build": "vite build && tsc --noEmit", - "build:spa": "MODE=spa vite build && tsc --noEmit", - "build:prerender": "MODE=prerender vite build && tsc --noEmit", "preview": "vite preview", "start": "node server.js", - "test:e2e:startDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"../basic-test-suite/src/setup/waitForDummyServer.ts\").then(m => m.default())'", - "test:e2e:stopDummyServer": "node -e 'import(\"../basic-test-suite/src/setup/global.teardown.ts\").then(m => m.default())'", - "test:e2e": "rm -rf dist; rm -rf port*.txt; playwright test --project=chromium" + "test:e2e:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", + "test:e2e:stopDummyServer": "node -e 'import(\"./tests/setup/global.teardown.ts\").then(m => m.default())'", + "test:e2e:local": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -39,14 +37,29 @@ "combinate": "^1.1.11", "srvx": "^0.11.9", "tailwindcss": "^4.2.2", - "tanstack-vue-start-e2e-basic-test-suite": "workspace:*", "typescript": "^6.0.2" }, "nx": { - "targets": { - "test:e2e": { - "parallelism": false - } + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr", + "shards": 4 + }, + { + "toolchain": "vite", + "mode": "spa" + }, + { + "toolchain": "vite", + "mode": "prerender" + }, + { + "toolchain": "vite", + "mode": "preview" + } + ] } } } diff --git a/e2e/vue-start/basic/playwright.config.ts b/e2e/vue-start/basic/playwright.config.ts index 0bc99a1ec4..6924134cd1 100644 --- a/e2e/vue-start/basic/playwright.config.ts +++ b/e2e/vue-start/basic/playwright.config.ts @@ -1,3 +1,4 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' import { getDummyServerPort, @@ -5,35 +6,54 @@ import { } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) -const START_PORT = await getTestServerPort(`${packageJson.name}_start`) -const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) +const mode = process.env.MODE ?? 'ssr' +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name +const distDir = process.env.E2E_DIST_DIR ?? 'dist' + +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}_start.txt`, + `port-${e2ePortKey}-external.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} + +const PORT = await getTestServerPort(e2ePortKey) +const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) +const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` -const ssrModeCommand = `pnpm build && pnpm start` +const commandByMode = + mode === 'preview' + ? `pnpm run test:e2e:startDummyServer && pnpm preview --outDir ${distDir} --port ${PORT}` + : `pnpm run test:e2e:startDummyServer && pnpm start` export default defineConfig({ - testDir: '../basic-test-suite/src', + testDir: './tests', workers: 1, reporter: [['line']], - globalTeardown: '../basic-test-suite/src/setup/global.teardown.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL, }, webServer: { - command: `pnpm run test:e2e:startDummyServer && ${ssrModeCommand}`, + command: commandByMode, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { - MODE: '', + MODE: mode, VITE_NODE_ENV: 'test', VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), VITE_SERVER_PORT: String(PORT), START_PORT: String(START_PORT), PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/vue-start/basic/server.js b/e2e/vue-start/basic/server.js index 83f5ff0079..9db7619ae1 100644 --- a/e2e/vue-start/basic/server.js +++ b/e2e/vue-start/basic/server.js @@ -9,16 +9,19 @@ const startPort = process.env.START_PORT || 3001 const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' +const distDir = process.env.E2E_DIST_DIR || 'dist' +const distClientDir = path.resolve(distDir, 'client') +const distServerEntryPath = path.resolve(distDir, 'server', 'server.js') export async function createStartServer() { - const server = (await import('./dist/server/server.js')).default + const server = (await import(distServerEntryPath)).default const nodeHandler = toNodeHandler(server.fetch) const app = express() // to keep testing uniform stop express from redirecting /posts to /posts/ // when serving pre-rendered pages - app.use(express.static('./dist/client', { redirect: !isPrerender })) + app.use(express.static(distClientDir, { redirect: !isPrerender })) app.use(async (req, res, next) => { try { @@ -50,10 +53,10 @@ export async function createSpaServer() { }), ) - app.use(express.static('./dist/client')) + app.use(express.static(distClientDir)) app.get('/{*splat}', (req, res) => { - res.sendFile(path.resolve('./dist/client/index.html')) + res.sendFile(path.resolve(distClientDir, 'index.html')) }) return { app } diff --git a/e2e/vue-start/basic-test-suite/src/navigation.spec.ts b/e2e/vue-start/basic/tests/navigation.spec.ts similarity index 100% rename from e2e/vue-start/basic-test-suite/src/navigation.spec.ts rename to e2e/vue-start/basic/tests/navigation.spec.ts diff --git a/e2e/vue-start/basic-test-suite/src/not-found.spec.ts b/e2e/vue-start/basic/tests/not-found.spec.ts similarity index 100% rename from e2e/vue-start/basic-test-suite/src/not-found.spec.ts rename to e2e/vue-start/basic/tests/not-found.spec.ts diff --git a/e2e/react-start/basic-test-suite/src/prerendering.spec.ts b/e2e/vue-start/basic/tests/prerendering.spec.ts similarity index 90% rename from e2e/react-start/basic-test-suite/src/prerendering.spec.ts rename to e2e/vue-start/basic/tests/prerendering.spec.ts index 66cc1f68ff..ddcf720a4c 100644 --- a/e2e/react-start/basic-test-suite/src/prerendering.spec.ts +++ b/e2e/vue-start/basic/tests/prerendering.spec.ts @@ -3,15 +3,18 @@ import { join } from 'node:path' import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' import { isPrerender } from './utils/isPrerender' -import { getBasicAppRoot } from './utils/getBasicAppRoot' + +const distDir = join( + process.cwd(), + process.env.E2E_DIST_DIR ?? 'dist', + 'client', +) test.describe('Prerender Static Path Discovery', () => { test.skip(!isPrerender, 'Skipping since not in prerender mode') test.describe('Build Output Verification', () => { test('should automatically discover and prerender static routes', () => { // Check that static routes were automatically discovered and prerendered - const distDir = join(getBasicAppRoot(), 'dist', 'client') - // These static routes should be automatically discovered and prerendered expect(existsSync(join(distDir, 'index.html'))).toBe(true) expect(existsSync(join(distDir, 'posts/index.html'))).toBe(true) @@ -35,7 +38,6 @@ test.describe('Prerender Static Path Discovery', () => { test.describe('Static Files Verification', () => { test('should contain prerendered content in posts.html', () => { - const distDir = join(getBasicAppRoot(), 'dist', 'client') expect(existsSync(join(distDir, 'posts/index.html'))).toBe(true) // "Select a post." should be in the prerendered HTML diff --git a/e2e/vue-start/basic-test-suite/src/redirect.spec.ts b/e2e/vue-start/basic/tests/redirect.spec.ts similarity index 97% rename from e2e/vue-start/basic-test-suite/src/redirect.spec.ts rename to e2e/vue-start/basic/tests/redirect.spec.ts index c25a6b0dbf..2cad7d8f9d 100644 --- a/e2e/vue-start/basic-test-suite/src/redirect.spec.ts +++ b/e2e/vue-start/basic/tests/redirect.spec.ts @@ -6,14 +6,14 @@ import { getTestServerPort, test, } from '@tanstack/router-e2e-utils' -import { getPackageName } from './utils/getPackageName.ts' +import { getE2EPortKey } from './utils/getE2EPortKey.ts' // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const packageName = getPackageName() -const PORT = await getTestServerPort(packageName) -const EXTERNAL_HOST_PORT = await getDummyServerPort(packageName) +const e2ePortKey = getE2EPortKey() +const PORT = await getTestServerPort(e2ePortKey) +const EXTERNAL_HOST_PORT = await getDummyServerPort(e2ePortKey) test.describe('redirects', () => { const internalNavigationTestMatrix = combinate({ diff --git a/e2e/vue-start/basic-test-suite/src/script-duplication.spec.ts b/e2e/vue-start/basic/tests/script-duplication.spec.ts similarity index 100% rename from e2e/vue-start/basic-test-suite/src/script-duplication.spec.ts rename to e2e/vue-start/basic/tests/script-duplication.spec.ts diff --git a/e2e/vue-start/basic-test-suite/src/search-params.spec.ts b/e2e/vue-start/basic/tests/search-params.spec.ts similarity index 100% rename from e2e/vue-start/basic-test-suite/src/search-params.spec.ts rename to e2e/vue-start/basic/tests/search-params.spec.ts diff --git a/e2e/vue-start/basic-test-suite/src/setup/global.setup.ts b/e2e/vue-start/basic/tests/setup/global.setup.ts similarity index 50% rename from e2e/vue-start/basic-test-suite/src/setup/global.setup.ts rename to e2e/vue-start/basic/tests/setup/global.setup.ts index fc06a65591..cd38c35885 100644 --- a/e2e/vue-start/basic-test-suite/src/setup/global.setup.ts +++ b/e2e/vue-start/basic/tests/setup/global.setup.ts @@ -1,6 +1,6 @@ import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' export default async function setup() { - await e2eStartDummyServer(getPackageName()) + await e2eStartDummyServer(getE2EPortKey()) } diff --git a/e2e/solid-start/basic-test-suite/src/setup/global.teardown.ts b/e2e/vue-start/basic/tests/setup/global.teardown.ts similarity index 55% rename from e2e/solid-start/basic-test-suite/src/setup/global.teardown.ts rename to e2e/vue-start/basic/tests/setup/global.teardown.ts index a8a6899700..36e5c92858 100644 --- a/e2e/solid-start/basic-test-suite/src/setup/global.teardown.ts +++ b/e2e/vue-start/basic/tests/setup/global.teardown.ts @@ -1,8 +1,8 @@ import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' export default async function teardown() { try { - await e2eStopDummyServer(getPackageName()) + await e2eStopDummyServer(getE2EPortKey()) } catch {} } diff --git a/e2e/react-start/basic-test-suite/src/setup/waitForDummyServer.ts b/e2e/vue-start/basic/tests/setup/waitForDummyServer.ts similarity index 82% rename from e2e/react-start/basic-test-suite/src/setup/waitForDummyServer.ts rename to e2e/vue-start/basic/tests/setup/waitForDummyServer.ts index f27dc86d5b..88c18fd79e 100644 --- a/e2e/react-start/basic-test-suite/src/setup/waitForDummyServer.ts +++ b/e2e/vue-start/basic/tests/setup/waitForDummyServer.ts @@ -1,11 +1,11 @@ import { getDummyServerPort } from '@tanstack/router-e2e-utils' -import { getPackageName } from '../utils/getPackageName.ts' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' const timeoutMs = 10_000 const retryIntervalMs = 100 export default async function waitForDummyServer() { - const port = await getDummyServerPort(getPackageName()) + const port = await getDummyServerPort(getE2EPortKey()) const deadline = Date.now() + timeoutMs while (Date.now() < deadline) { diff --git a/e2e/vue-start/basic-test-suite/src/special-characters.spec.ts b/e2e/vue-start/basic/tests/special-characters.spec.ts similarity index 100% rename from e2e/vue-start/basic-test-suite/src/special-characters.spec.ts rename to e2e/vue-start/basic/tests/special-characters.spec.ts diff --git a/e2e/vue-start/basic-test-suite/src/streaming.spec.ts b/e2e/vue-start/basic/tests/streaming.spec.ts similarity index 100% rename from e2e/vue-start/basic-test-suite/src/streaming.spec.ts rename to e2e/vue-start/basic/tests/streaming.spec.ts diff --git a/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts b/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts new file mode 100644 index 0000000000..48be6a9027 --- /dev/null +++ b/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts @@ -0,0 +1,5 @@ +import { getPackageName } from './getPackageName.ts' + +export function getE2EPortKey() { + return process.env.E2E_PORT_KEY ?? getPackageName() +} diff --git a/e2e/vue-start/basic-test-suite/src/utils/getPackageName.ts b/e2e/vue-start/basic/tests/utils/getPackageName.ts similarity index 100% rename from e2e/vue-start/basic-test-suite/src/utils/getPackageName.ts rename to e2e/vue-start/basic/tests/utils/getPackageName.ts diff --git a/e2e/vue-start/basic/tsconfig.json b/e2e/vue-start/basic/tsconfig.json index 6f99c0f49a..1b2ac7b943 100644 --- a/e2e/vue-start/basic/tsconfig.json +++ b/e2e/vue-start/basic/tsconfig.json @@ -9,6 +9,7 @@ "moduleResolution": "Bundler", "lib": ["DOM", "DOM.Iterable", "ES2022"], "isolatedModules": true, + "allowImportingTsExtensions": true, "resolveJsonModule": true, "skipLibCheck": true, "target": "ES2022", diff --git a/e2e/vue-start/basic/vite.config.ts b/e2e/vue-start/basic/vite.config.ts index e638e37f36..6fe8d5d194 100644 --- a/e2e/vue-start/basic/vite.config.ts +++ b/e2e/vue-start/basic/vite.config.ts @@ -30,8 +30,13 @@ const prerenderConfiguration = { maxRedirects: 100, } +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + export default defineConfig({ resolve: { tsconfigPaths: true }, + build: { + outDir, + }, server: { port: 3000, }, diff --git a/package.json b/package.json index 453492cbaf..89a0dcf333 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "test:docs": "node scripts/verify-links.ts", "vite-ecosystem-ci:build": "nx run-many --targets=build --projects=@tanstack/router-plugin,@tanstack/start-plugin-core,@tanstack/react-start,@tanstack/react-start-client,@tanstack/react-start-server --skipRemoteCache", "vite-ecosystem-ci:before-test": "pnpm exec playwright install chromium", - "vite-ecosystem-ci:test": "nx run-many --targets=test:unit --projects=@tanstack/router-plugin,@tanstack/start-plugin-core,@tanstack/react-start-client --skipRemoteCache && nx run-many --target=test:e2e --projects=tanstack-router-e2e-react-basic-file-based,tanstack-router-e2e-react-basic-file-based-code-splitting,tanstack-react-start-e2e-basic,tanstack-react-start-e2e-basic-spa,tanstack-react-start-e2e-basic-prerender,tanstack-react-start-e2e-basic-preview,tanstack-vue-start-e2e-basic,tanstack-vue-start-e2e-basic-spa,tanstack-vue-start-e2e-basic-prerender,tanstack-vue-start-e2e-basic-preview,tanstack-solid-start-e2e-basic,tanstack-solid-start-e2e-basic-spa,tanstack-solid-start-e2e-basic-prerender,tanstack-solid-start-e2e-basic-preview --skipRemoteCache" + "vite-ecosystem-ci:test": "nx run-many --targets=test:unit --projects=@tanstack/router-plugin,@tanstack/start-plugin-core,@tanstack/react-start-client --skipRemoteCache && nx run-many --target=test:e2e --projects=tanstack-router-e2e-react-basic-file-based,tanstack-router-e2e-react-basic-file-based-code-splitting,tanstack-react-start-e2e-basic,tanstack-vue-start-e2e-basic,tanstack-solid-start-e2e-basic --skipRemoteCache" }, "nx": { "includedScripts": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2aaa9bd032..81494ebb58 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1389,9 +1389,6 @@ importers: tailwindcss: specifier: ^4.2.2 version: 4.2.2 - tanstack-react-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite typescript: specifier: ^6.0.2 version: 6.0.2 @@ -1527,36 +1524,6 @@ importers: specifier: ^4.74.0 version: 4.75.0 - e2e/react-start/basic-prerender: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-react-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-react-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - - e2e/react-start/basic-preview: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-react-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-react-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - e2e/react-start/basic-react-query: dependencies: '@tanstack/react-query': @@ -1627,36 +1594,6 @@ importers: specifier: ^6.0.2 version: 6.0.2 - e2e/react-start/basic-spa: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-react-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-react-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - - e2e/react-start/basic-test-suite: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:* - version: link:../../e2e-utils - '@types/node': - specifier: 25.0.9 - version: 25.0.9 - combinate: - specifier: ^1.1.11 - version: 1.1.11 - e2e/react-start/basic-tsr-config: dependencies: '@tanstack/react-router': @@ -3935,9 +3872,6 @@ importers: tailwindcss: specifier: ^4.2.2 version: 4.2.2 - tanstack-solid-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite typescript: specifier: ^6.0.2 version: 6.0.2 @@ -4055,36 +3989,6 @@ importers: specifier: ^4.74.0 version: 4.75.0 - e2e/solid-start/basic-prerender: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-solid-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-solid-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - - e2e/solid-start/basic-preview: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-solid-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-solid-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - e2e/solid-start/basic-solid-query: dependencies: '@tanstack/solid-query': @@ -4146,36 +4050,6 @@ importers: specifier: ^2.11.11 version: 2.11.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.12)(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1)) - e2e/solid-start/basic-spa: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-solid-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-solid-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - - e2e/solid-start/basic-test-suite: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - '@types/node': - specifier: 25.0.9 - version: 25.0.9 - combinate: - specifier: ^1.1.11 - version: 1.1.11 - e2e/solid-start/basic-tsr-config: dependencies: '@tanstack/solid-router': @@ -5834,9 +5708,6 @@ importers: tailwindcss: specifier: ^4.2.2 version: 4.2.2 - tanstack-vue-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite typescript: specifier: ^6.0.2 version: 6.0.2 @@ -5957,66 +5828,6 @@ importers: specifier: ^4.74.0 version: 4.75.0 - e2e/vue-start/basic-prerender: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-vue-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-vue-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - - e2e/vue-start/basic-preview: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-vue-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-vue-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - - e2e/vue-start/basic-spa: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - tanstack-vue-start-e2e-basic: - specifier: workspace:* - version: link:../basic - tanstack-vue-start-e2e-basic-test-suite: - specifier: workspace:* - version: link:../basic-test-suite - - e2e/vue-start/basic-test-suite: - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - '@types/node': - specifier: 25.0.9 - version: 25.0.9 - combinate: - specifier: ^1.1.11 - version: 1.1.11 - e2e/vue-start/basic-tsr-config: dependencies: '@tanstack/vue-router': diff --git a/scripts/nx/playwright-plugin.md b/scripts/nx/playwright-plugin.md index 8fdf391141..a9f33bb4c8 100644 --- a/scripts/nx/playwright-plugin.md +++ b/scripts/nx/playwright-plugin.md @@ -1,40 +1,98 @@ -# Playwright E2E Sharding +# Playwright E2E Inference (Modes + Shards) -Use `scripts/nx/playwright-plugin.ts` to turn a Playwright e2e project into Nx shard targets. +Use `scripts/nx/playwright-plugin.ts` to infer Playwright e2e targets from +`package.json` metadata. -The plugin looks for `nx.metadata.playwrightShards` in a project's `package.json`. When present, it generates: +The plugin supports two metadata styles: -- `test:e2e--shard-1-of-N` through `test:e2e--shard-N-of-N` -- a parent `test:e2e` target that depends on all shard targets +- `nx.metadata.playwrightModes` (recommended) +- `nx.metadata.playwrightShards` (legacy, still supported) -Each shard target runs Playwright with: +When `playwrightModes` is present, it takes precedence. -- `--shard=/` -- a shard-specific `E2E_PORT_KEY` -- a dependency on `build` and `^build` - -## 1. Enable sharding in `package.json` +## 1. Configure `playwrightModes` in `package.json` ```json { - "name": "tanstack-react-start-e2e-rsc", + "name": "tanstack-react-start-e2e-basic", "nx": { "metadata": { - "playwrightShards": 6 + "playwrightModes": [ + { "toolchain": "vite", "mode": "ssr" }, + { "toolchain": "vite", "mode": "spa", "shards": 4 }, + { "toolchain": "vite", "mode": "prerender", "shards": 4 }, + { "toolchain": "vite", "mode": "preview" } + ] } } } ``` -The package name is used to build the shard port key: +Supported modes: -```txt --shard--of- +- `ssr` +- `spa` +- `prerender` +- `preview` + +`shards` is optional and defaults to `1`. + +Supported toolchains: + +- `vite` + +## 2. What targets are generated + +For each `{ toolchain, mode }` entry, the plugin generates: + +- `build:e2e---` +- `test:e2e---` + +If `shards > 1`, it also generates: + +- `test:e2e-----shard-1-of-N` ... `--shard-N-of-N` +- `test:e2e---` as a parent noop target depending on all shards + +Finally, it generates: + +- `test:e2e` as a parent noop target depending on every mode target + +## 3. Environment variables injected by inferred targets + +Each inferred `build:e2e:*` and `test:e2e:*` target sets: + +- `MODE=` +- `TOOLCHAIN=` +- `E2E_TOOLCHAIN=` +- `E2E_DIST=dist--` +- `E2E_DIST_DIR=dist--` + +Each inferred `test:e2e:*` target also sets: + +- `E2E_PORT_KEY=--` +- For shard targets: `E2E_PORT_KEY=---shard--of-` + +## 4. Build behavior and webServer command + +Each inferred e2e target depends on the inferred `build:e2e---` +target, which runs: + +```sh +vite build && tsc --noEmit ``` -## 2. Do not build inside `playwright.config.ts` +with the mode/toolchain env above. -The plugin already makes each shard depend on `build`, so the Playwright `webServer` command should only start the built app. +This command is intentionally fixed (it does not call `pnpm build`). This avoids +accidentally selecting the wrong build path in projects that include multiple +toolchains. + +The inferred build target uses standard production inputs and explicit mode- +specific outputs (`dist--`). Mode env values are passed through +the target command env, so they do not need to be duplicated as target input +env hashes. + +Because of this, Playwright `webServer.command` should only start the app. Good: @@ -45,22 +103,31 @@ webServer: { } ``` -Avoid: +For preview mode, pass the inferred dist folder: ```ts +const distDir = process.env.E2E_DIST_DIR ?? 'dist' + webServer: { - command: `PORT=${PORT} pnpm build && PORT=${PORT} pnpm start`, + command: `pnpm preview --outDir ${distDir} --port ${PORT}`, url: baseURL, } ``` -Running the build inside every shard causes unnecessary work and can create races when multiple shards share the same project directory. +Avoid: -## 3. Use `E2E_PORT_KEY` for every derived port +```ts +webServer: { + command: `MODE=spa pnpm build && PORT=${PORT} pnpm start`, + url: baseURL, +} +``` -If the project uses `getTestServerPort`, `getDummyServerPort`, `e2eStartDummyServer`, or `e2eStopDummyServer`, key them off `process.env.E2E_PORT_KEY` first. +## 5. Use `E2E_PORT_KEY` for all server ports -Example: +If your setup uses `getTestServerPort`, `getDummyServerPort`, +`e2eStartDummyServer`, or `e2eStopDummyServer`, use +`process.env.E2E_PORT_KEY` first. ```ts import { getTestServerPort } from '@tanstack/router-e2e-utils' @@ -77,15 +144,14 @@ await e2eStartDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) await e2eStopDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) ``` -Without this, multiple shards on the same runner will reuse the same `port-*.txt` files and tear each other down. +## 6. Clean stale port files once per Playwright run -## 4. Clean stale port files once per Playwright run +If the project allocates ports through `@tanstack/router-e2e-utils`, clean stale +`port-*.txt` files before resolving the port. -If the project allocates ports through `@tanstack/router-e2e-utils`, clean stale `port-*.txt` files before resolving the port. - -Important: do this only in the main Playwright config load. Playwright loads the config more than once, and unconditional cleanup can remap the port after the web server has already started. - -Example: +Important: do this only in the main Playwright config load. Playwright loads the +config more than once, and unconditional cleanup can remap the port after the +web server has already started. ```ts import fs from 'node:fs' @@ -96,6 +162,7 @@ const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name if (process.env.TEST_WORKER_INDEX === undefined) { for (const portFile of [ `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}_start.txt`, `port-${e2ePortKey}-external.txt`, ]) { fs.rmSync(portFile, { force: true }) @@ -103,49 +170,34 @@ if (process.env.TEST_WORKER_INDEX === undefined) { } ``` +Include the `*_start` file only if your test setup allocates a separate +`START_PORT` key. + Avoid broad cleanup such as `rm -rf port*.txt` in shared shard runs. -## 5. Keep the base URL derived from the shard key - -```ts -const PORT = await getTestServerPort(e2ePortKey) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - use: { - baseURL, - }, - webServer: { - command: `PORT=${PORT} pnpm start`, - url: baseURL, - }, -}) -``` - -## 6. Run the generated targets +## 7. Run inferred targets Examples: ```sh -pnpm nx run tanstack-react-start-e2e-rsc:test:e2e--shard-1-of-6 -pnpm nx run tanstack-react-start-e2e-rsc:test:e2e +pnpm nx run tanstack-react-start-e2e-basic:test:e2e--vite-ssr +pnpm nx run tanstack-react-start-e2e-basic:test:e2e--vite-spa--shard-1-of-4 +pnpm nx run tanstack-react-start-e2e-basic:test:e2e ``` -## Checklist +## Legacy fallback: `playwrightShards` -- add `nx.metadata.playwrightShards` to `package.json` -- make sure the project has a working `build` target -- remove `build` from `webServer.command` -- read ports from `process.env.E2E_PORT_KEY ?? packageJson.name` -- use the same key for helper servers in setup and teardown -- clean shard-specific `port-*.txt` files once, guarded by `TEST_WORKER_INDEX === undefined` -- avoid wildcard port cleanup in shared shard runs +If `playwrightModes` is not configured, the plugin still supports: -## Reference +```json +{ + "nx": { + "metadata": { + "playwrightShards": 6 + } + } +} +``` -Working example: - -- `e2e/react-start/rsc/package.json` -- `e2e/react-start/rsc/playwright.config.ts` -- `e2e/react-start/rsc/tests/setup/global.setup.ts` -- `e2e/react-start/rsc/tests/setup/global.teardown.ts` +This generates legacy shard targets under `test:e2e--shard-...` plus a parent +`test:e2e` target. diff --git a/scripts/nx/playwright-plugin.ts b/scripts/nx/playwright-plugin.ts index 9e8c9618ad..464ff3ac00 100644 --- a/scripts/nx/playwright-plugin.ts +++ b/scripts/nx/playwright-plugin.ts @@ -10,7 +10,7 @@ export const createNodesV2: CreateNodesV2 = [ '**/package.json', async (configFiles, options, context) => { return await createNodesFromFiles( - (configFile, options, context) => + (configFile, _options, context) => createNodesInternal(configFile, context), configFiles, options, @@ -19,15 +19,45 @@ export const createNodesV2: CreateNodesV2 = [ }, ] -async function createNodesInternal( +function createNodesInternal( configFilePath: string, - context: CreateNodesContextV2, + _context: CreateNodesContextV2, ) { const projectConfiguration = readJsonFile<{ name?: string - nx?: { metadata?: { playwrightShards?: number } } + nx?: { + metadata?: { + playwrightShards?: number + playwrightModes?: Array + } + } }>(configFilePath) const root = dirname(configFilePath) + const packageName = projectConfiguration.name ?? root + const playwrightModes = + projectConfiguration.nx?.metadata?.playwrightModes ?? [] + + if (playwrightModes.length > 0) { + const { targets, targetGroupEntries } = buildModeTargets( + root, + packageName, + playwrightModes, + ) + + return { + projects: { + [root]: { + targets, + metadata: { + targetGroups: { + playwright: targetGroupEntries, + }, + }, + tags: ['playwright:sharded'], + }, + }, + } + } if (!projectConfiguration.nx?.metadata?.playwrightShards) { return { @@ -39,9 +69,8 @@ async function createNodesInternal( const { targets, targetGroupEntries } = buildShardedTargets( root, - projectConfiguration.name ?? root, + packageName, projectConfiguration.nx.metadata.playwrightShards, - ['default', '^production'], ) // Project configuration to be merged into the rest of the Nx configuration return { @@ -53,19 +82,240 @@ async function createNodesInternal( playwright: targetGroupEntries, }, }, - tags: ['playwright:shareded'], + tags: ['playwright:sharded'], }, }, } } const CI_TARGET_NAME = 'test:e2e' +const MODE_TARGET_SEPARATOR = '--' +const TEST_INPUTS: TargetConfiguration['inputs'] = ['default', '^production'] +const BUILD_INPUTS: TargetConfiguration['inputs'] = [ + 'production', + '^production', +] + +const PLAYWRIGHT_TOOLCHAINS = ['vite'] as const +const PLAYWRIGHT_MODES = ['ssr', 'spa', 'prerender', 'preview'] as const + +type PlaywrightToolchain = (typeof PLAYWRIGHT_TOOLCHAINS)[number] +type PlaywrightMode = (typeof PLAYWRIGHT_MODES)[number] + +type PlaywrightModeMetadata = { + toolchain: PlaywrightToolchain + mode: PlaywrightMode + shards?: number +} + +type RawPlaywrightModeMetadata = { + toolchain?: string + mode?: string + shards?: number +} + +function validateModeMetadata( + modeMetadata: RawPlaywrightModeMetadata, + index: number, +): PlaywrightModeMetadata { + const targetName = `${modeMetadata.toolchain ?? ''}:${modeMetadata.mode ?? ''}` + + if (!modeMetadata.toolchain || !modeMetadata.mode) { + throw new Error( + `[Playwright Sharding Plugin] Invalid playwrightModes[${index}] entry: ` + + `${JSON.stringify(modeMetadata)}. Both "toolchain" and "mode" are required.`, + ) + } + + if ( + !PLAYWRIGHT_TOOLCHAINS.includes( + modeMetadata.toolchain as PlaywrightToolchain, + ) + ) { + throw new Error( + `[Playwright Sharding Plugin] Invalid toolchain for playwrightModes[${index}]: ` + + `${modeMetadata.toolchain}. Supported toolchains: ${PLAYWRIGHT_TOOLCHAINS.join(', ')}.`, + ) + } + + if (!PLAYWRIGHT_MODES.includes(modeMetadata.mode as PlaywrightMode)) { + throw new Error( + `[Playwright Sharding Plugin] Invalid mode for playwrightModes[${index}]: ` + + `${modeMetadata.mode}. Supported modes: ${PLAYWRIGHT_MODES.join(', ')}.`, + ) + } + + if (modeMetadata.shards !== undefined) { + const shardCount = Number(modeMetadata.shards) + + if (!Number.isInteger(shardCount) || shardCount < 1) { + throw new Error( + `[Playwright Sharding Plugin] Invalid shard count for ${targetName}: ${modeMetadata.shards}. ` + + `Expected a positive integer.`, + ) + } + } + + return { + toolchain: modeMetadata.toolchain as PlaywrightToolchain, + mode: modeMetadata.mode as PlaywrightMode, + shards: modeMetadata.shards, + } +} + +function buildModeTargets( + projectRoot: string, + packageName: string, + modes: Array, +): { + targets: Record + targetGroupEntries: Array +} { + const targets: Record = {} + const targetGroup: Array = [] + const ciDependsOnTargets: Array<{ + target: string + projects: 'self' + params: 'forward' + }> = [] + + for (const [index, rawModeMetadata] of modes.entries()) { + const modeMetadata = validateModeMetadata(rawModeMetadata, index) + const modeTargetName = `${CI_TARGET_NAME}--${modeMetadata.toolchain}-${modeMetadata.mode}` + const buildTargetName = `build:e2e--${modeMetadata.toolchain}-${modeMetadata.mode}` + const shardCount = modeMetadata.shards ?? 1 + const distDir = `dist-${modeMetadata.toolchain}-${modeMetadata.mode}` + const modeEnv = { + MODE: modeMetadata.mode, + TOOLCHAIN: modeMetadata.toolchain, + E2E_TOOLCHAIN: modeMetadata.toolchain, + E2E_DIST: distDir, + E2E_DIST_DIR: distDir, + } + const modePortKey = `${packageName}-${modeMetadata.toolchain}-${modeMetadata.mode}` + const modeDescription = `${modeMetadata.toolchain}/${modeMetadata.mode}` + const modeShardTargets: Array = [] + + targets[buildTargetName] = { + executor: 'nx:run-commands', + options: { + command: 'vite build && tsc --noEmit', + cwd: projectRoot, + env: modeEnv, + }, + parallelism: false, + cache: true, + inputs: BUILD_INPUTS, + dependsOn: ['^build'], + outputs: [`{projectRoot}/${distDir}`], + metadata: { + technologies: ['playwright'], + description: `Build artifacts for ${modeDescription} e2e tests`, + }, + } + targetGroup.push(buildTargetName) + + if (shardCount === 1) { + targets[modeTargetName] = { + executor: 'nx:run-commands', + options: { + command: 'playwright test --project=chromium', + cwd: projectRoot, + env: { + ...modeEnv, + E2E_PORT_KEY: modePortKey, + }, + }, + cache: true, + inputs: TEST_INPUTS, + dependsOn: [buildTargetName], + metadata: { + technologies: ['playwright'], + description: `Run Playwright tests for ${modeDescription}`, + }, + } + targetGroup.push(modeTargetName) + } else { + for (let shardIndex = 1; shardIndex <= shardCount; shardIndex++) { + const shardTargetName = `${modeTargetName}${MODE_TARGET_SEPARATOR}shard-${shardIndex}-of-${shardCount}` + const shardPortKey = `${modePortKey}-shard-${shardIndex}-of-${shardCount}` + + targets[shardTargetName] = { + executor: 'nx:run-commands', + options: { + command: `playwright test --project=chromium --shard=${shardIndex}/${shardCount}`, + cwd: projectRoot, + env: { + ...modeEnv, + E2E_PORT_KEY: shardPortKey, + }, + }, + cache: true, + inputs: TEST_INPUTS, + dependsOn: [buildTargetName], + metadata: { + technologies: ['playwright'], + description: `Run Playwright ${modeDescription} shard ${shardIndex} of ${shardCount}`, + help: { + command: `npx playwright run --help`, + example: { + options: { + shard: `${shardIndex}/${shardCount}`, + }, + }, + }, + }, + } + + modeShardTargets.push(shardTargetName) + targetGroup.push(shardTargetName) + } + + targets[modeTargetName] = { + executor: 'nx:noop', + cache: true, + inputs: TEST_INPUTS, + dependsOn: modeShardTargets.map((shardTargetName) => ({ + target: shardTargetName, + projects: 'self' as const, + params: 'forward' as const, + })), + metadata: { + technologies: ['playwright'], + description: `Run all Playwright ${modeDescription} shards (${shardCount} shards)`, + }, + } + targetGroup.push(modeTargetName) + } + + ciDependsOnTargets.push({ + target: modeTargetName, + projects: 'self', + params: 'forward', + }) + } + + targets[CI_TARGET_NAME] = { + executor: 'nx:noop', + cache: true, + inputs: TEST_INPUTS, + dependsOn: ciDependsOnTargets, + metadata: { + technologies: ['playwright'], + description: `Run all Playwright modes (${modes.length} modes)`, + }, + } + + return { + targets, + targetGroupEntries: [...targetGroup, CI_TARGET_NAME], + } +} function buildShardedTargets( projectRoot: string, packageName: string, shardCount: number, - testInputs: TargetConfiguration['inputs'], ): { targets: Record targetGroupEntries: Array @@ -88,7 +338,7 @@ function buildShardedTargets( }, }, cache: true, - inputs: testInputs, + inputs: TEST_INPUTS, dependsOn: [`^build`, 'build'], metadata: { technologies: ['playwright'], @@ -111,7 +361,7 @@ function buildShardedTargets( targets[CI_TARGET_NAME] = { executor: 'nx:noop', cache: true, - inputs: testInputs, + inputs: TEST_INPUTS, dependsOn: targetGroup.map((shardTargetName) => ({ target: shardTargetName, projects: 'self' as const, From 24b11a9189d8f3bb940c8bafd38859dbe69545c4 Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Sat, 18 Apr 2026 23:05:44 +0200 Subject: [PATCH 019/597] feat(nx): support rsbuild in Playwright inference (#7221) --- scripts/nx/playwright-plugin.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/nx/playwright-plugin.ts b/scripts/nx/playwright-plugin.ts index 464ff3ac00..91892c9d7d 100644 --- a/scripts/nx/playwright-plugin.ts +++ b/scripts/nx/playwright-plugin.ts @@ -96,12 +96,17 @@ const BUILD_INPUTS: TargetConfiguration['inputs'] = [ '^production', ] -const PLAYWRIGHT_TOOLCHAINS = ['vite'] as const +const PLAYWRIGHT_TOOLCHAINS = ['vite', 'rsbuild'] as const const PLAYWRIGHT_MODES = ['ssr', 'spa', 'prerender', 'preview'] as const type PlaywrightToolchain = (typeof PLAYWRIGHT_TOOLCHAINS)[number] type PlaywrightMode = (typeof PLAYWRIGHT_MODES)[number] +const PLAYWRIGHT_BUILD_COMMANDS: Record = { + vite: 'vite build && tsc --noEmit', + rsbuild: 'rsbuild build && tsc --noEmit', +} + type PlaywrightModeMetadata = { toolchain: PlaywrightToolchain mode: PlaywrightMode @@ -199,7 +204,7 @@ function buildModeTargets( targets[buildTargetName] = { executor: 'nx:run-commands', options: { - command: 'vite build && tsc --noEmit', + command: PLAYWRIGHT_BUILD_COMMANDS[modeMetadata.toolchain], cwd: projectRoot, env: modeEnv, }, From fc3b766ea958d779ceb733ec2e6b750cf122c1e7 Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Sat, 18 Apr 2026 23:22:12 +0200 Subject: [PATCH 020/597] test(e2e-rsc): migrate to playwrightModes and dynamic inferred dist (#7222) --- e2e/react-start/rsc/.gitignore | 2 ++ e2e/react-start/rsc/package.json | 10 ++++++++-- e2e/react-start/rsc/vite.config.ts | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/e2e/react-start/rsc/.gitignore b/e2e/react-start/rsc/.gitignore index cf59fcdcbe..4586086d3d 100644 --- a/e2e/react-start/rsc/.gitignore +++ b/e2e/react-start/rsc/.gitignore @@ -13,6 +13,8 @@ yarn.lock /server/build /public/build /dist/ +/dist-vite-*/ +/dist-rsbuild-*/ /test-results/ /playwright-report/ /blob-report/ diff --git a/e2e/react-start/rsc/package.json b/e2e/react-start/rsc/package.json index eec6e1581d..8fba2be5e9 100644 --- a/e2e/react-start/rsc/package.json +++ b/e2e/react-start/rsc/package.json @@ -8,12 +8,18 @@ "dev:e2e": "vite dev --port $PORT", "build": "vite build && tsc --noEmit", "preview": "vite preview", - "start": "pnpx srvx --prod -s ../client dist/server/server.js", + "start": "pnpx srvx --prod -s ../client ${E2E_DIST_DIR:-dist}/server/server.js", "test:e2e-full": "pnpm build && sh -c 'rm -f \"port-${E2E_PORT_KEY:-$npm_package_name}.txt\" \"port-${E2E_PORT_KEY:-$npm_package_name}-external.txt\"' && playwright test --project=chromium" }, "nx": { "metadata": { - "playwrightShards": 6 + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr", + "shards": 6 + } + ] } }, "dependencies": { diff --git a/e2e/react-start/rsc/vite.config.ts b/e2e/react-start/rsc/vite.config.ts index 928246a016..c0ae311a5d 100644 --- a/e2e/react-start/rsc/vite.config.ts +++ b/e2e/react-start/rsc/vite.config.ts @@ -3,8 +3,13 @@ import { tanstackStart } from '@tanstack/react-start/plugin/vite' import viteReact from '@vitejs/plugin-react' import rsc from '@vitejs/plugin-rsc' +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + export default defineConfig({ resolve: { tsconfigPaths: true }, + build: { + outDir, + }, server: { port: 3000, }, From cbf9ecfc69f1f9034befb00b1433f559ce395920 Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Sat, 18 Apr 2026 23:41:37 +0200 Subject: [PATCH 021/597] fix(nx): align playwright mode build target naming (#7223) --- scripts/nx/playwright-plugin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nx/playwright-plugin.ts b/scripts/nx/playwright-plugin.ts index 91892c9d7d..2982dfc5ee 100644 --- a/scripts/nx/playwright-plugin.ts +++ b/scripts/nx/playwright-plugin.ts @@ -187,7 +187,7 @@ function buildModeTargets( for (const [index, rawModeMetadata] of modes.entries()) { const modeMetadata = validateModeMetadata(rawModeMetadata, index) const modeTargetName = `${CI_TARGET_NAME}--${modeMetadata.toolchain}-${modeMetadata.mode}` - const buildTargetName = `build:e2e--${modeMetadata.toolchain}-${modeMetadata.mode}` + const buildTargetName = `build:${modeMetadata.toolchain}:${modeMetadata.mode}` const shardCount = modeMetadata.shards ?? 1 const distDir = `dist-${modeMetadata.toolchain}-${modeMetadata.mode}` const modeEnv = { From 3a59b7203a81b9dbeb51488fc631a284e3c499d6 Mon Sep 17 00:00:00 2001 From: Mukunda Rao Katta Date: Tue, 21 Apr 2026 12:36:46 -0700 Subject: [PATCH 022/597] docs(start): add missing space after comma in 'Handling requests with a body' (#7234) --- docs/start/framework/react/guide/server-routes.md | 2 +- docs/start/framework/solid/guide/server-routes.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/start/framework/react/guide/server-routes.md b/docs/start/framework/react/guide/server-routes.md index 55e94d36d2..542b274147 100644 --- a/docs/start/framework/react/guide/server-routes.md +++ b/docs/start/framework/react/guide/server-routes.md @@ -314,7 +314,7 @@ export const Route = createFileRoute('/file/$')({ ## Handling requests with a body -To handle POST requests,you can add a `POST` handler to the route object. The handler will receive the request object as the first argument, and you can access the request body using the `request.json()` method. +To handle POST requests, you can add a `POST` handler to the route object. The handler will receive the request object as the first argument, and you can access the request body using the `request.json()` method. ```ts // routes/hello.ts diff --git a/docs/start/framework/solid/guide/server-routes.md b/docs/start/framework/solid/guide/server-routes.md index 3e5481bb97..543eed07ea 100644 --- a/docs/start/framework/solid/guide/server-routes.md +++ b/docs/start/framework/solid/guide/server-routes.md @@ -314,7 +314,7 @@ export const Route = createFileRoute('/file/$')({ ## Handling requests with a body -To handle POST requests,you can add a `POST` handler to the route object. The handler will receive the request object as the first argument, and you can access the request body using the `request.json()` method. +To handle POST requests, you can add a `POST` handler to the route object. The handler will receive the request object as the first argument, and you can access the request body using the `request.json()` method. ```ts // routes/hello.ts From ea78f996468e9c602b9e48a0bbf887721ae58fae Mon Sep 17 00:00:00 2001 From: Sarah Gerrard Date: Thu, 23 Apr 2026 16:44:46 -0700 Subject: [PATCH 023/597] update intent workflow (#7243) --- .github/workflows/check-skills.yml | 313 ++++++++++++++++++----------- 1 file changed, 196 insertions(+), 117 deletions(-) diff --git a/.github/workflows/check-skills.yml b/.github/workflows/check-skills.yml index 9888015bb0..8863b64bbc 100644 --- a/.github/workflows/check-skills.yml +++ b/.github/workflows/check-skills.yml @@ -1,15 +1,14 @@ # check-skills.yml — Drop this into your library repo's .github/workflows/ # -# Checks for stale intent skills after a release and opens a review PR -# if any skills need attention. The PR body includes a prompt you can -# paste into Claude Code, Cursor, or any coding agent to update them. +# Checks intent skills after a release and opens or updates one review PR when +# existing skills, artifact coverage, or workspace package coverage need review. # # Triggers: new release published, or manual workflow_dispatch. # -# Template variables (replaced by `intent setup`): -# @tanstack/react-router — e.g. @tanstack/query +# intent-workflow-version: 2 # -# Adapted for TanStack Router monorepo: loops over all packages with skills. +# Template variables (replaced by `intent setup`): +# @tanstack/router — e.g. @tanstack/query or my-workspace workspace name: Check Skills @@ -24,7 +23,7 @@ permissions: jobs: check: - name: Check for stale skills + name: Check intent skill coverage runs-on: ubuntu-latest steps: - name: Checkout @@ -37,136 +36,216 @@ jobs: with: node-version: 20 - - name: Install intent CLI + - name: Install intent run: npm install -g @tanstack/intent - - name: Install dependencies - run: npm install --ignore-scripts - env: - npm_config_legacy_peer_deps: 'true' - - - name: Check staleness + - name: Check skills id: stale run: | - # Monorepo: collect stale reports from all packages with skills - ALL_OUTPUT="[" - FIRST=true - for dir in packages/*/; do - if [ -d "$dir/skills" ]; then - PKG_OUTPUT=$(cd "$dir" && npx @tanstack/intent stale --json 2>/dev/null) || true - if [ -n "$PKG_OUTPUT" ] && [ "$PKG_OUTPUT" != "[]" ] && [ "$PKG_OUTPUT" != "No intent-enabled packages found." ]; then - if [ "$FIRST" = true ]; then - FIRST=false - else - ALL_OUTPUT="${ALL_OUTPUT}," - fi - # Strip outer brackets and append entries - ENTRIES=$(echo "$PKG_OUTPUT" | node -e " - const input = require('fs').readFileSync('/dev/stdin','utf8').trim(); - try { const arr = JSON.parse(input); process.stdout.write(JSON.stringify(arr).slice(1, -1)); } catch {} - ") - ALL_OUTPUT="${ALL_OUTPUT}${ENTRIES}" - fi - fi - done - ALL_OUTPUT="${ALL_OUTPUT}]" + set +e + intent stale --json > stale.json + STATUS=$? + set -e - echo "$ALL_OUTPUT" + cat stale.json - # Check if any skills need review - NEEDS_REVIEW=$(echo "$ALL_OUTPUT" | node -e " - const input = require('fs').readFileSync('/dev/stdin','utf8'); - try { - const reports = JSON.parse(input); - const stale = reports.flatMap(r => - r.skills.filter(s => s.needsReview).map(s => ({ library: r.library, skill: s.name, reasons: s.reasons })) - ); - if (stale.length > 0) { - console.log(JSON.stringify(stale)); - } - } catch {} - ") - - if [ -z "$NEEDS_REVIEW" ]; then - echo "has_stale=false" >> "$GITHUB_OUTPUT" + if [ "$STATUS" -ne 0 ]; then + echo "has_review=true" >> "$GITHUB_OUTPUT" + echo "check_failed=true" >> "$GITHUB_OUTPUT" + cat > review-items.json <<'JSON' + [ + { + "type": "stale-check-failed", + "library": "@tanstack/router", + "subject": "intent stale --json", + "reasons": ["The stale check command failed. Review the workflow logs before updating skills."] + } + ] + JSON else - echo "has_stale=true" >> "$GITHUB_OUTPUT" - # Escape for multiline GH output - EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) - echo "stale_json<<$EOF" >> "$GITHUB_OUTPUT" - echo "$NEEDS_REVIEW" >> "$GITHUB_OUTPUT" - echo "$EOF" >> "$GITHUB_OUTPUT" + node <<'NODE' + const fs = require('fs') + const reports = JSON.parse(fs.readFileSync('stale.json', 'utf8')) + const items = [] + + for (const report of reports) { + for (const skill of report.skills ?? []) { + if (!skill?.needsReview) continue + items.push({ + type: 'stale-skill', + library: report.library, + subject: skill.name, + reasons: skill.reasons ?? [], + }) + } + + for (const signal of report.signals ?? []) { + if (signal?.needsReview === false) continue + items.push({ + type: signal?.type ?? 'review-signal', + library: signal?.library ?? report.library, + subject: + signal?.packageName ?? + signal?.packageRoot ?? + signal?.skill ?? + signal?.artifactPath ?? + signal?.subject ?? + report.library, + reasons: signal?.reasons ?? [], + artifactPath: signal?.artifactPath, + packageName: signal?.packageName, + packageRoot: signal?.packageRoot, + skill: signal?.skill, + }) + } + } + + fs.writeFileSync('review-items.json', JSON.stringify(items, null, 2) + '\n') + fs.appendFileSync( + process.env.GITHUB_OUTPUT, + `has_review=${items.length > 0 ? 'true' : 'false'}\n`, + ) + NODE fi - - name: Build summary - if: steps.stale.outputs.has_stale == 'true' - id: summary + { + echo "review_items<> "$GITHUB_OUTPUT" + + - name: Write clean summary + if: steps.stale.outputs.has_review == 'false' run: | - node -e " - const stale = JSON.parse(process.env.STALE_JSON); - const lines = stale.map(s => - '- **' + s.skill + '** (' + s.library + '): ' + s.reasons.join(', ') - ); - const summary = lines.join('\n'); + { + echo "### Intent skill review" + echo "" + echo "No stale skills or coverage gaps found." + } >> "$GITHUB_STEP_SUMMARY" - const prompt = [ - 'Review and update the following stale intent skills for TanStack Router:', - '', - ...stale.map(s => '- ' + s.skill + ': ' + s.reasons.join(', ')), - '', - 'For each stale skill:', - '1. Read the current SKILL.md file', - '2. Check what changed in the library since the skill was last updated', - '3. Update the skill content to reflect current APIs and behavior', - '4. Run \`npx @tanstack/intent validate\` to verify the updated skill', - ].join('\n'); + - name: Build review PR body + if: steps.stale.outputs.has_review == 'true' + run: | + node <<'NODE' + const fs = require('fs') + const items = JSON.parse(fs.readFileSync('review-items.json', 'utf8')) + const grouped = new Map() - // Write outputs - const fs = require('fs'); - const env = fs.readFileSync(process.env.GITHUB_OUTPUT, 'utf8'); - const eof = require('crypto').randomBytes(15).toString('base64'); - fs.appendFileSync(process.env.GITHUB_OUTPUT, - 'summary<<' + eof + '\n' + summary + '\n' + eof + '\n' + - 'prompt<<' + eof + '\n' + prompt + '\n' + eof + '\n' - ); - " - env: - STALE_JSON: ${{ steps.stale.outputs.stale_json }} + for (const item of items) { + grouped.set(item.type, (grouped.get(item.type) ?? 0) + 1) + } - - name: Open review PR - if: steps.stale.outputs.has_stale == 'true' + const signalRows = [...grouped.entries()] + .sort(([a], [b]) => a.localeCompare(b)) + .map(([type, count]) => `| \`${type}\` | ${count} |`) + + const itemRows = items.map((item) => { + const subject = item.subject ? `\`${item.subject}\`` : '-' + const reasons = item.reasons?.length ? item.reasons.join('; ') : '-' + return `| \`${item.type}\` | ${subject} | \`${item.library}\` | ${reasons} |` + }) + + const prompt = [ + 'You are helping maintain Intent skills for this repository.', + '', + 'Goal:', + 'Resolve the Intent skill review signals below while preserving the existing scope, taxonomy, and maintainer-reviewed artifacts.', + '', + 'Review signals:', + JSON.stringify(items, null, 2), + '', + 'Required workflow:', + '1. Read the existing `_artifacts/*domain_map.yaml`, `_artifacts/*skill_tree.yaml`, and generated `skills/**/SKILL.md` files.', + '2. Read each flagged package package.json, public exports, README/docs if present, and source entry points.', + '3. Compare flagged packages against the existing domains, skills, tasks, packages, covers, sources, tensions, and cross-references in the artifacts.', + '4. For each signal, decide whether it means existing skill coverage, a missing generated skill, a new skill candidate, out-of-scope coverage, or deferred work.', + '', + 'Maintainer questions:', + 'Before editing skills or artifacts, ask the maintainer:', + '1. For each flagged package, is this package user-facing enough to need agent guidance?', + '2. If yes, should it extend an existing skill or become a new skill?', + '3. If it extends an existing skill, which current skill should own it?', + '4. If it is out of scope, what short reason should be recorded in artifact coverage ignores?', + '5. Are any of these packages experimental or unstable enough to exclude for now?', + '', + 'Decision rules:', + '- Do not auto-generate skills.', + '- Do not create broad new skill areas without maintainer confirmation.', + '- Prefer adding package coverage to an existing skill when the package is an implementation variant of an existing domain.', + '- Create a new skill only when the package introduces a distinct developer task or failure mode.', + '- Preserve current naming, path, and package layout conventions.', + '- Keep generated skills under the package-local `skills/` directory.', + '- Keep repo-root `_artifacts` as the reviewed plan.', + '', + 'If maintainer confirms updates:', + '1. Update the relevant `_artifacts/*domain_map.yaml` or `_artifacts/*skill_tree.yaml`.', + '2. Update or create `SKILL.md` files only for confirmed coverage changes.', + '3. Keep `sources` aligned between artifact skill entries and SKILL frontmatter.', + '4. Bump `library_version` only for skills whose covered source package version changed.', + '5. Run `npx @tanstack/intent@latest validate` on touched skill directories.', + '6. Summarize every package as one of: existing-skill coverage, new skill, ignored, or deferred.', + ].join('\n') + + const body = [ + '## Intent Skill Review Needed', + '', + 'Intent found skills, artifact coverage, or workspace package coverage that need maintainer review.', + '', + '### Summary', + '', + '| Signal | Count |', + '| --- | ---: |', + ...signalRows, + '', + '### Review Items', + '', + '| Signal | Subject | Library | Reason |', + '| --- | --- | --- | --- |', + ...itemRows, + '', + '### Agent Prompt', + '', + 'Paste this into your coding agent:', + '', + '```text', + prompt, + '```', + '', + 'This PR is a review reminder only. It does not update skills automatically.', + ].join('\n') + + fs.writeFileSync('pr-body.md', body + '\n') + fs.writeFileSync(process.env.GITHUB_STEP_SUMMARY, body + '\n') + NODE + + - name: Open or update review PR + if: steps.stale.outputs.has_review == 'true' env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | VERSION="${{ github.event.release.tag_name || 'manual' }}" BRANCH="skills/review-${VERSION}" + BASE_BRANCH="${{ github.event.repository.default_branch }}" git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git checkout -b "$BRANCH" - git commit --allow-empty -m "chore: review stale skills for ${VERSION}" - git push origin "$BRANCH" - gh pr create \ - --title "Review stale skills (${VERSION})" \ - --body "$(cat <<'PREOF' - ## Stale Skills Detected + git fetch origin "$BRANCH" || true + if git show-ref --verify --quiet "refs/remotes/origin/$BRANCH"; then + git checkout -B "$BRANCH" "origin/$BRANCH" + else + git checkout -b "$BRANCH" + git commit --allow-empty -m "chore: review intent skills for ${VERSION}" + git push origin "$BRANCH" + fi - The following skills may need updates after the latest release: - - ${{ steps.summary.outputs.summary }} - - --- - - ### Update Prompt - - Paste this into your coding agent (Claude Code, Cursor, etc.): - - ~~~ - ${{ steps.summary.outputs.prompt }} - ~~~ - - PREOF - )" \ - --head "$BRANCH" \ - --base main + PR_URL="$(gh pr list --head "$BRANCH" --json url --jq '.[0].url')" + if [ -n "$PR_URL" ]; then + gh pr edit "$PR_URL" --body-file pr-body.md + else + gh pr create \ + --title "Review intent skills (${VERSION})" \ + --body-file pr-body.md \ + --head "$BRANCH" \ + --base "$BASE_BRANCH" + fi From 91a708989d00537a21911e74ff60bbfec8266295 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Fri, 24 Apr 2026 03:26:03 +0200 Subject: [PATCH 024/597] rsbuild plugin (#7228) Co-authored-by: neverland Co-authored-by: Keven Arroyo --- .changeset/add-rsbuild-start-support.md | 10 + .../react/guide/import-protection.md | 56 +- e2e/.gitignore | 2 + .../basic-rsc/.devcontainer/devcontainer.json | 3 - e2e/react-start/basic/.gitignore | 1 + e2e/react-start/basic/package.json | 25 +- e2e/react-start/basic/postcss.config.mjs | 5 + e2e/react-start/basic/rsbuild.config.ts | 19 + e2e/react-start/basic/server.js | 17 +- e2e/react-start/basic/src/routes/__root.tsx | 3 +- e2e/react-start/basic/start-mode-config.ts | 32 + .../basic/tests/navigation.spec.ts | 12 +- e2e/react-start/basic/vite.config.ts | 36 +- .../custom-server-rsbuild/.gitignore | 20 + .../custom-server-rsbuild/express-server.ts | 80 + .../custom-server-rsbuild/package.json | 38 + .../playwright.config.ts | 31 + .../custom-server-rsbuild/postcss.config.mjs | 5 + .../custom-server-rsbuild/rsbuild.config.ts | 10 + .../custom-server-rsbuild/src/env.d.ts | 3 + .../src/routeTree.gen.ts | 68 + .../custom-server-rsbuild/src/router.tsx | 6 + .../src/routes/__root.tsx | 32 + .../src/routes/index.tsx | 70 + .../custom-server-rsbuild/src/server.ts | 7 + .../custom-server-rsbuild/src/styles/app.css | 30 + .../tests/server-fns.spec.ts | 29 + .../custom-server-rsbuild/tsconfig.json | 18 + e2e/react-start/hmr/.gitignore | 2 + e2e/react-start/hmr/package.json | 27 +- e2e/react-start/hmr/playwright.config.ts | 13 +- e2e/react-start/hmr/postcss.config.mjs | 5 + e2e/react-start/hmr/rsbuild.config.ts | 17 + .../hmr/src/hmr/server-fn-hmr-entry.ts | 21 + .../hmr/src/hmr/server-fn-hmr-factory.ts | 4 + e2e/react-start/hmr/src/routeTree.gen.ts | 21 + e2e/react-start/hmr/src/routes/__root.tsx | 9 +- .../hmr/src/routes/server-fn-hmr.tsx | 78 + e2e/react-start/hmr/tests/app.spec.ts | 577 +++- .../hmr/tests/setup/global.setup.ts | 11 +- .../hmr/tests/setup/global.teardown.ts | 7 +- e2e/react-start/hmr/vite.config.ts | 5 + .../import-protection/package.json | 29 +- .../import-protection/playwright.config.ts | 16 +- .../import-protection/rsbuild.config.ts | 19 + e2e/react-start/import-protection/server.js | 57 + .../import-protection/start-mode-config.ts | 13 + .../tests/error-mode.setup.ts | 18 +- .../tests/import-protection.spec.ts | 71 +- .../tests/violations.setup.ts | 24 +- .../tests/violations.utils.ts | 31 +- .../import-protection/vite.config.ts | 24 +- e2e/react-start/rsc/package.json | 14 +- e2e/react-start/rsc/playwright.config.ts | 15 +- e2e/react-start/rsc/rsbuild.config.ts | 21 + e2e/react-start/rsc/server.js | 57 + .../utils/conditionalCssServerComponent.tsx | 1 - .../src/utils/cssModulesServerComponent.tsx | 1 - .../rsc/tests/rsc-client-preload.spec.ts | 3 +- .../rsc/tests/rsc-css-preload-complex.spec.ts | 6 +- .../server-function/late-raw-stream.tsx | 2 +- e2e/react-start/server-functions/package.json | 31 +- .../server-functions/playwright.config.ts | 13 +- .../server-functions/postcss.config.mjs | 5 + .../server-functions/rsbuild.config.ts | 16 + e2e/react-start/server-functions/server.js | 57 + .../server-functions/src/routes/__root.tsx | 3 +- .../server-functions/start-mode-config.ts | 21 + .../tests/server-functions.spec.ts | 3 +- .../server-functions/vite.config.ts | 26 +- e2e/solid-start/basic/package.json | 8 + e2e/solid-start/basic/postcss.config.mjs | 5 + e2e/solid-start/basic/rsbuild.config.ts | 21 + e2e/solid-start/basic/server.js | 17 +- e2e/solid-start/basic/src/routes/__root.tsx | 3 +- .../basic-vue-query/src/utils/posts.tsx | 10 +- e2e/vue-start/basic/package.json | 9 + e2e/vue-start/basic/postcss.config.mjs | 5 + e2e/vue-start/basic/rsbuild.config.ts | 34 + e2e/vue-start/basic/server.js | 17 +- e2e/vue-start/basic/src/routes/__root.tsx | 3 +- .../package.json | 1 + .../webpack.config.js | 6 +- .../src/TanStackRouterDevtools.tsx | 2 + .../src/TanStackRouterDevtoolsPanel.tsx | 2 + packages/react-router-devtools/src/index.ts | 2 + packages/react-router/src/Asset.tsx | 1 + packages/react-router/src/ClientOnly.tsx | 4 +- packages/react-router/src/useLocation.tsx | 2 + packages/react-start-rsc/package.json | 34 +- .../src/ServerComponentTypes.ts | 10 - .../src/createCompositeComponent.ts | 6 +- packages/react-start-rsc/src/global.d.ts | 24 + .../src/react-server-dom-rspack.d.ts | 57 + .../src/renderServerComponent.ts | 2 - .../src/rsbuild/browser-decode.ts | 11 + .../react-start-rsc/src/rsbuild/ssr-decode.ts | 11 + packages/react-start-rsc/vite.config.ts | 5 + packages/react-start/package.json | 29 +- packages/react-start/src/plugin/rsbuild.ts | 66 + .../react-start/src/rsbuild/browser-decode.ts | 1 + .../react-start/src/rsbuild/ssr-decode.ts | 1 + packages/react-start/vite.config.ts | 3 + packages/router-generator/src/generator.ts | 2 +- packages/router-generator/src/types.ts | 2 +- packages/router-plugin/package.json | 2 +- .../src/core/code-splitter/compilers.ts | 6 +- .../src/core/code-splitter/plugins.ts | 5 +- .../plugins/framework-plugins.ts | 15 +- .../react-refresh-ignored-route-exports.ts | 10 +- ...react-stable-hmr-split-route-components.ts | 16 +- packages/router-plugin/src/core/config.ts | 13 +- .../src/core/hmr-hot-expression.ts | 31 - .../handle-route-update.ts} | 126 +- packages/router-plugin/src/core/hmr/index.ts | 5 + .../src/core/hmr/select-adapter.ts | 32 + .../src/core/hmr/vite-adapter.ts | 47 + .../src/core/hmr/webpack-adapter.ts | 110 + .../src/core/router-code-splitter-plugin.ts | 12 +- .../src/core/router-composed-plugin.ts | 11 +- .../src/core/router-hmr-plugin.ts | 21 +- packages/router-plugin/src/rspack.ts | 46 +- packages/router-plugin/src/webpack.ts | 31 +- packages/router-plugin/tests/add-hmr.test.ts | 53 +- .../snapshots/react/arrow-function@true.tsx | 57 +- .../react/arrow-function@webpack-hot.tsx | 228 +- .../createRootRoute-inline-component@true.tsx | 57 +- .../explicit-undefined-component@true.tsx | 57 +- .../react/function-declaration@true.tsx | 57 +- .../snapshots/react/multi-component@true.tsx | 57 +- .../react/string-literal-keys@true.tsx | 57 +- .../snapshots/solid/arrow-function@true.tsx | 57 +- packages/router-utils/src/ast.ts | 10 +- .../tests/stripTypeExports.test.ts | 16 + packages/solid-start/package.json | 21 +- packages/solid-start/src/plugin/rsbuild.ts | 79 + packages/solid-start/vite.config.ts | 1 + packages/start-plugin-core/package.json | 13 + .../src/import-protection-plugin/INTERNALS.md | 700 ----- .../postCompileUsage.ts | 100 - .../rewriteDeniedImports.ts | 379 --- .../src/import-protection/INTERNALS.md | 266 ++ .../src/import-protection/adapterUtils.ts | 94 + .../src/import-protection/analysis.ts | 853 +++++ .../ast.ts | 0 .../constants.ts | 7 + .../defaults.ts | 0 .../extensionlessAbsoluteIdResolver.ts | 0 .../matchers.ts | 0 .../src/import-protection/rewrite.ts | 229 ++ .../sourceLocation.ts | 134 +- .../trace.ts | 1 - .../utils.ts | 55 +- .../virtualModules.ts | 207 +- packages/start-plugin-core/src/index.ts | 5 + packages/start-plugin-core/src/post-build.ts | 64 + packages/start-plugin-core/src/prerender.ts | 292 ++ .../rsbuild/INTERNALS-import-protection.md | 169 + .../src/rsbuild/dev-server.ts | 129 + .../src/rsbuild/import-protection.ts | 1600 ++++++++++ .../src/rsbuild/normalized-client-build.ts | 346 +++ .../start-plugin-core/src/rsbuild/planning.ts | 234 ++ .../start-plugin-core/src/rsbuild/plugin.ts | 754 +++++ .../src/rsbuild/post-build.ts | 96 + .../start-plugin-core/src/rsbuild/schema.ts | 31 + .../src/rsbuild/start-compiler-host.ts | 250 ++ .../src/rsbuild/start-router-plugin.ts | 86 + .../start-plugin-core/src/rsbuild/swc-rsc.ts | 166 + .../start-plugin-core/src/rsbuild/types.ts | 20 + .../src/rsbuild/virtual-modules.ts | 565 ++++ .../src/start-compiler/compiler.ts | 172 +- .../start-compiler/handleCreateServerFn.ts | 18 + .../src/start-compiler/load-module.ts | 31 - .../src/start-compiler/types.ts | 1 + packages/start-plugin-core/src/utils.ts | 4 + .../import-protection-plugin/INTERNALS.md | 187 ++ .../import-protection-plugin/plugin.ts | 233 +- .../import-protection-plugin/types.ts | 10 +- .../virtualModules.ts | 122 + packages/start-plugin-core/src/vite/plugin.ts | 2 +- .../src/vite/post-server-build.ts | 71 +- .../start-plugin-core/src/vite/prerender.ts | 279 +- .../vite/start-compiler-plugin/hot-update.ts | 24 + .../start-compiler-plugin/module-specifier.ts | 20 +- .../src/vite/start-compiler-plugin/plugin.ts | 211 +- .../start-plugin-core/tests/compiler.test.ts | 241 ++ ...ports.test.ts => analysis.exports.test.ts} | 73 +- ...leUsage.test.ts => analysis.usage.test.ts} | 100 +- .../tests/importProtection/defaults.test.ts | 2 +- .../tests/importProtection/matchers.test.ts | 2 +- .../{transform.test.ts => rewrite.test.ts} | 19 +- .../importProtection/sourceLocation.test.ts | 209 +- .../tests/importProtection/trace.test.ts | 14 +- .../tests/importProtection/utils.test.ts | 107 +- .../importProtection/virtualModules.test.ts | 5 +- .../tests/post-server-build.test.ts | 37 +- .../tests/prerender-ssrf.test.ts | 40 +- .../tests/rsbuild-output-directory.test.ts | 59 + .../tests/rsbuild-plugin.test.ts | 41 + .../tests/rsbuild-post-build.test.ts | 59 + .../tests/vite-start-compiler-plugin.test.ts | 139 + packages/start-plugin-core/vite.config.ts | 2 +- packages/vue-start/package.json | 29 +- packages/vue-start/src/plugin/rsbuild.ts | 21 + packages/vue-start/vite.config.ts | 1 + pnpm-lock.yaml | 2744 +++++++++++------ 206 files changed, 13365 insertions(+), 3633 deletions(-) create mode 100644 .changeset/add-rsbuild-start-support.md create mode 100644 e2e/.gitignore delete mode 100644 e2e/react-start/basic-rsc/.devcontainer/devcontainer.json create mode 100644 e2e/react-start/basic/postcss.config.mjs create mode 100644 e2e/react-start/basic/rsbuild.config.ts create mode 100644 e2e/react-start/basic/start-mode-config.ts create mode 100644 e2e/react-start/custom-server-rsbuild/.gitignore create mode 100644 e2e/react-start/custom-server-rsbuild/express-server.ts create mode 100644 e2e/react-start/custom-server-rsbuild/package.json create mode 100644 e2e/react-start/custom-server-rsbuild/playwright.config.ts create mode 100644 e2e/react-start/custom-server-rsbuild/postcss.config.mjs create mode 100644 e2e/react-start/custom-server-rsbuild/rsbuild.config.ts create mode 100644 e2e/react-start/custom-server-rsbuild/src/env.d.ts create mode 100644 e2e/react-start/custom-server-rsbuild/src/routeTree.gen.ts create mode 100644 e2e/react-start/custom-server-rsbuild/src/router.tsx create mode 100644 e2e/react-start/custom-server-rsbuild/src/routes/__root.tsx create mode 100644 e2e/react-start/custom-server-rsbuild/src/routes/index.tsx create mode 100644 e2e/react-start/custom-server-rsbuild/src/server.ts create mode 100644 e2e/react-start/custom-server-rsbuild/src/styles/app.css create mode 100644 e2e/react-start/custom-server-rsbuild/tests/server-fns.spec.ts create mode 100644 e2e/react-start/custom-server-rsbuild/tsconfig.json create mode 100644 e2e/react-start/hmr/postcss.config.mjs create mode 100644 e2e/react-start/hmr/rsbuild.config.ts create mode 100644 e2e/react-start/hmr/src/hmr/server-fn-hmr-entry.ts create mode 100644 e2e/react-start/hmr/src/hmr/server-fn-hmr-factory.ts create mode 100644 e2e/react-start/hmr/src/routes/server-fn-hmr.tsx create mode 100644 e2e/react-start/import-protection/rsbuild.config.ts create mode 100644 e2e/react-start/import-protection/server.js create mode 100644 e2e/react-start/import-protection/start-mode-config.ts create mode 100644 e2e/react-start/rsc/rsbuild.config.ts create mode 100644 e2e/react-start/rsc/server.js create mode 100644 e2e/react-start/server-functions/postcss.config.mjs create mode 100644 e2e/react-start/server-functions/rsbuild.config.ts create mode 100644 e2e/react-start/server-functions/server.js create mode 100644 e2e/react-start/server-functions/start-mode-config.ts create mode 100644 e2e/solid-start/basic/postcss.config.mjs create mode 100644 e2e/solid-start/basic/rsbuild.config.ts create mode 100644 e2e/vue-start/basic/postcss.config.mjs create mode 100644 e2e/vue-start/basic/rsbuild.config.ts create mode 100644 packages/react-start-rsc/src/react-server-dom-rspack.d.ts create mode 100644 packages/react-start-rsc/src/rsbuild/browser-decode.ts create mode 100644 packages/react-start-rsc/src/rsbuild/ssr-decode.ts create mode 100644 packages/react-start/src/plugin/rsbuild.ts create mode 100644 packages/react-start/src/rsbuild/browser-decode.ts create mode 100644 packages/react-start/src/rsbuild/ssr-decode.ts delete mode 100644 packages/router-plugin/src/core/hmr-hot-expression.ts rename packages/router-plugin/src/core/{route-hmr-statement.ts => hmr/handle-route-update.ts} (65%) create mode 100644 packages/router-plugin/src/core/hmr/index.ts create mode 100644 packages/router-plugin/src/core/hmr/select-adapter.ts create mode 100644 packages/router-plugin/src/core/hmr/vite-adapter.ts create mode 100644 packages/router-plugin/src/core/hmr/webpack-adapter.ts create mode 100644 packages/solid-start/src/plugin/rsbuild.ts delete mode 100644 packages/start-plugin-core/src/import-protection-plugin/INTERNALS.md delete mode 100644 packages/start-plugin-core/src/import-protection-plugin/postCompileUsage.ts delete mode 100644 packages/start-plugin-core/src/import-protection-plugin/rewriteDeniedImports.ts create mode 100644 packages/start-plugin-core/src/import-protection/INTERNALS.md create mode 100644 packages/start-plugin-core/src/import-protection/adapterUtils.ts create mode 100644 packages/start-plugin-core/src/import-protection/analysis.ts rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/ast.ts (100%) rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/constants.ts (61%) rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/defaults.ts (100%) rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/extensionlessAbsoluteIdResolver.ts (100%) rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/matchers.ts (100%) create mode 100644 packages/start-plugin-core/src/import-protection/rewrite.ts rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/sourceLocation.ts (77%) rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/trace.ts (99%) rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/utils.ts (86%) rename packages/start-plugin-core/src/{import-protection-plugin => import-protection}/virtualModules.ts (54%) create mode 100644 packages/start-plugin-core/src/post-build.ts create mode 100644 packages/start-plugin-core/src/prerender.ts create mode 100644 packages/start-plugin-core/src/rsbuild/INTERNALS-import-protection.md create mode 100644 packages/start-plugin-core/src/rsbuild/dev-server.ts create mode 100644 packages/start-plugin-core/src/rsbuild/import-protection.ts create mode 100644 packages/start-plugin-core/src/rsbuild/normalized-client-build.ts create mode 100644 packages/start-plugin-core/src/rsbuild/planning.ts create mode 100644 packages/start-plugin-core/src/rsbuild/plugin.ts create mode 100644 packages/start-plugin-core/src/rsbuild/post-build.ts create mode 100644 packages/start-plugin-core/src/rsbuild/schema.ts create mode 100644 packages/start-plugin-core/src/rsbuild/start-compiler-host.ts create mode 100644 packages/start-plugin-core/src/rsbuild/start-router-plugin.ts create mode 100644 packages/start-plugin-core/src/rsbuild/swc-rsc.ts create mode 100644 packages/start-plugin-core/src/rsbuild/types.ts create mode 100644 packages/start-plugin-core/src/rsbuild/virtual-modules.ts delete mode 100644 packages/start-plugin-core/src/start-compiler/load-module.ts create mode 100644 packages/start-plugin-core/src/vite/import-protection-plugin/INTERNALS.md rename packages/start-plugin-core/src/{ => vite}/import-protection-plugin/plugin.ts (92%) rename packages/start-plugin-core/src/{ => vite}/import-protection-plugin/types.ts (91%) create mode 100644 packages/start-plugin-core/src/vite/import-protection-plugin/virtualModules.ts create mode 100644 packages/start-plugin-core/src/vite/start-compiler-plugin/hot-update.ts rename packages/start-plugin-core/tests/importProtection/{rewriteDeniedImports.test.ts => analysis.exports.test.ts} (74%) rename packages/start-plugin-core/tests/importProtection/{postCompileUsage.test.ts => analysis.usage.test.ts} (61%) rename packages/start-plugin-core/tests/importProtection/{transform.test.ts => rewrite.test.ts} (89%) create mode 100644 packages/start-plugin-core/tests/rsbuild-output-directory.test.ts create mode 100644 packages/start-plugin-core/tests/rsbuild-plugin.test.ts create mode 100644 packages/start-plugin-core/tests/rsbuild-post-build.test.ts create mode 100644 packages/start-plugin-core/tests/vite-start-compiler-plugin.test.ts create mode 100644 packages/vue-start/src/plugin/rsbuild.ts diff --git a/.changeset/add-rsbuild-start-support.md b/.changeset/add-rsbuild-start-support.md new file mode 100644 index 0000000000..36b1774d36 --- /dev/null +++ b/.changeset/add-rsbuild-start-support.md @@ -0,0 +1,10 @@ +--- +'@tanstack/react-start': patch +'@tanstack/solid-start': patch +'@tanstack/start-plugin-core': minor +'@tanstack/react-start-rsc': patch +'@tanstack/router-plugin': patch +'@tanstack/router-utils': patch +--- + +rsbuild diff --git a/docs/start/framework/react/guide/import-protection.md b/docs/start/framework/react/guide/import-protection.md index 685e85bb4d..53b5ec191d 100644 --- a/docs/start/framework/react/guide/import-protection.md +++ b/docs/start/framework/react/guide/import-protection.md @@ -5,7 +5,7 @@ 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 as a Vite plugin and is enabled by default in TanStack Start. +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 @@ -364,11 +364,56 @@ If you see an import-protection violation for a file you expected to be "compile ## False Positives: Dev vs Build -In **build mode**, the plugin defers violation checks until after tree-shaking. If an import is eliminated from the final bundle (e.g., a barrel re-exports a `.server` module but no client code actually uses that export), no violation is reported. This means build-time violations are definitive — if the build flags it, the import truly survived. +In **build mode**, import protection defers violation checks until after tree-shaking. If an import is eliminated from the final bundle, no violation is reported. Build-time violations are definitive: if the build flags it, the import truly survived. -In **dev mode**, there is no tree-shaking. The plugin uses graph reachability to filter violations, but it cannot determine whether individual bindings are unused. This means barrel re-exports of `.server` or marker-protected modules may produce warnings even when the server-only exports would be tree-shaken away in production. These dev warnings are informational — run a build to confirm whether the violation is real. +In **dev mode**, tree-shaking may be incomplete or unavailable, so import protection can report false positives for imports that would later be compiled away. -The same applies to marker-protected files (`import '@tanstack/react-start/server-only'`). If a marked file is re-exported through a barrel but never consumed by client code, the build correctly suppresses the violation while dev may still warn. +If a warning appears in dev but not build, that usually means the unsafe edge existed before tree-shaking but did not survive the final bundle. Even so, prefer changing the import structure so that edge does not exist in the first place. + +## Mixed Barrels and Split Entry Points + +Barrels are not inherently a false positive. The risky pattern is a barrel that mixes safe exports with environment-restricted ones from the same entry point. + +Depending on what survives after compilation and tree-shaking, that can show up as either a real violation or a dev-only false positive. The safer structure is to split safe and restricted exports into separate entry points. + +For example, avoid mixed barrels like this: + +```ts +// src/lib/index.ts +export { fetchUsers } from './fetchUsers' +export { getDb } from './db.server' +``` + +```ts +// src/routes/users.tsx +import { fetchUsers } from '../lib' +``` + +Even if the client only uses `fetchUsers`, that import path still goes through a module that re-exports `getDb`. + +Prefer splitting safe and server-only exports into separate entry points: + +```ts +// src/lib/index.ts +export { fetchUsers } from './fetchUsers' +``` + +```ts +// src/lib/server.ts +export { getDb } from './db.server' +``` + +```ts +// src/routes/users.tsx +import { fetchUsers } from '../lib' +``` + +```ts +// src/server/worker.ts +import { getDb } from '../lib/server' +``` + +The same applies to marker-protected files (`import '@tanstack/react-start/server-only'`). If a marked file is re-exported through a mixed barrel but never consumed by client code, production may suppress the warning after tree-shaking, but the better fix is still to avoid exposing that server-only edge to client-reachable code at all. ## The `onViolation` Callback @@ -384,8 +429,7 @@ importProtection: { // info.importer -- absolute path of the importing file // info.resolved -- absolute path of the resolved target (if available) // info.trace -- array of { file, line?, column?, specifier? } objects - // info.snippet -- { lines, location } with the source code snippet (if available) - // info.message -- the formatted diagnostic message + // info.snippet -- { lines, highlightLine, location } with the source code snippet (if available) // Return false (or Promise) to allow this specific import (override the denial) if (info.specifier === 'some-special-case') { diff --git a/e2e/.gitignore b/e2e/.gitignore new file mode 100644 index 0000000000..3722f5bcd1 --- /dev/null +++ b/e2e/.gitignore @@ -0,0 +1,2 @@ +**/dist-vite-*/ +**/dist-rsbuild-*/ \ No newline at end of file diff --git a/e2e/react-start/basic-rsc/.devcontainer/devcontainer.json b/e2e/react-start/basic-rsc/.devcontainer/devcontainer.json deleted file mode 100644 index e5dafce188..0000000000 --- a/e2e/react-start/basic-rsc/.devcontainer/devcontainer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "image": "mcr.microsoft.com/devcontainers/typescript-node:24" -} diff --git a/e2e/react-start/basic/.gitignore b/e2e/react-start/basic/.gitignore index b9c2c7e5f6..a5f07919aa 100644 --- a/e2e/react-start/basic/.gitignore +++ b/e2e/react-start/basic/.gitignore @@ -19,3 +19,4 @@ yarn.lock /blob-report/ /playwright/.cache/ /dist-vite-*/ +/dist-rsbuild-*/ \ No newline at end of file diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json index 6646dc03a3..3a1a02790a 100644 --- a/e2e/react-start/basic/package.json +++ b/e2e/react-start/basic/package.json @@ -4,9 +4,13 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vite dev --port 3000", - "dev:e2e": "vite dev", - "build": "vite build && tsc --noEmit", + "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:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", @@ -27,6 +31,9 @@ }, "devDependencies": { "@playwright/test": "^1.50.1", + "@rsbuild/core": "^2.0.0", + "@rsbuild/plugin-react": "^2.0.0", + "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/js-cookie": "^3.0.6", @@ -59,6 +66,18 @@ { "toolchain": "vite", "mode": "preview" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "spa" + }, + { + "toolchain": "rsbuild", + "mode": "prerender" } ] } diff --git a/e2e/react-start/basic/postcss.config.mjs b/e2e/react-start/basic/postcss.config.mjs new file mode 100644 index 0000000000..a7f73a2d1d --- /dev/null +++ b/e2e/react-start/basic/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + '@tailwindcss/postcss': {}, + }, +} diff --git a/e2e/react-start/basic/rsbuild.config.ts b/e2e/react-start/basic/rsbuild.config.ts new file mode 100644 index 0000000000..d6a9c035eb --- /dev/null +++ b/e2e/react-start/basic/rsbuild.config.ts @@ -0,0 +1,19 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' +import { getStartModeConfig } from './start-mode-config' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' +const startModeConfig = getStartModeConfig() + +export default defineConfig({ + plugins: [ + pluginReact({ splitChunks: false }), + tanstackStart(startModeConfig), + ], + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/react-start/basic/server.js b/e2e/react-start/basic/server.js index 9db7619ae1..e26ac7e49f 100644 --- a/e2e/react-start/basic/server.js +++ b/e2e/react-start/basic/server.js @@ -1,4 +1,5 @@ import { toNodeHandler } from 'srvx/node' +import fs from 'node:fs' import path from 'node:path' import express from 'express' import { createProxyMiddleware } from 'http-proxy-middleware' @@ -11,9 +12,23 @@ const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' const distDir = process.env.E2E_DIST_DIR || 'dist' const distClientDir = path.resolve(distDir, 'client') -const distServerEntryPath = path.resolve(distDir, 'server', 'server.js') + +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 async function createStartServer() { + const distServerEntryPath = resolveDistServerEntryPath() const server = (await import(distServerEntryPath)).default const nodeHandler = toNodeHandler(server.fetch) diff --git a/e2e/react-start/basic/src/routes/__root.tsx b/e2e/react-start/basic/src/routes/__root.tsx index fe0d374888..81e9c96855 100644 --- a/e2e/react-start/basic/src/routes/__root.tsx +++ b/e2e/react-start/basic/src/routes/__root.tsx @@ -10,7 +10,7 @@ import { import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' import { NotFound } from '~/components/NotFound' -import appCss from '~/styles/app.css?url' +import '~/styles/app.css' import { seo } from '~/utils/seo' export const Route = createRootRoute({ @@ -30,7 +30,6 @@ export const Route = createRootRoute({ }), ], links: [ - { rel: 'stylesheet', href: appCss }, { rel: 'apple-touch-icon', sizes: '180x180', diff --git a/e2e/react-start/basic/start-mode-config.ts b/e2e/react-start/basic/start-mode-config.ts new file mode 100644 index 0000000000..3cb6db2658 --- /dev/null +++ b/e2e/react-start/basic/start-mode-config.ts @@ -0,0 +1,32 @@ +import { isPrerender } from './tests/utils/isPrerender' +import { isSpaMode } from './tests/utils/isSpaMode' + +export function getStartModeConfig() { + return { + spa: isSpaMode + ? { + enabled: true, + prerender: { + outputPath: 'index.html', + }, + } + : undefined, + prerender: isPrerender + ? { + enabled: true, + filter: (page: { path: string }) => + ![ + '/this-route-does-not-exist', + '/redirect', + '/i-do-not-exist', + '/not-found', + '/specialChars/search', + '/specialChars/hash', + '/specialChars/malformed', + '/users', + ].some((p) => page.path.includes(p)), + maxRedirects: 100, + } + : undefined, + } +} diff --git a/e2e/react-start/basic/tests/navigation.spec.ts b/e2e/react-start/basic/tests/navigation.spec.ts index 36ed021c44..445269a801 100644 --- a/e2e/react-start/basic/tests/navigation.spec.ts +++ b/e2e/react-start/basic/tests/navigation.spec.ts @@ -30,15 +30,19 @@ test('Navigating nested layouts', async ({ page }) => { await page.waitForURL('/') await page.getByRole('link', { name: 'Layout', exact: true }).click() + await page.waitForURL('/layout-a') await expect(page.locator('body')).toContainText("I'm a layout") await expect(page.locator('body')).toContainText("I'm a nested layout") - - await page.getByRole('link', { name: 'Layout A' }).click() await expect(page.locator('body')).toContainText("I'm layout A!") await page.getByRole('link', { name: 'Layout B' }).click() + await page.waitForURL('/layout-b') await expect(page.locator('body')).toContainText("I'm layout B!") + + await page.getByRole('link', { name: 'Layout A' }).click() + await page.waitForURL('/layout-a') + await expect(page.locator('body')).toContainText("I'm layout A!") }) test('client side navigating to a route with scripts', async ({ page }) => { @@ -46,7 +50,7 @@ test('client side navigating to a route with scripts', async ({ page }) => { await page.waitForURL('/') await page.getByRole('link', { name: 'Scripts', exact: true }).click() await expect(page.getByTestId('scripts-test-heading')).toBeInViewport() - expect(await page.evaluate('window.SCRIPT_1')).toBe(true) + await page.waitForFunction(() => (window as any).SCRIPT_1 === true) expect(await page.evaluate('window.SCRIPT_2')).toBe(undefined) }) @@ -54,7 +58,7 @@ test('directly going to a route with scripts', async ({ page }) => { await page.goto('/scripts') await page.waitForURL('/scripts') await page.waitForLoadState('networkidle') - expect(await page.evaluate('window.SCRIPT_1')).toBe(true) + await page.waitForFunction(() => (window as any).SCRIPT_1 === true) expect(await page.evaluate('window.SCRIPT_2')).toBe(undefined) }) diff --git a/e2e/react-start/basic/vite.config.ts b/e2e/react-start/basic/vite.config.ts index f88efe304f..2a9478eea6 100644 --- a/e2e/react-start/basic/vite.config.ts +++ b/e2e/react-start/basic/vite.config.ts @@ -2,33 +2,10 @@ import { defineConfig } from 'vite' import { tanstackStart } from '@tanstack/react-start/plugin/vite' import viteReact from '@vitejs/plugin-react' import tailwindcss from '@tailwindcss/vite' -import { isSpaMode } from './tests/utils/isSpaMode' -import { isPrerender } from './tests/utils/isPrerender' - -const spaModeConfiguration = { - enabled: true, - prerender: { - outputPath: 'index.html', - }, -} - -const prerenderConfiguration = { - enabled: true, - filter: (page: { path: string }) => - ![ - '/this-route-does-not-exist', - '/redirect', - '/i-do-not-exist', - '/not-found', - '/specialChars/search', - '/specialChars/hash', - '/specialChars/malformed', - '/users', - ].some((p) => page.path.includes(p)), - maxRedirects: 100, -} +import { getStartModeConfig } from './start-mode-config' const outDir = process.env.E2E_DIST_DIR ?? 'dist' +const startModeConfig = getStartModeConfig() export default defineConfig({ resolve: { tsconfigPaths: true }, @@ -38,12 +15,5 @@ export default defineConfig({ server: { port: 3000, }, - plugins: [ - tailwindcss(), - tanstackStart({ - spa: isSpaMode ? spaModeConfiguration : undefined, - prerender: isPrerender ? prerenderConfiguration : undefined, - }), - viteReact(), - ], + plugins: [tailwindcss(), tanstackStart(startModeConfig), viteReact()], }) diff --git a/e2e/react-start/custom-server-rsbuild/.gitignore b/e2e/react-start/custom-server-rsbuild/.gitignore new file mode 100644 index 0000000000..a79d5cf129 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/.gitignore @@ -0,0 +1,20 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.env +.vercel +.output + +/build/ +/api/ +/server/build +/public/build +# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ diff --git a/e2e/react-start/custom-server-rsbuild/express-server.ts b/e2e/react-start/custom-server-rsbuild/express-server.ts new file mode 100644 index 0000000000..7c2ceca2cb --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/express-server.ts @@ -0,0 +1,80 @@ +import express from 'express' +import { toNodeHandler } from 'srvx/node' +import type { NodeHttp1Handler } from 'srvx' + +const DEVELOPMENT = process.env.NODE_ENV === 'development' +const PORT = Number.parseInt(process.env.PORT || '3000') + +type FetchServerEntry = { + default: { fetch: (req: Request) => Promise } +} + +const app = express() + +if (DEVELOPMENT) { + // Set up rsbuild in middleware mode: + // https://rsbuild.rs/config/server/middleware-mode + const { createRsbuild, loadConfig } = await import('@rsbuild/core') + const { content: userConfig } = await loadConfig({ cwd: process.cwd() }) + + const rsbuild = await createRsbuild({ + rsbuildConfig: { + ...userConfig, + server: { + ...(userConfig.server ?? {}), + middlewareMode: true, + }, + }, + }) + + const devServer = await rsbuild.createDevServer() + + const serverEntry = + await devServer.environments.ssr.loadBundle('index') + const handler = toNodeHandler(serverEntry.default.fetch) as NodeHttp1Handler + + // Intercept server-fn URLs BEFORE rsbuild's built-in middlewares so they + // don't get swallowed by htmlCompletion/assetsMiddleware — long base64 + // function IDs in the path can look like asset routes. + app.use(async (req, res, next) => { + if (!req.url.startsWith('/_serverFn')) return next() + try { + await handler(req, res) + } catch (error) { + next(error) + } + }) + + // Rsbuild asset middlewares (JS/CSS/HMR). + app.use(devServer.middlewares) + + // Catch-all SSR for page navigations. + app.use(async (req, res, next) => { + try { + await handler(req, res) + } catch (error) { + next(error) + } + }) + + const httpServer = app.listen(PORT, async () => { + await devServer.afterListen() + console.log(`Server is running on http://localhost:${PORT}`) + }) + devServer.connectWebSocket({ server: httpServer }) +} else { + const { default: handler } = + (await import('./dist/server/index.js')) as FetchServerEntry + const nodeHandler = toNodeHandler(handler.fetch) as NodeHttp1Handler + app.use(express.static('dist/client')) + app.use(async (req, res, next) => { + try { + await nodeHandler(req, res) + } catch (error) { + next(error) + } + }) + app.listen(PORT, () => { + console.log(`Server is running on http://localhost:${PORT}`) + }) +} diff --git a/e2e/react-start/custom-server-rsbuild/package.json b/e2e/react-start/custom-server-rsbuild/package.json new file mode 100644 index 0000000000..7c107e4202 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/package.json @@ -0,0 +1,38 @@ +{ + "name": "tanstack-react-start-e2e-custom-server-rsbuild", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "cross-env NODE_ENV=development tsx express-server.ts", + "dev:e2e": "cross-env NODE_ENV=development tsx express-server.ts", + "build": "rsbuild build && tsc --noEmit", + "start": "tsx express-server.ts", + "test:e2e:dev": "cross-env MODE=dev playwright test --project=chromium", + "test:e2e:prod": "cross-env MODE=prod playwright test --project=chromium", + "test:e2e": "rm -rf port*.txt && pnpm run test:e2e:dev && pnpm run test:e2e:prod" + }, + "dependencies": { + "@tanstack/react-router": "workspace:^", + "@tanstack/react-start": "workspace:^", + "express": "^5.1.0", + "react": "^19.0.0", + "react-dom": "^19.0.0" + }, + "devDependencies": { + "@playwright/test": "^1.50.1", + "@rsbuild/core": "2.0.0", + "@rsbuild/plugin-react": "2.0.0", + "@tailwindcss/postcss": "^4.2.2", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/express": "^5.0.3", + "@types/node": "^22.10.2", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "cross-env": "^10.0.0", + "srvx": "^0.11.9", + "tailwindcss": "^4.2.2", + "tsx": "^4.20.3", + "typescript": "^6.0.2" + } +} diff --git a/e2e/react-start/custom-server-rsbuild/playwright.config.ts b/e2e/react-start/custom-server-rsbuild/playwright.config.ts new file mode 100644 index 0000000000..eb8b43f648 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/playwright.config.ts @@ -0,0 +1,31 @@ +import { defineConfig, devices } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } + +const mode = process.env.MODE ?? 'prod' +const isDev = mode === 'dev' + +const PORT = await getTestServerPort(`${packageJson.name}-${mode}`) +const baseURL = `http://localhost:${PORT}` + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + use: { baseURL }, + webServer: { + command: isDev ? 'pnpm dev:e2e' : 'pnpm build && pnpm start', + url: baseURL, + reuseExistingServer: !process.env.CI, + stdout: 'pipe', + env: { + PORT: String(PORT), + }, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/react-start/custom-server-rsbuild/postcss.config.mjs b/e2e/react-start/custom-server-rsbuild/postcss.config.mjs new file mode 100644 index 0000000000..a7f73a2d1d --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + '@tailwindcss/postcss': {}, + }, +} diff --git a/e2e/react-start/custom-server-rsbuild/rsbuild.config.ts b/e2e/react-start/custom-server-rsbuild/rsbuild.config.ts new file mode 100644 index 0000000000..e638f8319c --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/rsbuild.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' + +export default defineConfig({ + plugins: [ + pluginReact({ splitChunks: false }), + tanstackStart({ rsbuild: { installDevServerMiddleware: false } }), + ], +}) diff --git a/e2e/react-start/custom-server-rsbuild/src/env.d.ts b/e2e/react-start/custom-server-rsbuild/src/env.d.ts new file mode 100644 index 0000000000..6cb6761206 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/src/env.d.ts @@ -0,0 +1,3 @@ +/// + +declare module '*.css' diff --git a/e2e/react-start/custom-server-rsbuild/src/routeTree.gen.ts b/e2e/react-start/custom-server-rsbuild/src/routeTree.gen.ts new file mode 100644 index 0000000000..dceedffdc1 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/src/routeTree.gen.ts @@ -0,0 +1,68 @@ +/* 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' + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/' + fileRoutesByTo: FileRoutesByTo + to: '/' + id: '__root__' | '/' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { createStart } from '@tanstack/react-start' +declare module '@tanstack/react-start' { + interface Register { + ssr: true + router: Awaited> + } +} diff --git a/e2e/react-start/custom-server-rsbuild/src/router.tsx b/e2e/react-start/custom-server-rsbuild/src/router.tsx new file mode 100644 index 0000000000..58f4d54e88 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/src/router.tsx @@ -0,0 +1,6 @@ +import { createRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + return createRouter({ routeTree }) +} diff --git a/e2e/react-start/custom-server-rsbuild/src/routes/__root.tsx b/e2e/react-start/custom-server-rsbuild/src/routes/__root.tsx new file mode 100644 index 0000000000..adafe0f16b --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/src/routes/__root.tsx @@ -0,0 +1,32 @@ +import { + HeadContent, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/react-router' +import '../styles/app.css' + +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { charSet: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + { title: 'Rsbuild custom server test' }, + ], + }), + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + + + + + + + ) +} diff --git a/e2e/react-start/custom-server-rsbuild/src/routes/index.tsx b/e2e/react-start/custom-server-rsbuild/src/routes/index.tsx new file mode 100644 index 0000000000..f0f7531397 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/src/routes/index.tsx @@ -0,0 +1,70 @@ +import { createFileRoute } from '@tanstack/react-router' +import { createServerFn } from '@tanstack/react-start' +import { useState } from 'react' + +const getGreeting = createServerFn() + .inputValidator((d: { name: string }) => d) + .handler(({ data }) => ({ greeting: `Hello, ${data.name}!` })) + +const postMessage = createServerFn({ method: 'POST' }) + .inputValidator((d: { message: string }) => d) + .handler(({ data }) => ({ echo: `Echo: ${data.message}` })) + +export const Route = createFileRoute('/')({ + loader: async () => { + const result = await getGreeting({ data: { name: 'Loader' } }) + return { loaderGreeting: result.greeting } + }, + component: ServerFnsComponent, +}) + +function ServerFnsComponent() { + const { loaderGreeting } = Route.useLoaderData() + const [clientGreeting, setClientGreeting] = useState('') + const [echoResult, setEchoResult] = useState('') + + return ( +
+

Server Functions

+ +
+

Loader (SSR)

+

{loaderGreeting}

+
+ +
+

GET server function

+ + {clientGreeting && ( +

{clientGreeting}

+ )} +
+ +
+

POST server function

+ + {echoResult &&

{echoResult}

} +
+
+ ) +} diff --git a/e2e/react-start/custom-server-rsbuild/src/server.ts b/e2e/react-start/custom-server-rsbuild/src/server.ts new file mode 100644 index 0000000000..130fbb5a96 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/src/server.ts @@ -0,0 +1,7 @@ +import handler from '@tanstack/react-start/server-entry' + +export default { + fetch(request: Request) { + return handler.fetch(request) + }, +} diff --git a/e2e/react-start/custom-server-rsbuild/src/styles/app.css b/e2e/react-start/custom-server-rsbuild/src/styles/app.css new file mode 100644 index 0000000000..37c1f5a6e2 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/src/styles/app.css @@ -0,0 +1,30 @@ +@import 'tailwindcss' source('../'); + +@layer base { + *, + ::after, + ::before, + ::backdrop, + ::file-selector-button { + border-color: var(--color-gray-200, currentcolor); + } +} + +@layer base { + html { + color-scheme: light dark; + } + + * { + @apply border-gray-200 dark:border-gray-800; + } + + html, + body { + @apply text-gray-900 bg-gray-50 dark:bg-gray-950 dark:text-gray-200; + } + + .using-mouse * { + outline: none !important; + } +} diff --git a/e2e/react-start/custom-server-rsbuild/tests/server-fns.spec.ts b/e2e/react-start/custom-server-rsbuild/tests/server-fns.spec.ts new file mode 100644 index 0000000000..059a6e74b9 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/tests/server-fns.spec.ts @@ -0,0 +1,29 @@ +import { expect, test } from '@playwright/test' + +test('loader SSRs the greeting from a server function', async ({ page }) => { + const response = await page.goto('/') + expect(response?.status()).toBe(200) + + const loaderGreeting = page.getByTestId('loader-greeting') + await expect(loaderGreeting).toHaveText('Hello, Loader!') +}) + +test('GET server function resolves on the client', async ({ page }) => { + await page.goto('/') + await expect(page.getByTestId('loader-greeting')).toHaveText('Hello, Loader!') + + await page.getByRole('button', { name: 'Call getGreeting' }).click() + + await expect(page.getByTestId('client-greeting')).toHaveText('Hello, Client!') +}) + +test('POST server function resolves on the client', async ({ page }) => { + await page.goto('/') + await expect(page.getByTestId('loader-greeting')).toHaveText('Hello, Loader!') + + await page.getByRole('button', { name: 'Call postMessage' }).click() + + await expect(page.getByTestId('echo-result')).toHaveText( + 'Echo: hello from client', + ) +}) diff --git a/e2e/react-start/custom-server-rsbuild/tsconfig.json b/e2e/react-start/custom-server-rsbuild/tsconfig.json new file mode 100644 index 0000000000..2afe40d931 --- /dev/null +++ b/e2e/react-start/custom-server-rsbuild/tsconfig.json @@ -0,0 +1,18 @@ +{ + "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, + "noEmit": true + } +} diff --git a/e2e/react-start/hmr/.gitignore b/e2e/react-start/hmr/.gitignore index 229709a89d..3116396262 100644 --- a/e2e/react-start/hmr/.gitignore +++ b/e2e/react-start/hmr/.gitignore @@ -1,5 +1,7 @@ node_modules dist +dist-vite-* +dist-rsbuild-* test-results playwright-report port*.txt diff --git a/e2e/react-start/hmr/package.json b/e2e/react-start/hmr/package.json index 8682ec6ff0..a9b15bb666 100644 --- a/e2e/react-start/hmr/package.json +++ b/e2e/react-start/hmr/package.json @@ -4,9 +4,13 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vite dev --port 3000", - "dev:e2e": "vite dev --port $PORT", - "build": "vite build && tsc --noEmit", + "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", "test:e2e": "MODE=dev playwright test --project=chromium" }, "dependencies": { @@ -17,6 +21,9 @@ }, "devDependencies": { "@playwright/test": "^1.50.1", + "@rsbuild/core": "^2.0.0", + "@rsbuild/plugin-react": "^2.0.0", + "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", @@ -26,5 +33,19 @@ "@vitejs/plugin-react": "^6.0.1", "typescript": "^6.0.2", "vite": "^8.0.0" + }, + "nx": { + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + } + ] + } } } diff --git a/e2e/react-start/hmr/playwright.config.ts b/e2e/react-start/hmr/playwright.config.ts index 0de7b74396..eb544597ee 100644 --- a/e2e/react-start/hmr/playwright.config.ts +++ b/e2e/react-start/hmr/playwright.config.ts @@ -2,8 +2,14 @@ import { defineConfig, devices } from '@playwright/test' import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const e2ePortKey = + process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +const distDir = process.env.E2E_DIST_DIR ?? 'dist' +const PORT = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` +const devCommand = + toolchain === 'rsbuild' ? 'pnpm dev:rsbuild' : 'pnpm dev:vite' export default defineConfig({ testDir: './tests', @@ -18,13 +24,16 @@ export default defineConfig({ }, webServer: { - command: `pnpm dev:e2e`, + command: `${devCommand} --port ${PORT}`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', PORT: String(PORT), + E2E_TOOLCHAIN: toolchain, + E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/react-start/hmr/postcss.config.mjs b/e2e/react-start/hmr/postcss.config.mjs new file mode 100644 index 0000000000..a7f73a2d1d --- /dev/null +++ b/e2e/react-start/hmr/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + '@tailwindcss/postcss': {}, + }, +} diff --git a/e2e/react-start/hmr/rsbuild.config.ts b/e2e/react-start/hmr/rsbuild.config.ts new file mode 100644 index 0000000000..126e7d9888 --- /dev/null +++ b/e2e/react-start/hmr/rsbuild.config.ts @@ -0,0 +1,17 @@ +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({ splitChunks: false }), tanstackStart()], + output: { + distPath: { + root: outDir, + }, + }, + server: { + port: 3000, + }, +}) diff --git a/e2e/react-start/hmr/src/hmr/server-fn-hmr-entry.ts b/e2e/react-start/hmr/src/hmr/server-fn-hmr-entry.ts new file mode 100644 index 0000000000..4e185e55f8 --- /dev/null +++ b/e2e/react-start/hmr/src/hmr/server-fn-hmr-entry.ts @@ -0,0 +1,21 @@ +import { createServerFn } from '@tanstack/react-start' +import { + createServerFnHmrFactory, + serverFnHmrMarker, +} from './server-fn-hmr-factory' + +const serverOnlyImpl = createServerFnHmrFactory( + () => 'server-fn-hmr-baseline-result', +) + +const serverFnHmr = createServerFn().handler(async () => { + return { + result: await serverOnlyImpl(), + } +}) + +export { serverFnHmrMarker } + +export async function invokeServerFnHmr() { + return serverFnHmr() +} diff --git a/e2e/react-start/hmr/src/hmr/server-fn-hmr-factory.ts b/e2e/react-start/hmr/src/hmr/server-fn-hmr-factory.ts new file mode 100644 index 0000000000..f095ef78bb --- /dev/null +++ b/e2e/react-start/hmr/src/hmr/server-fn-hmr-factory.ts @@ -0,0 +1,4 @@ +import { createClientOnlyFn, createServerOnlyFn } from '@tanstack/react-start' + +export const createServerFnHmrFactory = createServerOnlyFn +export const serverFnHmrMarker = 'server-fn-hmr-baseline' diff --git a/e2e/react-start/hmr/src/routeTree.gen.ts b/e2e/react-start/hmr/src/routeTree.gen.ts index 89230cd190..d2baf5bef6 100644 --- a/e2e/react-start/hmr/src/routeTree.gen.ts +++ b/e2e/react-start/hmr/src/routeTree.gen.ts @@ -9,6 +9,7 @@ // 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 ServerFnHmrRouteImport } from './routes/server-fn-hmr' import { Route as InputsRouteImport } from './routes/inputs' import { Route as ComponentHmrNamedSplitRouteImport } from './routes/component-hmr-named-split' import { Route as ComponentHmrNamedNosplitRouteImport } from './routes/component-hmr-named-nosplit' @@ -20,6 +21,11 @@ import { Route as ComponentHmrRouteImport } from './routes/component-hmr' import { Route as ChildRouteImport } from './routes/child' import { Route as IndexRouteImport } from './routes/index' +const ServerFnHmrRoute = ServerFnHmrRouteImport.update({ + id: '/server-fn-hmr', + path: '/server-fn-hmr', + getParentRoute: () => rootRouteImport, +} as any) const InputsRoute = InputsRouteImport.update({ id: '/inputs', path: '/inputs', @@ -86,6 +92,7 @@ export interface FileRoutesByFullPath { '/component-hmr-named-nosplit': typeof ComponentHmrNamedNosplitRoute '/component-hmr-named-split': typeof ComponentHmrNamedSplitRoute '/inputs': typeof InputsRoute + '/server-fn-hmr': typeof ServerFnHmrRoute } export interface FileRoutesByTo { '/': typeof IndexRoute @@ -98,6 +105,7 @@ export interface FileRoutesByTo { '/component-hmr-named-nosplit': typeof ComponentHmrNamedNosplitRoute '/component-hmr-named-split': typeof ComponentHmrNamedSplitRoute '/inputs': typeof InputsRoute + '/server-fn-hmr': typeof ServerFnHmrRoute } export interface FileRoutesById { __root__: typeof rootRouteImport @@ -111,6 +119,7 @@ export interface FileRoutesById { '/component-hmr-named-nosplit': typeof ComponentHmrNamedNosplitRoute '/component-hmr-named-split': typeof ComponentHmrNamedSplitRoute '/inputs': typeof InputsRoute + '/server-fn-hmr': typeof ServerFnHmrRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath @@ -125,6 +134,7 @@ export interface FileRouteTypes { | '/component-hmr-named-nosplit' | '/component-hmr-named-split' | '/inputs' + | '/server-fn-hmr' fileRoutesByTo: FileRoutesByTo to: | '/' @@ -137,6 +147,7 @@ export interface FileRouteTypes { | '/component-hmr-named-nosplit' | '/component-hmr-named-split' | '/inputs' + | '/server-fn-hmr' id: | '__root__' | '/' @@ -149,6 +160,7 @@ export interface FileRouteTypes { | '/component-hmr-named-nosplit' | '/component-hmr-named-split' | '/inputs' + | '/server-fn-hmr' fileRoutesById: FileRoutesById } export interface RootRouteChildren { @@ -162,10 +174,18 @@ export interface RootRouteChildren { ComponentHmrNamedNosplitRoute: typeof ComponentHmrNamedNosplitRoute ComponentHmrNamedSplitRoute: typeof ComponentHmrNamedSplitRoute InputsRoute: typeof InputsRoute + ServerFnHmrRoute: typeof ServerFnHmrRoute } declare module '@tanstack/react-router' { interface FileRoutesByPath { + '/server-fn-hmr': { + id: '/server-fn-hmr' + path: '/server-fn-hmr' + fullPath: '/server-fn-hmr' + preLoaderRoute: typeof ServerFnHmrRouteImport + parentRoute: typeof rootRouteImport + } '/inputs': { id: '/inputs' path: '/inputs' @@ -250,6 +270,7 @@ const rootRouteChildren: RootRouteChildren = { ComponentHmrNamedNosplitRoute: ComponentHmrNamedNosplitRoute, ComponentHmrNamedSplitRoute: ComponentHmrNamedSplitRoute, InputsRoute: InputsRoute, + ServerFnHmrRoute: ServerFnHmrRoute, } export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) diff --git a/e2e/react-start/hmr/src/routes/__root.tsx b/e2e/react-start/hmr/src/routes/__root.tsx index c948044325..b2ec48fb70 100644 --- a/e2e/react-start/hmr/src/routes/__root.tsx +++ b/e2e/react-start/hmr/src/routes/__root.tsx @@ -10,7 +10,7 @@ import { useMatches, } from '@tanstack/react-router' import type { ReactNode } from 'react' -import appCss from '~/styles/app.css?url' +import '~/styles/app.css' export const Route = createRootRoute({ head: () => ({ @@ -18,7 +18,6 @@ export const Route = createRootRoute({ { charSet: 'utf-8' }, { name: 'viewport', content: 'width=device-width, initial-scale=1' }, ], - links: [{ rel: 'stylesheet', href: appCss }], }), loader: () => ({ crumb: 'Home', @@ -141,6 +140,12 @@ function RootContent() { label: 'Component HMR', detail: 'Base component refresh checks', }, + { + testId: 'server-fn-hmr-link', + to: '/server-fn-hmr', + label: 'Server Fn HMR', + detail: 'Transitive invalidation for server functions', + }, { testId: 'component-hmr-inline-split-link', to: '/component-hmr-inline-split', diff --git a/e2e/react-start/hmr/src/routes/server-fn-hmr.tsx b/e2e/react-start/hmr/src/routes/server-fn-hmr.tsx new file mode 100644 index 0000000000..770d8b4c9d --- /dev/null +++ b/e2e/react-start/hmr/src/routes/server-fn-hmr.tsx @@ -0,0 +1,78 @@ +import { createFileRoute } from '@tanstack/react-router' +import { useState } from 'react' +import { + invokeServerFnHmr, + serverFnHmrMarker, +} from '../hmr/server-fn-hmr-entry' + +export const Route = createFileRoute('/server-fn-hmr')({ + component: ServerFnHmrComponent, +}) + +function ServerFnHmrComponent() { + const [result, setResult] = useState(null) + const [error, setError] = useState(null) + + async function invokeServerFn() { + try { + const next = await invokeServerFnHmr() + setResult(next.result) + setError(null) + } catch (e) { + setResult(null) + setError(e instanceof Error ? e.message : String(e)) + } + } + + return ( +
+
+
+

Server function invalidation

+

+ Server function HMR +

+

+ This route validates that transitive compiler invalidation updates a + server function caller after HMR edits. +

+
+

+ {serverFnHmrMarker} +

+
+ +
+ + createServerOnlyFn transitively +
+ +
+
+

Result

+

+ {result ?? 'idle'} +

+
+
+

Error

+

+ {error ?? 'none'} +

+
+
+
+ ) +} diff --git a/e2e/react-start/hmr/tests/app.spec.ts b/e2e/react-start/hmr/tests/app.spec.ts index dc371c0064..c75a0b7ef7 100644 --- a/e2e/react-start/hmr/tests/app.spec.ts +++ b/e2e/react-start/hmr/tests/app.spec.ts @@ -1,5 +1,4 @@ import { expect } from '@playwright/test' -import type { ConsoleMessage } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' import { readFile, writeFile } from 'node:fs/promises' import path from 'node:path' @@ -10,41 +9,260 @@ const whitelistErrors = [ 'Failed to load resource: the server responded with a status of 504', ] -const routeFilenames = { - index: 'index.tsx', - root: '__root.tsx', - child: 'child.tsx', - inputs: 'inputs.tsx', - componentHmrInlineSplit: 'component-hmr-inline-split.tsx', - componentHmrInlineNosplit: 'component-hmr-inline-nosplit.tsx', - componentHmrNamedSplit: 'component-hmr-named-split.tsx', - componentHmrNamedNosplit: 'component-hmr-named-nosplit.tsx', - componentHmrInlineErrorSplit: 'component-hmr-inline-error-split.tsx', - componentHmrNamedErrorSplit: 'component-hmr-named-error-split.tsx', +const hmrExpect = expect.configure({ timeout: 20_000 }) + +const routeFilePaths = { + index: 'routes/index.tsx', + root: 'routes/__root.tsx', + child: 'routes/child.tsx', + inputs: 'routes/inputs.tsx', + componentHmrInlineSplit: 'routes/component-hmr-inline-split.tsx', + componentHmrInlineNosplit: 'routes/component-hmr-inline-nosplit.tsx', + componentHmrNamedSplit: 'routes/component-hmr-named-split.tsx', + componentHmrNamedNosplit: 'routes/component-hmr-named-nosplit.tsx', + componentHmrInlineErrorSplit: 'routes/component-hmr-inline-error-split.tsx', + componentHmrNamedErrorSplit: 'routes/component-hmr-named-error-split.tsx', + serverFnHmr: 'routes/server-fn-hmr.tsx', + serverFnHmrFactory: 'hmr/server-fn-hmr-factory.ts', } as const -type RouteFileKey = keyof typeof routeFilenames +type RouteFileKey = keyof typeof routeFilePaths const routeFiles = Object.fromEntries( - Object.entries(routeFilenames).map(([key, filename]) => [ + Object.entries(routeFilePaths).map(([key, relativePath]) => [ key, - path.join(process.cwd(), 'src/routes', filename), + path.join(process.cwd(), 'src', relativePath), ]), ) as Record +const routeFileRestoreChecks: Partial< + Record< + RouteFileKey, + { + url: string + testId: string + text: string + } + > +> = { + index: { url: '/', testId: 'marker', text: 'baseline' }, + root: { + url: '/', + testId: 'root-component-marker', + text: 'root-component-baseline', + }, + child: { url: '/child', testId: 'child-greeting', text: 'Hello' }, + inputs: { url: '/inputs', testId: 'inputs-marker', text: 'inputs-baseline' }, + componentHmrInlineSplit: { + url: '/component-hmr-inline-split', + testId: 'component-hmr-marker', + text: 'component-hmr-inline-split-baseline', + }, + componentHmrInlineNosplit: { + url: '/component-hmr-inline-nosplit', + testId: 'component-hmr-marker', + text: 'component-hmr-inline-nosplit-baseline', + }, + componentHmrNamedSplit: { + url: '/component-hmr-named-split', + testId: 'component-hmr-marker', + text: 'component-hmr-named-split-baseline', + }, + componentHmrNamedNosplit: { + url: '/component-hmr-named-nosplit', + testId: 'component-hmr-marker', + text: 'component-hmr-named-nosplit-baseline', + }, + componentHmrInlineErrorSplit: { + url: '/component-hmr-inline-error-split', + testId: 'component-hmr-marker', + text: 'component-hmr-inline-error-split-baseline', + }, + componentHmrNamedErrorSplit: { + url: '/component-hmr-named-error-split', + testId: 'component-hmr-marker', + text: 'component-hmr-named-error-split-baseline', + }, + serverFnHmrFactory: { + url: '/server-fn-hmr', + testId: 'server-fn-hmr-marker', + text: 'server-fn-hmr-baseline', + }, +} + // Capture original file contents once so beforeEach can restore them const originalContents: Partial> = {} +const routeKeysPendingRestoreCheck = new Set() + +function replaceAll(source: string, from: string, to: string) { + return source.split(from).join(to) +} + +function normalizeRouteSource(routeFileKey: RouteFileKey, source: string) { + let next = source + + if (routeFileKey === 'index') { + next = next.replace( + "export const Route = createFileRoute('/')({\n loader: () => ({\n crumb: 'Index Added',\n }),\n component: Home,\n})", + "export const Route = createFileRoute('/')({\n component: Home,\n})", + ) + next = replaceAll(next, 'updated', 'baseline') + } + + if (routeFileKey === 'root') { + for (const marker of [ + 'root-component-inline-baseline', + 'root-component-inline-updated', + ]) { + next = next.replace( + ` component: () => ,`, + ' component: RootComponent,', + ) + } + + for (const marker of [ + 'root-shell-inline-baseline', + 'root-shell-inline-updated', + ]) { + next = next.replace( + ` shellComponent: ({ children }) => {children},\n component: RootContent,`, + ' component: RootComponent,', + ) + } + + next = next.replace( + ' shellComponent: RootShell,\n component: RootContent,', + ' component: RootComponent,', + ) + + for (const marker of ['root-shell-baseline', 'root-shell-updated']) { + next = next.replace( + `function RootShell({ children }: { children: ReactNode }) {\n return {children}\n}\n\nfunction Breadcrumbs() {`, + 'function Breadcrumbs() {', + ) + } + + next = replaceAll(next, "crumb: 'Home Updated'", "crumb: 'Home'") + next = replaceAll(next, 'root-component-updated', 'root-component-baseline') + next = replaceAll(next, 'root-shell-updated', 'root-shell-baseline') + } + + if (routeFileKey === 'child') { + const beforeLoadBlock = + " beforeLoad: () => ({\n greeting: 'Hello',\n }),\n" + const loaderBlock = " loader: () => ({\n crumb: 'Child',\n }),\n" + + next = replaceAll(next, "greeting: 'Hi'", "greeting: 'Hello'") + next = replaceAll(next, "crumb: 'Child Updated Again'", "crumb: 'Child'") + next = replaceAll(next, "crumb: 'Child Updated'", "crumb: 'Child'") + + if (!next.includes(beforeLoadBlock)) { + next = next.replace( + ' component: Child,\n', + `${beforeLoadBlock} component: Child,\n`, + ) + } + if (!next.includes(loaderBlock)) { + const withLoaderAfterBeforeLoad = next.replace( + `${beforeLoadBlock} component: Child,\n`, + `${beforeLoadBlock}${loaderBlock} component: Child,\n`, + ) + next = + withLoaderAfterBeforeLoad === next + ? next.replace( + ' component: Child,\n', + `${loaderBlock} component: Child,\n`, + ) + : withLoaderAfterBeforeLoad + } + } + + const markerReplacements: Partial> = { + inputs: ['inputs-updated', 'inputs-baseline'], + componentHmrInlineSplit: [ + 'component-hmr-inline-split-updated', + 'component-hmr-inline-split-baseline', + ], + componentHmrInlineNosplit: [ + 'component-hmr-inline-nosplit-updated', + 'component-hmr-inline-nosplit-baseline', + ], + componentHmrNamedSplit: [ + 'component-hmr-named-split-updated', + 'component-hmr-named-split-baseline', + ], + componentHmrNamedNosplit: [ + 'component-hmr-named-nosplit-updated', + 'component-hmr-named-nosplit-baseline', + ], + componentHmrInlineErrorSplit: [ + 'component-hmr-inline-error-split-updated', + 'component-hmr-inline-error-split-baseline', + ], + componentHmrNamedErrorSplit: [ + 'component-hmr-named-error-split-updated', + 'component-hmr-named-error-split-baseline', + ], + } + const markerReplacement = markerReplacements[routeFileKey] + if (markerReplacement) { + next = replaceAll(next, markerReplacement[0], markerReplacement[1]) + } + + if (routeFileKey === 'serverFnHmrFactory') { + next = next.replace( + /^import \{ .* \} from '@tanstack\/react-start'$/m, + "import { createClientOnlyFn, createServerOnlyFn } from '@tanstack/react-start'", + ) + next = replaceAll( + next, + 'export const createServerFnHmrFactory = createClientOnlyFn', + 'export const createServerFnHmrFactory = createServerOnlyFn', + ) + next = replaceAll( + next, + 'server-fn-hmr-client-only', + 'server-fn-hmr-baseline', + ) + } + + return next +} async function captureOriginals() { for (const [key, filePath] of Object.entries(routeFiles) as Array< [RouteFileKey, string] >) { - originalContents[key] = await readFile(filePath, 'utf8') + const current = await readFile(filePath, 'utf8') + const normalized = normalizeRouteSource(key, current) + if (normalized !== current) { + await writeFile(filePath, normalized) + routeKeysPendingRestoreCheck.add(key) + } + originalContents[key] = normalized } } const capturePromise = captureOriginals() +async function restoreRouteFiles() { + const restoredRouteKeys: Array = [] + + for (const [key, filePath] of Object.entries(routeFiles) as Array< + [RouteFileKey, string] + >) { + const content = originalContents[key] + if (content === undefined) continue + const current = await readFile(filePath, 'utf8') + if (current !== content) { + await writeFile(filePath, content) + restoredRouteKeys.push(key) + } + } + + return restoredRouteKeys +} + async function replaceRouteText( routeFileKey: RouteFileKey, from: string, @@ -76,39 +294,50 @@ async function rewriteRouteFile( routeFileKey: RouteFileKey, updater: (source: string) => string, assertion: () => Promise, + options: { allowNoop?: boolean } = {}, ) { const filePath = routeFiles[routeFileKey] const source = await readFile(filePath, 'utf8') const updated = updater(source) - if (updated === source) { + if (updated === source && !options.allowNoop) { throw new Error(`Expected ${filePath} to change during rewrite`) } + // Even a no-op write is useful for tests that need to force the dev server + // to reconcile a stale in-memory module with the current file contents. await writeFile(filePath, updated) await assertion() } /** - * Returns a promise that resolves once Vite logs a client HMR update - * for the given route filename. Must be called BEFORE the file write - * so the listener is in place when the message arrives. + * Waits for the router to observe the latest route module after an edit. + * This avoids bundler-specific HMR console message matching. */ -function onNextHmrUpdate(page: Page, routeFilename: string): Promise { - return new Promise((resolve) => { - const handler = (msg: ConsoleMessage) => { - const text = msg.text() - if ( - text.includes('[vite]') && - text.includes(routeFilename) && - (text.includes('hot updated') || text.includes('hmr update')) - ) { - page.off('console', handler) - resolve() +async function waitForRouteModuleUpdate( + page: Page, + routeId: string, + expectedCrumb: string, +) { + await page.waitForFunction( + ([nextRouteId, nextCrumb]) => { + const router = (window as any).__TSR_ROUTER__ + const route = router?.routesById?.[nextRouteId] + if (!route) { + return false } - } - page.on('console', handler) - }) + + const loader = route.options?.loader + if (typeof loader !== 'function') { + return false + } + + const loaderResult = loader() + return loaderResult?.crumb === nextCrumb + }, + [routeId, expectedCrumb], + { timeout: 20_000 }, + ) } async function waitForRouteRemovalReload(page: Page) { @@ -122,8 +351,59 @@ async function waitForRouteRemovalReload(page: Page) { }) } +async function waitForServerRenderedText( + page: Page, + url: string, + text: string, +) { + const deadline = Date.now() + 20_000 + let lastError: unknown + + while (Date.now() < deadline) { + try { + const response = await page.request.get(url) + const body = await response.text() + + if (response.ok() && body.includes(text)) { + return + } + + lastError = new Error( + `Expected server HTML for ${url} to include ${JSON.stringify(text)}`, + ) + } catch (error) { + lastError = error + } + + await page.waitForTimeout(150) + } + + throw lastError +} + +async function waitForHydrationSafeReload( + page: Page, + url: string, + text: string, +) { + await waitForServerRenderedText(page, url, text) + // The client and SSR compilers can finish in different ticks. Give the + // browser-side module graph a quiet window after SSR has the expected HTML. + await page.waitForTimeout(750) +} + async function reloadPageAndWait(page: Page, url: string) { - await page.goto(url) + for (let attempt = 1; attempt <= 3; attempt++) { + try { + await page.goto(url, { waitUntil: 'domcontentloaded' }) + break + } catch (error) { + if (attempt === 3 || !String(error).includes('net::ERR_ABORTED')) { + throw error + } + await page.waitForTimeout(250) + } + } await page.getByTestId('hydrated').waitFor({ state: 'visible' }) } @@ -133,8 +413,77 @@ async function reloadPageAndWaitForText( testId: string, text: string, ) { - await reloadPageAndWait(page, url) - await expect(page.getByTestId(testId)).toHaveText(text) + const deadline = Date.now() + 20_000 + let lastError: unknown + + while (Date.now() < deadline) { + try { + await waitForHydrationSafeReload(page, url, text) + await reloadPageAndWait(page, url) + await expect(page.getByTestId(testId)).toHaveText(text, { + timeout: 1_000, + }) + return + } catch (error) { + lastError = error + await page.waitForTimeout(150) + } + } + + throw lastError +} + +async function waitForServerFnHmrReady(page: Page) { + await page.getByTestId('hydrated').waitFor({ state: 'visible' }) + await expect(page.getByTestId('invoke-server-fn-hmr')).toBeVisible() +} + +async function waitForServerFnHmrMarker(page: Page, text: string) { + await waitForServerFnHmrReady(page) + await hmrExpect(page.getByTestId('server-fn-hmr-marker')).toHaveText(text) + await hmrExpect(page.getByTestId('server-fn-hmr-result')).toBeVisible() +} + +async function waitForRestoredRouteFile( + page: Page, + routeFileKey: RouteFileKey, +) { + const restoreCheck = routeFileRestoreChecks[routeFileKey] + + if (!restoreCheck) { + return + } + + // Restores happen immediately after a previous edit, so poll until the dev + // server has actually observed the restored file before the next test starts. + const deadline = Date.now() + 20_000 + let lastError: unknown + + while (Date.now() < deadline) { + try { + await waitForHydrationSafeReload( + page, + restoreCheck.url, + restoreCheck.text, + ) + await reloadPageAndWait(page, restoreCheck.url) + await expect(page.getByTestId(restoreCheck.testId)).toHaveText( + restoreCheck.text, + { timeout: 500 }, + ) + await page.waitForTimeout(500) + await expect(page.getByTestId(restoreCheck.testId)).toHaveText( + restoreCheck.text, + { timeout: 1_000 }, + ) + return + } catch (error) { + lastError = error + await page.waitForTimeout(150) + } + } + + throw lastError } async function seedHomeState(page: Page) { @@ -170,32 +519,32 @@ async function expectComponentHmrStatePreserved(page: Page) { test.describe('react-start hmr', () => { test.use({ whitelistErrors }) - test.beforeEach(async () => { + test.beforeEach(async ({ page }) => { await capturePromise - for (const [key, filePath] of Object.entries(routeFiles) as Array< - [RouteFileKey, string] - >) { - const content = originalContents[key] - if (content === undefined) continue - const current = await readFile(filePath, 'utf8') - if (current !== content) { - await writeFile(filePath, content) - } + const restoredRouteKeys = await restoreRouteFiles() + for (const routeFileKey of restoredRouteKeys) { + routeKeysPendingRestoreCheck.add(routeFileKey) + } + + const routeKeysToCheck = Array.from(routeKeysPendingRestoreCheck) + routeKeysPendingRestoreCheck.clear() + + for (const routeFileKey of routeKeysToCheck) { + await waitForRestoredRouteFile(page, routeFileKey) + } + }) + + test.afterEach(async () => { + await capturePromise + const restoredRouteKeys = await restoreRouteFiles() + for (const routeFileKey of restoredRouteKeys) { + routeKeysPendingRestoreCheck.add(routeFileKey) } }) test.afterAll(async () => { await capturePromise - for (const [key, filePath] of Object.entries(routeFiles) as Array< - [RouteFileKey, string] - >) { - const content = originalContents[key] - if (content === undefined) continue - const current = await readFile(filePath, 'utf8') - if (current !== content) { - await writeFile(filePath, content) - } - } + await restoreRouteFiles() }) test('preserves local state for code-split route component HMR', async ({ @@ -216,7 +565,7 @@ test.describe('react-start hmr', () => { 'baseline', 'updated', async () => { - await expect(page.getByTestId('marker')).toHaveText('updated') + await hmrExpect(page.getByTestId('marker')).toHaveText('updated') }, ) @@ -240,7 +589,8 @@ test.describe('react-start hmr', () => { "crumb: 'Home'", "crumb: 'Home Updated'", async () => { - await expect(page.getByTestId('crumb-__root__')).toHaveText( + await waitForRouteModuleUpdate(page, '__root__', 'Home Updated') + await hmrExpect(page.getByTestId('crumb-__root__')).toHaveText( 'Home Updated', ) }, @@ -264,7 +614,8 @@ test.describe('react-start hmr', () => { "crumb: 'Child'", "crumb: 'Child Updated'", async () => { - await expect(page.getByTestId('crumb-/child')).toHaveText( + await waitForRouteModuleUpdate(page, '/child', 'Child Updated') + await hmrExpect(page.getByTestId('crumb-/child')).toHaveText( 'Child Updated', ) }, @@ -293,7 +644,8 @@ test.describe('react-start hmr', () => { "export const Route = createFileRoute('/')({\n loader: () => ({\n crumb: 'Index Added',\n }),\n component: Home,\n})", ), async () => { - await expect(page.getByTestId('crumb-/')).toHaveText('Index Added') + await waitForRouteModuleUpdate(page, '/', 'Index Added') + await hmrExpect(page.getByTestId('crumb-/')).toHaveText('Index Added') }, ) @@ -315,7 +667,7 @@ test.describe('react-start hmr', () => { source.replace(" loader: () => ({\n crumb: 'Child',\n }),\n", ''), async () => { await waitForRouteRemovalReload(page) - await expect(page.getByTestId('crumb-/child')).toHaveCount(0) + await hmrExpect(page.getByTestId('crumb-/child')).toHaveCount(0) }, ) @@ -332,26 +684,33 @@ test.describe('react-start hmr', () => { await page.getByTestId('hydrated').waitFor({ state: 'visible' }) // First edit: change child loader while on / - const hmr1 = onNextHmrUpdate(page, 'child.tsx') - await replaceRouteText('child', "crumb: 'Child'", "crumb: 'Child Updated'") - await hmr1 + await replaceRouteTextAndWait( + page, + 'child', + "crumb: 'Child'", + "crumb: 'Child Updated'", + async () => { + await waitForRouteModuleUpdate(page, '/child', 'Child Updated') + }, + ) // Second edit: change child loader again while still on / - const hmr2 = onNextHmrUpdate(page, 'child.tsx') - await replaceRouteText( + await replaceRouteTextAndWait( + page, 'child', "crumb: 'Child Updated'", "crumb: 'Child Updated Again'", + async () => { + await waitForRouteModuleUpdate(page, '/child', 'Child Updated Again') + }, ) - await hmr2 // Now navigate to /child — should see the LATEST value await page.getByTestId('child-link').click() await expect(page.getByTestId('child')).toBeVisible() - await expect(page.getByTestId('crumb-/child')).toHaveText( + await hmrExpect(page.getByTestId('crumb-/child')).toHaveText( 'Child Updated Again', - { timeout: 10000 }, ) }) @@ -376,7 +735,8 @@ test.describe('react-start hmr', () => { "crumb: 'Home'", "crumb: 'Home Updated'", async () => { - await expect(page.getByTestId('crumb-__root__')).toHaveText( + await waitForRouteModuleUpdate(page, '__root__', 'Home Updated') + await hmrExpect(page.getByTestId('crumb-__root__')).toHaveText( 'Home Updated', ) }, @@ -405,7 +765,7 @@ test.describe('react-start hmr', () => { 'inputs-baseline', 'inputs-updated', async () => { - await expect(page.getByTestId('inputs-marker')).toHaveText( + await hmrExpect(page.getByTestId('inputs-marker')).toHaveText( 'inputs-updated', ) }, @@ -430,7 +790,7 @@ test.describe('react-start hmr', () => { "greeting: 'Hello'", "greeting: 'Hi'", async () => { - await expect(page.getByTestId('child-greeting')).toHaveText('Hi') + await hmrExpect(page.getByTestId('child-greeting')).toHaveText('Hi') }, ) @@ -461,8 +821,9 @@ test.describe('react-start hmr', () => { ), async () => { await waitForRouteRemovalReload(page) - await expect(page.getByTestId('child-greeting')).toHaveCount(0) + await hmrExpect(page.getByTestId('child-greeting')).toHaveCount(0) }, + { allowNoop: true }, ) // Root state should be preserved @@ -505,7 +866,7 @@ test.describe('react-start hmr', () => { 'root-component-inline-baseline', 'root-component-inline-updated', async () => { - await expect(page.getByTestId('root-component-marker')).toHaveText( + await hmrExpect(page.getByTestId('root-component-marker')).toHaveText( 'root-component-inline-updated', ) }, @@ -523,7 +884,7 @@ test.describe('react-start hmr', () => { 'root-component-baseline', 'root-component-updated', async () => { - await expect(page.getByTestId('root-component-marker')).toHaveText( + await hmrExpect(page.getByTestId('root-component-marker')).toHaveText( 'root-component-updated', ) }, @@ -561,7 +922,7 @@ test.describe('react-start hmr', () => { 'root-shell-inline-baseline', 'root-shell-inline-updated', async () => { - await expect(page.getByTestId('root-shell-marker')).toHaveText( + await hmrExpect(page.getByTestId('root-shell-marker')).toHaveText( 'root-shell-inline-updated', ) }, @@ -604,7 +965,7 @@ test.describe('react-start hmr', () => { 'root-shell-baseline', 'root-shell-updated', async () => { - await expect(page.getByTestId('root-shell-marker')).toHaveText( + await hmrExpect(page.getByTestId('root-shell-marker')).toHaveText( 'root-shell-updated', ) }, @@ -622,7 +983,7 @@ test.describe('react-start hmr', () => { 'component-hmr-inline-split-baseline', 'component-hmr-inline-split-updated', async () => { - await expect(page.getByTestId('component-hmr-marker')).toHaveText( + await hmrExpect(page.getByTestId('component-hmr-marker')).toHaveText( 'component-hmr-inline-split-updated', ) }, @@ -642,7 +1003,7 @@ test.describe('react-start hmr', () => { 'component-hmr-inline-nosplit-baseline', 'component-hmr-inline-nosplit-updated', async () => { - await expect(page.getByTestId('component-hmr-marker')).toHaveText( + await hmrExpect(page.getByTestId('component-hmr-marker')).toHaveText( 'component-hmr-inline-nosplit-updated', ) }, @@ -662,7 +1023,7 @@ test.describe('react-start hmr', () => { 'component-hmr-named-split-baseline', 'component-hmr-named-split-updated', async () => { - await expect(page.getByTestId('component-hmr-marker')).toHaveText( + await hmrExpect(page.getByTestId('component-hmr-marker')).toHaveText( 'component-hmr-named-split-updated', ) }, @@ -682,7 +1043,7 @@ test.describe('react-start hmr', () => { 'component-hmr-named-nosplit-baseline', 'component-hmr-named-nosplit-updated', async () => { - await expect(page.getByTestId('component-hmr-marker')).toHaveText( + await hmrExpect(page.getByTestId('component-hmr-marker')).toHaveText( 'component-hmr-named-nosplit-updated', ) }, @@ -702,7 +1063,7 @@ test.describe('react-start hmr', () => { 'component-hmr-inline-error-split-baseline', 'component-hmr-inline-error-split-updated', async () => { - await expect(page.getByTestId('component-hmr-marker')).toHaveText( + await hmrExpect(page.getByTestId('component-hmr-marker')).toHaveText( 'component-hmr-inline-error-split-updated', ) }, @@ -722,7 +1083,7 @@ test.describe('react-start hmr', () => { 'component-hmr-named-error-split-baseline', 'component-hmr-named-error-split-updated', async () => { - await expect(page.getByTestId('component-hmr-marker')).toHaveText( + await hmrExpect(page.getByTestId('component-hmr-marker')).toHaveText( 'component-hmr-named-error-split-updated', ) }, @@ -730,4 +1091,52 @@ test.describe('react-start hmr', () => { await expectComponentHmrStatePreserved(page) }) + + test('invalidates transitive server function compiler state during HMR', async ({ + page, + }) => { + await page.goto('/server-fn-hmr') + await waitForServerFnHmrMarker(page, 'server-fn-hmr-baseline') + await page.getByTestId('invoke-server-fn-hmr').click() + await expect(page.getByTestId('server-fn-hmr-result')).toHaveText( + 'server-fn-hmr-baseline-result', + ) + await expect(page.getByTestId('server-fn-hmr-error')).toHaveText('none') + + await replaceRouteText( + 'serverFnHmrFactory', + "createServerOnlyFn\nexport const serverFnHmrMarker = 'server-fn-hmr-baseline'", + "createClientOnlyFn\nexport const serverFnHmrMarker = 'server-fn-hmr-client-only'", + ) + await reloadPageAndWaitForText( + page, + '/server-fn-hmr', + 'server-fn-hmr-marker', + 'server-fn-hmr-client-only', + ) + + await page.getByTestId('invoke-server-fn-hmr').click() + await expect(page.getByTestId('server-fn-hmr-result')).toHaveText('idle') + await expect(page.getByTestId('server-fn-hmr-error')).toContainText( + 'createClientOnlyFn() functions can only be called on the client!', + ) + + await replaceRouteText( + 'serverFnHmrFactory', + "createClientOnlyFn\nexport const serverFnHmrMarker = 'server-fn-hmr-client-only'", + "createServerOnlyFn\nexport const serverFnHmrMarker = 'server-fn-hmr-baseline'", + ) + await reloadPageAndWaitForText( + page, + '/server-fn-hmr', + 'server-fn-hmr-marker', + 'server-fn-hmr-baseline', + ) + + await page.getByTestId('invoke-server-fn-hmr').click() + await expect(page.getByTestId('server-fn-hmr-result')).toHaveText( + 'server-fn-hmr-baseline-result', + ) + await expect(page.getByTestId('server-fn-hmr-error')).toHaveText('none') + }) }) diff --git a/e2e/react-start/hmr/tests/setup/global.setup.ts b/e2e/react-start/hmr/tests/setup/global.setup.ts index 871fd6e6e4..fb9aad22ae 100644 --- a/e2e/react-start/hmr/tests/setup/global.setup.ts +++ b/e2e/react-start/hmr/tests/setup/global.setup.ts @@ -6,12 +6,17 @@ import { } from '@tanstack/router-e2e-utils' import packageJson from '../../package.json' with { type: 'json' } +function getE2EPortKey() { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +} + export default async function setup() { - await e2eStartDummyServer(packageJson.name) + const e2ePortKey = getE2EPortKey() - if (process.env.MODE !== 'dev') return + await e2eStartDummyServer(e2ePortKey) - const port = await getTestServerPort(packageJson.name) + const port = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${port}` await waitForServer(baseURL) diff --git a/e2e/react-start/hmr/tests/setup/global.teardown.ts b/e2e/react-start/hmr/tests/setup/global.teardown.ts index 62fd79911c..e17856dd82 100644 --- a/e2e/react-start/hmr/tests/setup/global.teardown.ts +++ b/e2e/react-start/hmr/tests/setup/global.teardown.ts @@ -1,6 +1,11 @@ import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' import packageJson from '../../package.json' with { type: 'json' } +function getE2EPortKey() { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +} + export default async function teardown() { - await e2eStopDummyServer(packageJson.name) + await e2eStopDummyServer(getE2EPortKey()) } diff --git a/e2e/react-start/hmr/vite.config.ts b/e2e/react-start/hmr/vite.config.ts index b30e7946c9..e992cb1a7b 100644 --- a/e2e/react-start/hmr/vite.config.ts +++ b/e2e/react-start/hmr/vite.config.ts @@ -3,8 +3,13 @@ import { tanstackStart } from '@tanstack/react-start/plugin/vite' import tailwindcss from '@tailwindcss/vite' import viteReact from '@vitejs/plugin-react' +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + export default defineConfig({ resolve: { tsconfigPaths: true }, + build: { + outDir, + }, server: { port: 3000, }, diff --git a/e2e/react-start/import-protection/package.json b/e2e/react-start/import-protection/package.json index 5464e40b94..25033de6a6 100644 --- a/e2e/react-start/import-protection/package.json +++ b/e2e/react-start/import-protection/package.json @@ -4,10 +4,14 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vite dev --port 3000", - "dev:e2e": "vite dev", - "build": "vite build && tsc --noEmit", - "start": "pnpx srvx --prod -s ../client dist/server/server.js", + "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", + "start": "node server.js", "test:e2e:mockMode": "rm -rf node_modules/.vite; rm -rf port*.txt; playwright test --project=chromium", "test:e2e:errorMode": "rm -rf node_modules/.vite; rm -rf port*.txt; BEHAVIOR=error playwright test --project=chromium", "test:e2e": "pnpm run test:e2e:mockMode && pnpm run test:e2e:errorMode" @@ -22,11 +26,28 @@ }, "devDependencies": { "@playwright/test": "^1.50.1", + "@rsbuild/core": "2.0.0", + "@rsbuild/plugin-react": "2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", + "@vitejs/plugin-react": "^6.0.1", "srvx": "^0.11.9", "typescript": "^6.0.2" + }, + "nx": { + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + } + ] + } } } diff --git a/e2e/react-start/import-protection/playwright.config.ts b/e2e/react-start/import-protection/playwright.config.ts index 67c9da8531..d21534629e 100644 --- a/e2e/react-start/import-protection/playwright.config.ts +++ b/e2e/react-start/import-protection/playwright.config.ts @@ -3,8 +3,14 @@ import { getTestServerPort } from '@tanstack/router-e2e-utils' import { isErrorMode } from './tests/utils/isErrorMode' import packageJson from './package.json' with { type: 'json' } -const PORT = await getTestServerPort(packageJson.name) +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const e2ePortKey = + process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +const distDir = process.env.E2E_DIST_DIR ?? 'dist' +const PORT = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` +const buildCommand = + toolchain === 'rsbuild' ? 'pnpm build:rsbuild' : 'pnpm build:vite' console.log('running in error mode:', isErrorMode.toString()) @@ -28,11 +34,17 @@ export default defineConfig({ ? {} : { webServer: { - command: `rm -f webserver-build.log webserver-dev.log violations.build.json violations.dev.json && VITE_SERVER_PORT=${PORT} pnpm build > webserver-build.log 2>&1 && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + command: `rm -f webserver-build.log webserver-dev.log violations.build.json violations.dev.json && VITE_SERVER_PORT=${PORT} PORT=${PORT} ${buildCommand} > webserver-build.log 2>&1 && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', cwd: import.meta.dirname, + env: { + PORT: String(PORT), + VITE_SERVER_PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, + }, }, }), diff --git a/e2e/react-start/import-protection/rsbuild.config.ts b/e2e/react-start/import-protection/rsbuild.config.ts new file mode 100644 index 0000000000..2547027028 --- /dev/null +++ b/e2e/react-start/import-protection/rsbuild.config.ts @@ -0,0 +1,19 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' +import { getStartModeConfig } from './start-mode-config' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' +const startModeConfig = getStartModeConfig() + +export default defineConfig({ + plugins: [pluginReact(), tanstackStart(startModeConfig)], + output: { + distPath: { + root: outDir, + }, + }, + server: { + port: 3000, + }, +}) diff --git a/e2e/react-start/import-protection/server.js b/e2e/react-start/import-protection/server.js new file mode 100644 index 0000000000..6d53885821 --- /dev/null +++ b/e2e/react-start/import-protection/server.js @@ -0,0 +1,57 @@ +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 resolveStartCommand() { + const distClientDir = resolveDistClientDir() + const distServerEntryPath = resolveDistServerEntryPath() + return `srvx --prod -s ${JSON.stringify(distClientDir)} ${JSON.stringify(distServerEntryPath)}` +} + +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/import-protection/start-mode-config.ts b/e2e/react-start/import-protection/start-mode-config.ts new file mode 100644 index 0000000000..bfdb20a2cd --- /dev/null +++ b/e2e/react-start/import-protection/start-mode-config.ts @@ -0,0 +1,13 @@ +export function getStartModeConfig() { + const behavior = (process.env.BEHAVIOR ?? 'mock') as 'mock' | 'error' + + return { + importProtection: { + behavior, + log: 'always' as const, + onViolation: (info: unknown) => { + void info + }, + }, + } +} diff --git a/e2e/react-start/import-protection/tests/error-mode.setup.ts b/e2e/react-start/import-protection/tests/error-mode.setup.ts index d90f3c0f62..aee425fb00 100644 --- a/e2e/react-start/import-protection/tests/error-mode.setup.ts +++ b/e2e/react-start/import-protection/tests/error-mode.setup.ts @@ -19,6 +19,10 @@ import type { FullConfig } from '@playwright/test' * `error-dev-result.json`. */ +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const e2ePortKey = + process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` + async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition @@ -65,6 +69,8 @@ async function killChild(child: ReturnType): Promise { } function captureBuild(cwd: string): void { + const buildCommand = + toolchain === 'rsbuild' ? 'pnpm build:rsbuild' : 'pnpm build:vite' const outFile = path.resolve(cwd, 'error-build-result.json') for (const f of ['error-build-result.json', 'error-build.log']) { const p = path.resolve(cwd, f) @@ -76,7 +82,7 @@ function captureBuild(cwd: string): void { let exitCode = 0 try { - const output = execSync('pnpm build', { + const output = execSync(buildCommand, { cwd, env: { ...process.env, BEHAVIOR: 'error' }, encoding: 'utf-8', @@ -114,12 +120,18 @@ async function captureDev(cwd: string): Promise { if (fs.existsSync(p)) fs.unlinkSync(p) } - const port = await getTestServerPort(`${packageJson.name}_error_dev`) + const port = await getTestServerPort(`${e2ePortKey}-error-dev`) const baseURL = `http://localhost:${port}` const logFile = path.resolve(cwd, 'error-dev.log') const out = fs.createWriteStream(logFile) - const child = spawn('pnpm', ['exec', 'vite', 'dev', '--port', String(port)], { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + const command = + toolchain === 'rsbuild' + ? ['exec', 'rsbuild', 'dev', '--port', String(port)] + : ['exec', 'vite', 'dev', '--port', String(port)] + + const child = spawn('pnpm', command, { cwd, env: { ...process.env, diff --git a/e2e/react-start/import-protection/tests/import-protection.spec.ts b/e2e/react-start/import-protection/tests/import-protection.spec.ts index 7a8dc8d870..7923a742e5 100644 --- a/e2e/react-start/import-protection/tests/import-protection.spec.ts +++ b/e2e/react-start/import-protection/tests/import-protection.spec.ts @@ -5,6 +5,8 @@ import { test } from '@tanstack/router-e2e-utils' import type { Violation } from './violations.utils' import type { Page } from '@playwright/test' +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + async function readViolations( type: 'build' | 'dev' | 'dev.cold' | 'dev.warm', ): Promise> { @@ -41,6 +43,39 @@ function findClientSecretServerFileViolation( ) } +function findBarrelReexportHits( + violations: Array, +): Array { + return violations.filter( + (v) => + v.envType === 'client' && + (v.importer.includes('barrel-reexport') || + v.importer.includes('barrel-false-positive') || + v.specifier.includes('db.server') || + v.resolved?.includes('barrel-reexport') || + v.trace.some( + (s) => + s.file.includes('barrel-reexport') || + s.file.includes('barrel-false-positive'), + )), + ) +} + +function findBarrelMarkerHits(violations: Array): Array { + return violations.filter( + (v) => + v.envType === 'client' && + (v.specifier.includes('server-only') || + v.specifier.includes('foo') || + v.resolved?.includes('foo')) && + v.trace.some( + (s) => + s.file.includes('barrel-reexport') || + s.file.includes('barrel-false-positive'), + ), + ) +} + test.use({ // The mock proxy returns undefined-ish values, which may cause // React rendering warnings — whitelist those @@ -240,7 +275,7 @@ for (const mode of ['build', 'dev'] as const) { x.envType === 'client' && (x.specifier.includes('secret.server') || x.resolved?.includes('secret.server')) && - !!x.snippet, + x.snippet?.lines.join('\n').includes('getSecret'), ) expect(v).toBeDefined() expect(v!.snippet).toBeDefined() @@ -669,7 +704,8 @@ for (const mode of ['build', 'dev', 'dev.warm'] as const) { // never imports foo at all. Both the .server module and the marker module // should NOT survive tree-shaking in the client bundle, so import-protection // must NOT flag violations for either in build mode. -// In dev mode there is no tree-shaking so the violation is expected (mock). +// Dev behavior is not part of this contract because barrel re-export diagnostics +// can warn or be elided depending on dev transform/chunk graph ordering. test('barrel-false-positive route loads in mock mode', async ({ page }) => { await page.goto('/barrel-false-positive') @@ -681,21 +717,7 @@ test('barrel-false-positive route loads in mock mode', async ({ page }) => { test('no false positive for barrel-reexport .server pattern in build', async () => { const violations = await readViolations('build') - const barrelHits = violations.filter( - (v) => - v.envType === 'client' && - (v.importer.includes('barrel-reexport') || - v.importer.includes('barrel-false-positive') || - v.specifier.includes('db.server') || - v.resolved?.includes('barrel-reexport') || - v.trace.some( - (s) => - s.file.includes('barrel-reexport') || - s.file.includes('barrel-false-positive'), - )), - ) - - expect(barrelHits).toEqual([]) + expect(findBarrelReexportHits(violations)).toEqual([]) }) test('no false positive for barrel-reexport marker pattern in build', async () => { @@ -704,20 +726,7 @@ test('no false positive for barrel-reexport marker pattern in build', async () = // foo.ts uses `import '@tanstack/react-start/server-only'` marker and is // re-exported through the barrel, but never imported by the route. // Tree-shaking should eliminate it — no marker violation should fire. - const markerHits = violations.filter( - (v) => - v.envType === 'client' && - (v.specifier.includes('server-only') || - v.specifier.includes('foo') || - v.resolved?.includes('foo')) && - v.trace.some( - (s) => - s.file.includes('barrel-reexport') || - s.file.includes('barrel-false-positive'), - ), - ) - - expect(markerHits).toEqual([]) + expect(findBarrelMarkerHits(violations)).toEqual([]) }) // noExternal .client package false positive: react-tweet's package.json diff --git a/e2e/react-start/import-protection/tests/violations.setup.ts b/e2e/react-start/import-protection/tests/violations.setup.ts index 6a10e6b1fd..1d9adf355f 100644 --- a/e2e/react-start/import-protection/tests/violations.setup.ts +++ b/e2e/react-start/import-protection/tests/violations.setup.ts @@ -9,6 +9,10 @@ import { extractViolationsFromLog } from './violations.utils' import type { FullConfig } from '@playwright/test' import type { Violation } from './violations.utils' +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const e2ePortKey = + process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` + async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() @@ -32,7 +36,13 @@ async function waitForHttpOk(url: string, timeoutMs: number): Promise { } function startDevServer(cwd: string, port: number): ReturnType { - return spawn('pnpm', ['exec', 'vite', 'dev', '--port', String(port)], { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + const command = + toolchain === 'rsbuild' + ? ['exec', 'rsbuild', 'dev', '--port', String(port)] + : ['exec', 'vite', 'dev', '--port', String(port)] + + return spawn('pnpm', command, { cwd, env: { ...process.env, @@ -170,9 +180,10 @@ async function runDevPass( * modules are pre-transformed so resolveId/transform paths differ. */ async function captureDevViolations(cwd: string): Promise { - const port = await getTestServerPort(`${packageJson.name}_dev`) - - const coldViolations = await runDevPass(cwd, port) + const coldViolations = await runDevPass( + cwd, + await getTestServerPort(`${e2ePortKey}-violations-cold`), + ) fs.writeFileSync( path.resolve(cwd, 'violations.dev.json'), @@ -184,7 +195,10 @@ async function captureDevViolations(cwd: string): Promise { ) // Warm pass: the .vite cache from the cold run is still on disk. - const warmViolations = await runDevPass(cwd, port) + const warmViolations = await runDevPass( + cwd, + await getTestServerPort(`${e2ePortKey}-violations-warm`), + ) fs.writeFileSync( path.resolve(cwd, 'violations.dev.warm.json'), diff --git a/e2e/react-start/import-protection/tests/violations.utils.ts b/e2e/react-start/import-protection/tests/violations.utils.ts index ebe2e53767..c08a9b7a82 100644 --- a/e2e/react-start/import-protection/tests/violations.utils.ts +++ b/e2e/react-start/import-protection/tests/violations.utils.ts @@ -29,6 +29,11 @@ export function stripAnsi(input: string): string { export function extractViolationsFromLog(text: string): Array { const out: Array = [] const lines = stripAnsi(text).split(/\r?\n/) + const stripBoxPrefix = (line: string) => + line + .replace(/^\s*│\s?/, '') + .replace(/^\s*\|\s?/, '') + .trimEnd() for (let i = 0; i < lines.length; i++) { const line = lines[i] ?? '' @@ -48,11 +53,15 @@ export function extractViolationsFromLog(text: string): Array { block.push(l) } - const importerLine = block.find((b) => + const normalizedBlock = block.map(stripBoxPrefix) + + const importerLine = normalizedBlock.find((b) => b.trimStart().startsWith('Importer:'), ) - const specLine = block.find((b) => b.trimStart().startsWith('Import:')) - const resolvedLine = block.find((b) => + const specLine = normalizedBlock.find((b) => + b.trimStart().startsWith('Import:'), + ) + const resolvedLine = normalizedBlock.find((b) => b.trimStart().startsWith('Resolved:'), ) @@ -66,7 +75,9 @@ export function extractViolationsFromLog(text: string): Array { ? resolvedLine.split('Resolved:')[1]!.trim() : undefined - const typeLine = block.find((b) => b.trimStart().startsWith('Denied by')) + const typeLine = normalizedBlock.find((b) => + b.trimStart().startsWith('Denied by'), + ) const type = typeLine?.includes('marker') ? 'marker' : typeLine?.includes('specifier') @@ -76,10 +87,10 @@ export function extractViolationsFromLog(text: string): Array { : 'unknown' const trace: Array = [] - const traceStart = block.findIndex((b) => b.trim() === 'Trace:') + const traceStart = normalizedBlock.findIndex((b) => b.trim() === 'Trace:') if (traceStart !== -1) { - for (let k = traceStart + 1; k < block.length; k++) { - const l = block[k] ?? '' + for (let k = traceStart + 1; k < normalizedBlock.length; k++) { + const l = normalizedBlock[k] ?? '' const m = l.match( /^\s*\d+\.\s+(.*?)(?:\s+\(entry\))?\s*(?:\(import "(.*)"\))?\s*$/, ) @@ -108,12 +119,12 @@ export function extractViolationsFromLog(text: string): Array { // Parse Code: snippet block let snippet: CodeSnippet | undefined - const codeStart = block.findIndex((b) => b.trim() === 'Code:') + const codeStart = normalizedBlock.findIndex((b) => b.trim() === 'Code:') if (codeStart !== -1) { const snippetLines: Array = [] let location: string | undefined - for (let k = codeStart + 1; k < block.length; k++) { - const l = block[k] ?? '' + for (let k = codeStart + 1; k < normalizedBlock.length; k++) { + const l = normalizedBlock[k] ?? '' // Snippet lines start with "> " or " " (marker + gutter + pipe) if (/^\s*[> ]\s*\d+\s*\|/.test(l) || /^\s+\|/.test(l)) { snippetLines.push(l) diff --git a/e2e/react-start/import-protection/vite.config.ts b/e2e/react-start/import-protection/vite.config.ts index edc5a6f6e9..0fd4b8acda 100644 --- a/e2e/react-start/import-protection/vite.config.ts +++ b/e2e/react-start/import-protection/vite.config.ts @@ -1,30 +1,20 @@ import path from 'node:path' import { defineConfig } from 'vite' import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { getStartModeConfig } from './start-mode-config' -// Allow env var to override the import protection behavior. -// Default: 'mock' (build completes, violations logged as warnings). -// Set BEHAVIOR=error to test that the build fails on violations. -const behavior = (process.env.BEHAVIOR ?? 'mock') as 'mock' | 'error' +const outDir = process.env.E2E_DIST_DIR ?? 'dist' +const startModeConfig = getStartModeConfig() export default defineConfig({ resolve: { tsconfigPaths: true }, + build: { + outDir, + }, server: { port: 3000, }, - plugins: [ - tanstackStart({ - importProtection: { - behavior, - log: 'always', - // Tests capture structured violations by overriding this hook. - // If unset, we avoid generating any violations*.json files. - onViolation: (info) => { - void info - }, - }, - }), - ], + plugins: [tanstackStart(startModeConfig)], // react-tweet's package.json exports resolve to `index.client.js` which // matches the default **/*.client.* deny pattern. Bundling it via // noExternal must NOT trigger a false-positive import-protection violation. diff --git a/e2e/react-start/rsc/package.json b/e2e/react-start/rsc/package.json index 8fba2be5e9..329e5356cc 100644 --- a/e2e/react-start/rsc/package.json +++ b/e2e/react-start/rsc/package.json @@ -4,11 +4,15 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vite dev --port 3000", - "dev:e2e": "vite dev --port $PORT", - "build": "vite build && tsc --noEmit", + "dev": "pnpm dev:vite --port 3000", + "dev:e2e": "pnpm dev:vite --port $PORT", + "dev:vite": "vite dev", + "dev:rsbuild": "rsbuild dev", + "build:rsbuild": "rsbuild build && tsc --noEmit", + "build": "pnpm build:vite", + "build:vite": "vite build && tsc --noEmit", "preview": "vite preview", - "start": "pnpx srvx --prod -s ../client ${E2E_DIST_DIR:-dist}/server/server.js", + "start": "node server.js", "test:e2e-full": "pnpm build && sh -c 'rm -f \"port-${E2E_PORT_KEY:-$npm_package_name}.txt\" \"port-${E2E_PORT_KEY:-$npm_package_name}-external.txt\"' && playwright test --project=chromium" }, "nx": { @@ -31,6 +35,8 @@ }, "devDependencies": { "@playwright/test": "^1.50.1", + "@rsbuild/core": "^2.0.0", + "@rsbuild/plugin-react": "^2.0.0", "@tanstack/eslint-plugin-start": "workspace:^", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", diff --git a/e2e/react-start/rsc/playwright.config.ts b/e2e/react-start/rsc/playwright.config.ts index b6c13c0798..9bb7586df5 100644 --- a/e2e/react-start/rsc/playwright.config.ts +++ b/e2e/react-start/rsc/playwright.config.ts @@ -1,9 +1,13 @@ import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { getTestServerPort } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name +const distDir = process.env.E2E_DIST_DIR ?? 'dist' if (process.env.TEST_WORKER_INDEX === undefined) { for (const portFile of [ @@ -15,6 +19,7 @@ if (process.env.TEST_WORKER_INDEX === undefined) { } const PORT = await getTestServerPort(e2ePortKey) +const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -30,10 +35,16 @@ export default defineConfig({ }, webServer: { - command: `PORT=${PORT} pnpm start`, + command: 'pnpm start', url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, + EXTERNAL_SERVER_URL: `http://localhost:${EXTERNAL_PORT}`, + }, }, projects: [ diff --git a/e2e/react-start/rsc/rsbuild.config.ts b/e2e/react-start/rsc/rsbuild.config.ts new file mode 100644 index 0000000000..9d34d884f5 --- /dev/null +++ b/e2e/react-start/rsc/rsbuild.config.ts @@ -0,0 +1,21 @@ +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({ splitChunks: false }), + tanstackStart({ + rsc: { + enabled: true, + }, + }), + ], + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/react-start/rsc/server.js b/e2e/react-start/rsc/server.js new file mode 100644 index 0000000000..6d53885821 --- /dev/null +++ b/e2e/react-start/rsc/server.js @@ -0,0 +1,57 @@ +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 resolveStartCommand() { + const distClientDir = resolveDistClientDir() + const distServerEntryPath = resolveDistServerEntryPath() + return `srvx --prod -s ${JSON.stringify(distClientDir)} ${JSON.stringify(distServerEntryPath)}` +} + +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/rsc/src/utils/conditionalCssServerComponent.tsx b/e2e/react-start/rsc/src/utils/conditionalCssServerComponent.tsx index ade65699b5..c249301e63 100644 --- a/e2e/react-start/rsc/src/utils/conditionalCssServerComponent.tsx +++ b/e2e/react-start/rsc/src/utils/conditionalCssServerComponent.tsx @@ -12,7 +12,6 @@ export const getConditionalCssServerComponent = createServerFn({ return renderServerComponent( <> - {import.meta.viteRsc.loadCss()} {branch === 'violet' ? ( ) : ( diff --git a/e2e/react-start/rsc/src/utils/cssModulesServerComponent.tsx b/e2e/react-start/rsc/src/utils/cssModulesServerComponent.tsx index 0e0d44af6f..b1d06bebe5 100644 --- a/e2e/react-start/rsc/src/utils/cssModulesServerComponent.tsx +++ b/e2e/react-start/rsc/src/utils/cssModulesServerComponent.tsx @@ -13,7 +13,6 @@ export const getCssModulesServerComponent = createServerFn({ method: 'GET' }) .handler(async ({ data }) => { return renderServerComponent( <> - {import.meta.viteRsc.loadCss()} , ) diff --git a/e2e/react-start/rsc/tests/rsc-client-preload.spec.ts b/e2e/react-start/rsc/tests/rsc-client-preload.spec.ts index 16b561e0db..202bd7bfc8 100644 --- a/e2e/react-start/rsc/tests/rsc-client-preload.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-client-preload.spec.ts @@ -163,6 +163,7 @@ test.describe('RSC Client Component Preload Tests', () => { // Verify the HTML contains the client widget with a CSS module class expect(html).toContain('data-testid="client-widget"') // The class should be a hashed CSS module class (contains underscore from module hash) - expect(html).toMatch(/class="[^"]*_widget_[^"]*"/) + // Accept Vite `_widget_xxx` or Rspack `widget-xxx` scoped CSS module names + expect(html).toMatch(/class="[^"]*(?:_widget_|widget[-_])[\w-]+[^"]*"/) }) }) 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 786e0bb773..f5d8e04928 100644 --- a/e2e/react-start/rsc/tests/rsc-css-preload-complex.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-css-preload-complex.spec.ts @@ -116,15 +116,15 @@ test.describe('RSC Complex CSS Preload Tests', () => { test('CSS module classes are scoped for all widgets', async ({ page }) => { await page.goto('/rsc-css-preload-complex') - // Widget A classes should be hashed + // Widget A classes should be hashed (accept Vite `_widget_xxx` or Rspack `widget-xxx` scoped names) const widgetA = page.locator('[data-testid="client-widget-a"]') const widgetAClass = await widgetA.getAttribute('class') - expect(widgetAClass).toMatch(/_widget_/) + 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(/_widget_/) + expect(widgetBClass).toMatch(/(^|\s)(_widget_|widget[-_])[\w-]+/) // Classes should be different (different modules) expect(widgetAClass).not.toBe(widgetBClass) diff --git a/e2e/react-start/serialization-adapters/src/routes/server-function/late-raw-stream.tsx b/e2e/react-start/serialization-adapters/src/routes/server-function/late-raw-stream.tsx index fc20f3d086..e0d5311349 100644 --- a/e2e/react-start/serialization-adapters/src/routes/server-function/late-raw-stream.tsx +++ b/e2e/react-start/serialization-adapters/src/routes/server-function/late-raw-stream.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' -import { createServerFn, RawStream } from '@tanstack/react-start' +import { RawStream, createServerFn } from '@tanstack/react-start' import { Suspense, use, useEffect, useState } from 'react' /** diff --git a/e2e/react-start/server-functions/package.json b/e2e/react-start/server-functions/package.json index 29a83802a5..2584bc2dec 100644 --- a/e2e/react-start/server-functions/package.json +++ b/e2e/react-start/server-functions/package.json @@ -4,12 +4,16 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vite dev --port 3000", - "dev:e2e": "vite dev", - "build": "vite build && tsc --noEmit", + "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": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" + "start": "node server.js", + "test:e2e": "rm -rf port*.txt && pnpm build && playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.90.0", @@ -27,6 +31,9 @@ }, "devDependencies": { "@playwright/test": "^1.50.1", + "@rsbuild/core": "^2.0.0", + "@rsbuild/plugin-react": "^2.0.0", + "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/js-cookie": "^3.0.6", @@ -38,5 +45,19 @@ "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "typescript": "^6.0.2" + }, + "nx": { + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + } + ] + } } } diff --git a/e2e/react-start/server-functions/playwright.config.ts b/e2e/react-start/server-functions/playwright.config.ts index 8330e023ee..3e8274d3f0 100644 --- a/e2e/react-start/server-functions/playwright.config.ts +++ b/e2e/react-start/server-functions/playwright.config.ts @@ -2,7 +2,10 @@ import { defineConfig, devices } from '@playwright/test' import { getTestServerPort } from '@tanstack/router-e2e-utils' import packageJson from './package.json' with { type: 'json' } -export const PORT = await getTestServerPort(packageJson.name) +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name +const distDir = process.env.E2E_DIST_DIR ?? 'dist' + +export const PORT = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` /** @@ -20,10 +23,16 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + command: `PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', + env: { + PORT: String(PORT), + VITE_SERVER_PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, + }, }, projects: [ diff --git a/e2e/react-start/server-functions/postcss.config.mjs b/e2e/react-start/server-functions/postcss.config.mjs new file mode 100644 index 0000000000..a7f73a2d1d --- /dev/null +++ b/e2e/react-start/server-functions/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + '@tailwindcss/postcss': {}, + }, +} diff --git a/e2e/react-start/server-functions/rsbuild.config.ts b/e2e/react-start/server-functions/rsbuild.config.ts new file mode 100644 index 0000000000..23072b6c1b --- /dev/null +++ b/e2e/react-start/server-functions/rsbuild.config.ts @@ -0,0 +1,16 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' +import { getStartModeConfig } from './start-mode-config' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' +const startModeConfig = getStartModeConfig() + +export default defineConfig({ + plugins: [pluginReact(), tanstackStart(startModeConfig)], + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/react-start/server-functions/server.js b/e2e/react-start/server-functions/server.js new file mode 100644 index 0000000000..6d53885821 --- /dev/null +++ b/e2e/react-start/server-functions/server.js @@ -0,0 +1,57 @@ +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 resolveStartCommand() { + const distClientDir = resolveDistClientDir() + const distServerEntryPath = resolveDistServerEntryPath() + return `srvx --prod -s ${JSON.stringify(distClientDir)} ${JSON.stringify(distServerEntryPath)}` +} + +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/server-functions/src/routes/__root.tsx b/e2e/react-start/server-functions/src/routes/__root.tsx index 5dec927337..de29a1780f 100644 --- a/e2e/react-start/server-functions/src/routes/__root.tsx +++ b/e2e/react-start/server-functions/src/routes/__root.tsx @@ -10,7 +10,7 @@ import { import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' import { NotFound } from '~/components/NotFound' -import appCss from '~/styles/app.css?url' +import '~/styles/app.css' export const Route = createRootRouteWithContext<{ foo: { bar: string } }>()({ head: () => ({ @@ -23,7 +23,6 @@ export const Route = createRootRouteWithContext<{ foo: { bar: string } }>()({ content: 'width=device-width, initial-scale=1', }, ], - links: [{ rel: 'stylesheet', href: appCss }], }), errorComponent: (props) => { return ( diff --git a/e2e/react-start/server-functions/start-mode-config.ts b/e2e/react-start/server-functions/start-mode-config.ts new file mode 100644 index 0000000000..ba75b59693 --- /dev/null +++ b/e2e/react-start/server-functions/start-mode-config.ts @@ -0,0 +1,21 @@ +const FUNCTION_IDS: Record> = { + 'src/routes/submit-post-formdata.tsx': { + greetUser_createServerFn_handler: 'submit-post-formdata-greetUser', + }, + 'src/routes/formdata-redirect/index.tsx': { + greetUser_createServerFn_handler: 'formdata-redirect-greetUser', + }, +} + +export function getStartModeConfig() { + return { + serverFns: { + generateFunctionId: (opts: { + filename: string + functionName: string + }) => { + return FUNCTION_IDS[opts.filename]?.[opts.functionName] + }, + }, + } +} diff --git a/e2e/react-start/server-functions/tests/server-functions.spec.ts b/e2e/react-start/server-functions/tests/server-functions.spec.ts index 5eaf8e66cc..4173362e4c 100644 --- a/e2e/react-start/server-functions/tests/server-functions.spec.ts +++ b/e2e/react-start/server-functions/tests/server-functions.spec.ts @@ -4,7 +4,8 @@ import { getTestServerPort, test } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } import type { Page } from '@playwright/test' -const PORT = await getTestServerPort(packageJson.name) +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name +const PORT = await getTestServerPort(e2ePortKey) test('Server function URLs correctly include explicit ids', async ({ page, diff --git a/e2e/react-start/server-functions/vite.config.ts b/e2e/react-start/server-functions/vite.config.ts index 025df5ea60..3372eb1ca6 100644 --- a/e2e/react-start/server-functions/vite.config.ts +++ b/e2e/react-start/server-functions/vite.config.ts @@ -2,27 +2,15 @@ import { defineConfig } from 'vite' import { tanstackStart } from '@tanstack/react-start/plugin/vite' import viteReact from '@vitejs/plugin-react' import tailwindcss from '@tailwindcss/vite' +import { getStartModeConfig } from './start-mode-config' -const FUNCTION_IDS: Record> = { - 'src/routes/submit-post-formdata.tsx': { - greetUser_createServerFn_handler: 'submit-post-formdata-greetUser', - }, - 'src/routes/formdata-redirect/index.tsx': { - greetUser_createServerFn_handler: 'formdata-redirect-greetUser', - }, -} +const outDir = process.env.E2E_DIST_DIR ?? 'dist' +const startModeConfig = getStartModeConfig() export default defineConfig({ resolve: { tsconfigPaths: true }, - plugins: [ - tailwindcss(), - tanstackStart({ - serverFns: { - generateFunctionId: (opts) => { - return FUNCTION_IDS[opts.filename]?.[opts.functionName] - }, - }, - }), - viteReact(), - ], + build: { + outDir, + }, + plugins: [tailwindcss(), tanstackStart(startModeConfig), viteReact()], }) diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json index e166a886ba..29dbf36e6a 100644 --- a/e2e/solid-start/basic/package.json +++ b/e2e/solid-start/basic/package.json @@ -28,6 +28,10 @@ }, "devDependencies": { "@playwright/test": "^1.50.1", + "@rsbuild/core": "^2.0.0", + "@rsbuild/plugin-babel": "^1.1.2", + "@rsbuild/plugin-solid": "^1.1.1", + "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/js-cookie": "^3.0.6", @@ -57,6 +61,10 @@ { "toolchain": "vite", "mode": "preview" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" } ] } diff --git a/e2e/solid-start/basic/postcss.config.mjs b/e2e/solid-start/basic/postcss.config.mjs new file mode 100644 index 0000000000..a7f73a2d1d --- /dev/null +++ b/e2e/solid-start/basic/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + '@tailwindcss/postcss': {}, + }, +} diff --git a/e2e/solid-start/basic/rsbuild.config.ts b/e2e/solid-start/basic/rsbuild.config.ts new file mode 100644 index 0000000000..ea04a3167a --- /dev/null +++ b/e2e/solid-start/basic/rsbuild.config.ts @@ -0,0 +1,21 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginBabel } from '@rsbuild/plugin-babel' +import { pluginSolid } from '@rsbuild/plugin-solid' +import { tanstackStart } from '@tanstack/solid-start/plugin/rsbuild' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + plugins: [ + pluginBabel({ + include: /\.(?:jsx|tsx)$/, + }), + pluginSolid(), + tanstackStart(), + ], + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/solid-start/basic/server.js b/e2e/solid-start/basic/server.js index 9db7619ae1..e26ac7e49f 100644 --- a/e2e/solid-start/basic/server.js +++ b/e2e/solid-start/basic/server.js @@ -1,4 +1,5 @@ import { toNodeHandler } from 'srvx/node' +import fs from 'node:fs' import path from 'node:path' import express from 'express' import { createProxyMiddleware } from 'http-proxy-middleware' @@ -11,9 +12,23 @@ const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' const distDir = process.env.E2E_DIST_DIR || 'dist' const distClientDir = path.resolve(distDir, 'client') -const distServerEntryPath = path.resolve(distDir, 'server', 'server.js') + +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 async function createStartServer() { + const distServerEntryPath = resolveDistServerEntryPath() const server = (await import(distServerEntryPath)).default const nodeHandler = toNodeHandler(server.fetch) diff --git a/e2e/solid-start/basic/src/routes/__root.tsx b/e2e/solid-start/basic/src/routes/__root.tsx index 3b1ec274f5..549f10e579 100644 --- a/e2e/solid-start/basic/src/routes/__root.tsx +++ b/e2e/solid-start/basic/src/routes/__root.tsx @@ -10,7 +10,7 @@ import { import { TanStackRouterDevtoolsInProd } from '@tanstack/solid-router-devtools' import { HydrationScript } from 'solid-js/web' import { NotFound } from '~/components/NotFound' -import appCss from '~/styles/app.css?url' +import '~/styles/app.css' import { seo } from '~/utils/seo' export const Route = createRootRoute({ @@ -27,7 +27,6 @@ export const Route = createRootRoute({ }), ], links: [ - { rel: 'stylesheet', href: appCss }, { rel: 'apple-touch-icon', sizes: '180x180', diff --git a/e2e/vue-start/basic-vue-query/src/utils/posts.tsx b/e2e/vue-start/basic-vue-query/src/utils/posts.tsx index 7f1f564645..b0a0b8f60d 100644 --- a/e2e/vue-start/basic-vue-query/src/utils/posts.tsx +++ b/e2e/vue-start/basic-vue-query/src/utils/posts.tsx @@ -7,6 +7,12 @@ export type PostType = { body: string } +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} + export const postsQueryOptions = () => queryOptions({ queryKey: ['posts'], @@ -14,7 +20,7 @@ export const postsQueryOptions = () => console.info('Fetching posts...') await new Promise((r) => setTimeout(r, 500)) return axios - .get>('https://jsonplaceholder.typicode.com/posts') + .get>(`${queryURL}/posts`) .then((r) => r.data.slice(0, 10)) }, }) @@ -27,7 +33,7 @@ export const postQueryOptions = (postId: string) => await new Promise((r) => setTimeout(r, 500)) return axios - .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) + .get(`${queryURL}/posts/${postId}`) .then((r) => r.data) }, }) diff --git a/e2e/vue-start/basic/package.json b/e2e/vue-start/basic/package.json index 6950d738ea..d09014951a 100644 --- a/e2e/vue-start/basic/package.json +++ b/e2e/vue-start/basic/package.json @@ -28,6 +28,11 @@ }, "devDependencies": { "@playwright/test": "^1.50.1", + "@rsbuild/core": "^2.0.0", + "@rsbuild/plugin-babel": "^1.0.5", + "@rsbuild/plugin-vue": "^1.2.2", + "@rsbuild/plugin-vue-jsx": "^1.1.1", + "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/js-cookie": "^3.0.6", @@ -58,6 +63,10 @@ { "toolchain": "vite", "mode": "preview" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" } ] } diff --git a/e2e/vue-start/basic/postcss.config.mjs b/e2e/vue-start/basic/postcss.config.mjs new file mode 100644 index 0000000000..a7f73a2d1d --- /dev/null +++ b/e2e/vue-start/basic/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + '@tailwindcss/postcss': {}, + }, +} diff --git a/e2e/vue-start/basic/rsbuild.config.ts b/e2e/vue-start/basic/rsbuild.config.ts new file mode 100644 index 0000000000..93af798c3c --- /dev/null +++ b/e2e/vue-start/basic/rsbuild.config.ts @@ -0,0 +1,34 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginBabel } from '@rsbuild/plugin-babel' +import { pluginVue } from '@rsbuild/plugin-vue' +import { pluginVueJsx } from '@rsbuild/plugin-vue-jsx' +import { tanstackStart } from '@tanstack/vue-start/plugin/rsbuild' +import { isPrerender } from './tests/utils/isPrerender' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + plugins: [ + pluginBabel({ + include: /\.(?:jsx|tsx)$/, + }), + pluginVue(), + pluginVueJsx(), + tanstackStart(), + ], + performance: { + chunkSplit: { + strategy: 'split-by-experience', + }, + }, + source: { + define: { + __TSR_PRERENDER__: JSON.stringify(isPrerender), + }, + }, + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/vue-start/basic/server.js b/e2e/vue-start/basic/server.js index 9db7619ae1..e26ac7e49f 100644 --- a/e2e/vue-start/basic/server.js +++ b/e2e/vue-start/basic/server.js @@ -1,4 +1,5 @@ import { toNodeHandler } from 'srvx/node' +import fs from 'node:fs' import path from 'node:path' import express from 'express' import { createProxyMiddleware } from 'http-proxy-middleware' @@ -11,9 +12,23 @@ const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' const distDir = process.env.E2E_DIST_DIR || 'dist' const distClientDir = path.resolve(distDir, 'client') -const distServerEntryPath = path.resolve(distDir, 'server', 'server.js') + +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 async function createStartServer() { + const distServerEntryPath = resolveDistServerEntryPath() const server = (await import(distServerEntryPath)).default const nodeHandler = toNodeHandler(server.fetch) diff --git a/e2e/vue-start/basic/src/routes/__root.tsx b/e2e/vue-start/basic/src/routes/__root.tsx index 45b729c19c..8ebb8cec58 100644 --- a/e2e/vue-start/basic/src/routes/__root.tsx +++ b/e2e/vue-start/basic/src/routes/__root.tsx @@ -11,7 +11,7 @@ import { import { TanStackRouterDevtoolsInProd } from '@tanstack/vue-router-devtools' import { NotFound } from '~/components/NotFound' -import appCss from '~/styles/app.css?url' +import '~/styles/app.css' import { seo } from '~/utils/seo' export const Route = createRootRoute({ @@ -28,7 +28,6 @@ export const Route = createRootRoute({ }), ], links: [ - { rel: 'stylesheet', href: appCss }, { rel: 'apple-touch-icon', sizes: '180x180', diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index c3235f6ec7..501d4d1085 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -18,6 +18,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", + "react-refresh": "^0.18.0", "swc-loader": "^0.2.6", "typescript": "^6.0.2", "webpack": "^5.97.1", diff --git a/examples/react/quickstart-webpack-file-based/webpack.config.js b/examples/react/quickstart-webpack-file-based/webpack.config.js index d83e2bea10..878d2a9735 100644 --- a/examples/react/quickstart-webpack-file-based/webpack.config.js +++ b/examples/react/quickstart-webpack-file-based/webpack.config.js @@ -23,7 +23,11 @@ export default ({ WEBPACK_SERVE }) => ({ template: path.resolve(__dirname, './public/index.html'), filename: 'index.html', }), - tanstackRouter({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ + target: 'react', + autoCodeSplitting: true, + codeSplittingOptions: { addHmr: Boolean(WEBPACK_SERVE) }, + }), ], module: { rules: [ diff --git a/packages/react-router-devtools/src/TanStackRouterDevtools.tsx b/packages/react-router-devtools/src/TanStackRouterDevtools.tsx index 925e7687e9..2248d27ef6 100644 --- a/packages/react-router-devtools/src/TanStackRouterDevtools.tsx +++ b/packages/react-router-devtools/src/TanStackRouterDevtools.tsx @@ -1,3 +1,5 @@ +'use client' + import { TanStackRouterDevtoolsCore } from '@tanstack/router-devtools-core' import { Fragment, useEffect, useRef, useState } from 'react' import { useRouter, useRouterState } from '@tanstack/react-router' diff --git a/packages/react-router-devtools/src/TanStackRouterDevtoolsPanel.tsx b/packages/react-router-devtools/src/TanStackRouterDevtoolsPanel.tsx index 46118bf2e6..ee7fba313b 100644 --- a/packages/react-router-devtools/src/TanStackRouterDevtoolsPanel.tsx +++ b/packages/react-router-devtools/src/TanStackRouterDevtoolsPanel.tsx @@ -1,3 +1,5 @@ +'use client' + import { useRouter, useRouterState } from '@tanstack/react-router' import { TanStackRouterDevtoolsPanelCore } from '@tanstack/router-devtools-core' import React, { useEffect, useRef, useState } from 'react' diff --git a/packages/react-router-devtools/src/index.ts b/packages/react-router-devtools/src/index.ts index 3db31a9b73..e711869ce8 100644 --- a/packages/react-router-devtools/src/index.ts +++ b/packages/react-router-devtools/src/index.ts @@ -1,3 +1,5 @@ +'use client' + import * as Devtools from './TanStackRouterDevtools' import * as DevtoolsPanel from './TanStackRouterDevtoolsPanel' diff --git a/packages/react-router/src/Asset.tsx b/packages/react-router/src/Asset.tsx index 5ad2e01516..387b7a1d1f 100644 --- a/packages/react-router/src/Asset.tsx +++ b/packages/react-router/src/Asset.tsx @@ -216,6 +216,7 @@ function Script({ if (attrs?.src) { return @@ -26,6 +34,29 @@ export function Asset({ } } +function InlineCssStyle({ + attrs, + children, +}: { + attrs?: Record + children?: RouterManagedTag['children'] +}) { + const isInlineCssPlaceholder = children === undefined + const html = isInlineCssPlaceholder + ? typeof document === 'undefined' + ? '' + : (document.querySelector( + `style[${INLINE_CSS_HYDRATION_ATTR}]`, + )?.textContent ?? '') + : (children ?? '') + + return ( + + ) +} + interface ScriptAttrs { [key: string]: string | boolean | undefined src?: string diff --git a/packages/solid-router/src/headContentUtils.tsx b/packages/solid-router/src/headContentUtils.tsx index 853daa5c3b..7886ba4696 100644 --- a/packages/solid-router/src/headContentUtils.tsx +++ b/packages/solid-router/src/headContentUtils.tsx @@ -2,6 +2,7 @@ import * as Solid from 'solid-js' import { escapeHtml, getAssetCrossOrigin, + isInlinableStylesheet, replaceEqualDeep, resolveManifestAssetLink, } from '@tanstack/router-core' @@ -117,20 +118,42 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => { .map((match) => manifest?.routes[match.routeId]?.assets ?? []) .filter(Boolean) .flat(1) - .filter((asset) => asset.tag === 'link') - .map( - (asset) => - ({ - tag: 'link', - attrs: { - ...asset.attrs, - crossOrigin: - getAssetCrossOrigin(assetCrossOrigin, 'stylesheet') ?? - asset.attrs?.crossOrigin, - nonce, + .flatMap((asset): Array => { + if (asset.tag === 'link') { + if (isInlinableStylesheet(manifest, asset)) { + return [] + } + + return [ + { + tag: 'link', + attrs: { + ...asset.attrs, + crossOrigin: + getAssetCrossOrigin(assetCrossOrigin, 'stylesheet') ?? + asset.attrs?.crossOrigin, + nonce, + }, }, - }) satisfies RouterManagedTag, - ) + ] + } + + if (asset.tag === 'style') { + return [ + { + tag: 'style', + attrs: { + ...asset.attrs, + nonce, + }, + children: asset.children, + ...(asset.inlineCss ? { inlineCss: true as const } : {}), + }, + ] + } + + return [] + }) return [...constructed, ...assets] }) diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index ed9335ec4b..8e70f34986 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -98,6 +98,7 @@ "seroval": "^1.5.0", "cheerio": "^1.0.0", "exsolve": "^1.0.7", + "lightningcss": "^1.32.0", "pathe": "^2.0.3", "picomatch": "^4.0.3", "srvx": "^0.11.9", 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 bc0234095d..b349b68040 100644 --- a/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts +++ b/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts @@ -1,4 +1,5 @@ import { tsrSplit } from '@tanstack/router-plugin' +import { getCssAssetSource } from '../start-manifest-plugin/inlineCss' import { RSBUILD_ENVIRONMENT_NAMES } from './planning' import type { RsbuildPluginAPI, Rspack } from '@rsbuild/core' import type { NormalizedClientBuild, NormalizedClientChunk } from '../types' @@ -162,6 +163,7 @@ export function normalizeRspackClientBuild( const chunksByFileName = new Map() const chunkFileNamesByRouteFilePath = new Map>() const cssFilesBySourcePath = new Map>() + const cssContentByFileName = new Map() let entryChunkFileName: string | undefined // Collect all initial JS file names from the main entry for computing @@ -272,6 +274,17 @@ export function normalizeRspackClientBuild( throw new Error('No entry file found in rspack client build') } + for (const asset of compilation.getAssets()) { + if (!asset.name.endsWith('.css')) { + continue + } + + const css = getCssAssetSource(asset.source.source()) + if (css !== undefined) { + cssContentByFileName.set(asset.name, css) + } + } + // In RSC mode, CSS from server components is associated with the 'rsc' // client entry chunk (not the main 'index' entry). The manifest builder // merges the entry chunk's CSS into __root__, so by appending RSC CSS @@ -299,6 +312,7 @@ export function normalizeRspackClientBuild( chunksByFileName, chunkFileNamesByRouteFilePath, cssFilesBySourcePath, + cssContentByFileName, } } diff --git a/packages/start-plugin-core/src/rsbuild/plugin.ts b/packages/start-plugin-core/src/rsbuild/plugin.ts index 6ac23451ab..81d526dd1e 100644 --- a/packages/start-plugin-core/src/rsbuild/plugin.ts +++ b/packages/start-plugin-core/src/rsbuild/plugin.ts @@ -161,6 +161,7 @@ export function tanStackStartRsbuild( routerBasepath, serverFnBase: startConfig.serverFns.base, }) + const inlineCssEnabled = !isDev && startConfig.server.build.inlineCss return mergeRsbuildConfig(rsbuildConfig, { source: { @@ -188,6 +189,12 @@ export function tanStackStartRsbuild( 'import.meta.env.TSS_DEV_SSR_STYLES_BASEPATH': JSON.stringify( resolvedStartConfig.basePaths.publicBase, ), + 'process.env.TSS_INLINE_CSS_ENABLED': JSON.stringify( + inlineCssEnabled ? 'true' : 'false', + ), + 'import.meta.env.TSS_INLINE_CSS_ENABLED': JSON.stringify( + inlineCssEnabled ? 'true' : 'false', + ), }, }, server: { diff --git a/packages/start-plugin-core/src/rsbuild/virtual-modules.ts b/packages/start-plugin-core/src/rsbuild/virtual-modules.ts index a084164aa3..2f7d92a4d4 100644 --- a/packages/start-plugin-core/src/rsbuild/virtual-modules.ts +++ b/packages/start-plugin-core/src/rsbuild/virtual-modules.ts @@ -76,33 +76,39 @@ export const tsrStartManifest = () => globalThis[${JSON.stringify(DEV_START_MANI function buildStartManifestData( clientBuild: NormalizedClientBuild, publicBase: string, + inlineCss: boolean, ) { const routeTreeRoutes = globalThis.TSS_ROUTES_MANIFEST return buildStartManifest({ clientBuild, routeTreeRoutes, basePath: publicBase, + inlineCss, }) } function serializeStartManifestData( clientBuild: NormalizedClientBuild, publicBase: string, + inlineCss: boolean, ): string { - return JSON.stringify(buildStartManifestData(clientBuild, publicBase)) + return JSON.stringify( + buildStartManifestData(clientBuild, publicBase, inlineCss), + ) } function generateManifestModuleBuild( clientBuild: NormalizedClientBuild | undefined, publicBase: string, _devClientEntryUrl: string, + inlineCss: boolean, ): string { if (!clientBuild) { return `const tsrStartManifestData = ${JSON.stringify(START_MANIFEST_PLACEHOLDER)} export const tsrStartManifest = () => tsrStartManifestData` } - return `export const tsrStartManifest = () => (${serializeStartManifestData(clientBuild, publicBase)})` + return `export const tsrStartManifest = () => (${serializeStartManifestData(clientBuild, publicBase, inlineCss)})` } // --------------------------------------------------------------------------- @@ -345,7 +351,7 @@ export function registerVirtualModules( // Generate initial content for each virtual module per environment function getInitialContent(environmentName: string): Record { // Safe to call getConfig() here — this runs inside modifyRspackConfig - const { resolvedStartConfig } = opts.getConfig() + const { resolvedStartConfig, startConfig } = opts.getConfig() const isServerEnv = environmentName === RSBUILD_ENVIRONMENT_NAMES.server const isClientEnv = environmentName === RSBUILD_ENVIRONMENT_NAMES.client const content: Record = {} @@ -361,6 +367,7 @@ export function registerVirtualModules( clientBuild, resolvedStartConfig.basePaths.publicBase, devClientEntryUrl, + startConfig.server.build.inlineCss, ) } else { content[paths.manifest] = 'export default {}' @@ -495,7 +502,7 @@ export function createFromReadableStream() { throw new Error('RSC SSR decode is }, generateManifestContent(newClientBuild: NormalizedClientBuild): string { - const { resolvedStartConfig } = opts.getConfig() + const { resolvedStartConfig, startConfig } = opts.getConfig() const devClientEntryUrl = opts.getDevClientEntryUrl( resolvedStartConfig.basePaths.publicBase, ) @@ -503,16 +510,18 @@ export function createFromReadableStream() { throw new Error('RSC SSR decode is newClientBuild, resolvedStartConfig.basePaths.publicBase, devClientEntryUrl, + !isDev && startConfig.server.build.inlineCss, ) }, generateManifestValueLiteral( newClientBuild: NormalizedClientBuild, ): string { - const { resolvedStartConfig } = opts.getConfig() + const { resolvedStartConfig, startConfig } = opts.getConfig() return serializeStartManifestData( newClientBuild, resolvedStartConfig.basePaths.publicBase, + !isDev && startConfig.server.build.inlineCss, ) }, @@ -528,6 +537,7 @@ export function createFromReadableStream() { throw new Error('RSC SSR decode is )[DEV_START_MANIFEST_GLOBAL] = buildStartManifestData( clientBuild, resolvedStartConfig.basePaths.publicBase, + false, ) } }, diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index 58a2b77470..e0287858e6 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -209,6 +209,12 @@ export const tanstackStartOptionsObjectSchema = z.object({ build: z .object({ staticNodeEnv: z.boolean().optional().default(true), + /** + * Inline route CSS into the server-rendered HTML response. + * + * @experimental This option is experimental! + */ + inlineCss: z.boolean().optional().default(false), }) .optional() .default({}), diff --git a/packages/start-plugin-core/src/start-manifest-plugin/inlineCss.ts b/packages/start-plugin-core/src/start-manifest-plugin/inlineCss.ts new file mode 100644 index 0000000000..432f0738ba --- /dev/null +++ b/packages/start-plugin-core/src/start-manifest-plugin/inlineCss.ts @@ -0,0 +1,93 @@ +import { transform } from 'lightningcss' + +const cssUrlPattern = + /url\(\s*(?:"([^"]*)"|'([^']*)'|([^)"']*?))\s*\)|@import\s+(?:url\(\s*(?:"([^"]*)"|'([^']*)'|([^)"']*?))\s*\)|"([^"]*)"|'([^']*)')/gi + +function isRelativeCssUrl(url: string) { + if (!url) return false + if (url.startsWith('#')) return false + if (url.startsWith('/')) return false + if (/^[a-z][a-z\d+.-]*:/i.test(url)) return false + return true +} + +export function shouldRebaseInlineCssUrls(css: string) { + cssUrlPattern.lastIndex = 0 + + for (const match of css.matchAll(cssUrlPattern)) { + const url = ( + match[1] ?? + match[2] ?? + match[3] ?? + match[4] ?? + match[5] ?? + match[6] ?? + match[7] ?? + match[8] ?? + '' + ).trim() + + if (isRelativeCssUrl(url)) { + return true + } + } + + return false +} + +function rebaseCssUrl(url: string, cssHref: string) { + if (!isRelativeCssUrl(url)) { + return url + } + + const fakeOrigin = 'http://tanstack.local' + const resolved = new URL(url, new URL(cssHref, fakeOrigin)) + + if (resolved.origin === fakeOrigin) { + return `${resolved.pathname}${resolved.search}${resolved.hash}` + } + + return resolved.href +} + +export function rebaseInlineCssUrls(options: { css: string; cssHref: string }) { + const css = options.css.trim() + + if (!shouldRebaseInlineCssUrls(css)) { + return css + } + + const result = transform({ + filename: options.cssHref, + code: Buffer.from(css), + minify: true, + visitor: { + Url(url) { + return { + ...url, + url: rebaseCssUrl(url.url, options.cssHref), + } + }, + Rule: { + import(rule: any) { + return { + ...rule, + value: { + ...rule.value, + url: rebaseCssUrl(rule.value.url, options.cssHref), + }, + } + }, + }, + }, + }) + + return Buffer.from(result.code).toString('utf8') +} + +export function getCssAssetSource(source: unknown) { + if (typeof source === 'string') return source + if (source instanceof Uint8Array) return Buffer.from(source).toString('utf8') + if (source == null) return undefined + return String(source) +} 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 83285a60e8..1c52d124eb 100644 --- a/packages/start-plugin-core/src/start-manifest-plugin/manifestBuilder.ts +++ b/packages/start-plugin-core/src/start-manifest-plugin/manifestBuilder.ts @@ -1,12 +1,17 @@ /* eslint-disable @typescript-eslint/prefer-for-of */ import { serialize } from 'seroval' import { joinURL } from 'ufo' -import { resolveManifestAssetLink, rootRouteId } from '@tanstack/router-core' +import { + getStylesheetHref, + resolveManifestAssetLink, + rootRouteId, +} from '@tanstack/router-core' import { getRouteFilePathsFromModuleIds, normalizeViteClientBuild, normalizeViteClientChunk, } from '../vite/start-manifest-plugin/normalized-client-build' +import { rebaseInlineCssUrls } from './inlineCss' import type { ManifestAssetLink, RouterManagedTag } from '@tanstack/router-core' import type { NormalizedClientBuild, NormalizedClientChunk } from '../types' @@ -42,6 +47,9 @@ type DedupeRoute = { export interface StartManifest { routes: Record clientEntry: string + inlineCss?: { + styles: Record + } } export function appendUniqueStrings( @@ -152,6 +160,7 @@ export function buildStartManifest(options: { clientBuild: NormalizedClientBuild routeTreeRoutes: RouteTreeRoutes basePath: string + inlineCss?: boolean additionalRouteAssets?: Partial< Record> > @@ -180,10 +189,20 @@ export function buildStartManifest(options: { } } - return { + const result: StartManifest = { routes, clientEntry: assetResolvers.getAssetPath(scannedChunks.entryChunk.fileName), } + + if (options.inlineCss) { + result.inlineCss = buildInlineCssManifestData({ + routes, + basePath: options.basePath, + cssContentByFileName: options.clientBuild.cssContentByFileName, + }) + } + + return result } export function serializeStartManifest(startManifest: StartManifest) { @@ -347,6 +366,57 @@ export function createChunkCssAssetCollector(options: { return { getChunkCssAssets } } +function buildInlineCssManifestData(options: { + routes: Record + basePath: string + cssContentByFileName: ReadonlyMap | undefined +}): StartManifest['inlineCss'] { + const stylesheetHrefs = new Set() + + for (const route of Object.values(options.routes)) { + for (const asset of route.assets ?? []) { + const href = getStylesheetHref(asset) + if (href) { + stylesheetHrefs.add(href) + } + } + } + + if (stylesheetHrefs.size === 0) { + return { styles: {} } + } + + if (!options.cssContentByFileName) { + throw new Error( + 'TanStack Start inlineCss is enabled, but the client build did not provide CSS content', + ) + } + + const { getAssetPath } = createManifestAssetResolvers(options.basePath) + const styles: Record = {} + const missingHrefs = new Set(stylesheetHrefs) + + for (const [cssFile, css] of options.cssContentByFileName) { + const cssHref = getAssetPath(cssFile) + if (!stylesheetHrefs.has(cssHref)) { + continue + } + + styles[cssHref] = rebaseInlineCssUrls({ css, cssHref }) + missingHrefs.delete(cssHref) + } + + if (missingHrefs.size > 0) { + throw new Error( + `TanStack Start inlineCss could not find CSS content for: ${Array.from( + missingHrefs, + ).join(', ')}`, + ) + } + + return { styles } +} + export function buildRouteManifestRoutes(options: { routeTreeRoutes: RouteTreeRoutes routeChunksByFilePath: ReadonlyMap< diff --git a/packages/start-plugin-core/src/types.ts b/packages/start-plugin-core/src/types.ts index 0c83d32583..a5f4324315 100644 --- a/packages/start-plugin-core/src/types.ts +++ b/packages/start-plugin-core/src/types.ts @@ -47,6 +47,7 @@ export interface NormalizedClientBuild { chunksByFileName: ReadonlyMap chunkFileNamesByRouteFilePath: ReadonlyMap> cssFilesBySourcePath: ReadonlyMap> + cssContentByFileName?: ReadonlyMap } export interface TanStackStartCoreOptions { diff --git a/packages/start-plugin-core/src/vite/planning.ts b/packages/start-plugin-core/src/vite/planning.ts index 56766a58af..5db724ba8d 100644 --- a/packages/start-plugin-core/src/vite/planning.ts +++ b/packages/start-plugin-core/src/vite/planning.ts @@ -136,6 +136,7 @@ export function createViteDefineConfig(opts: { spaEnabled: boolean | undefined devSsrStylesEnabled: boolean devSsrStylesBasepath: string + inlineCssEnabled: boolean staticNodeEnv: boolean }) { return { @@ -156,6 +157,10 @@ export function createViteDefineConfig(opts: { 'TSS_DEV_SSR_STYLES_BASEPATH', opts.devSsrStylesBasepath, ), + ...defineReplaceEnv( + 'TSS_INLINE_CSS_ENABLED', + opts.inlineCssEnabled ? 'true' : 'false', + ), ...(opts.command === 'build' && opts.staticNodeEnv ? { 'process.env.NODE_ENV': JSON.stringify( diff --git a/packages/start-plugin-core/src/vite/plugin.ts b/packages/start-plugin-core/src/vite/plugin.ts index 084565ecc6..e6cee02e48 100644 --- a/packages/start-plugin-core/src/vite/plugin.ts +++ b/packages/start-plugin-core/src/vite/plugin.ts @@ -185,6 +185,8 @@ export function tanStackStartVite( devSsrStylesBasepath: startConfig.dev.ssrStyles.basepath ?? resolvedStartConfig.basePaths.publicBase, + inlineCssEnabled: + command === 'build' && startConfig.server.build.inlineCss, staticNodeEnv: startConfig.server.build.staticNodeEnv, }), builder: { diff --git a/packages/start-plugin-core/src/vite/start-manifest-plugin/normalized-client-build.ts b/packages/start-plugin-core/src/vite/start-manifest-plugin/normalized-client-build.ts index 39c55b5484..8ac7915ff0 100644 --- a/packages/start-plugin-core/src/vite/start-manifest-plugin/normalized-client-build.ts +++ b/packages/start-plugin-core/src/vite/start-manifest-plugin/normalized-client-build.ts @@ -1,4 +1,5 @@ import { tsrSplit } from '@tanstack/router-plugin' +import { getCssAssetSource } from '../../start-manifest-plugin/inlineCss' import type { Rollup } from 'vite' import type { NormalizedClientBuild, NormalizedClientChunk } from '../../types' @@ -40,6 +41,7 @@ export function normalizeViteClientBuild( const chunksByFileName = normalizeViteClientChunks(clientBundle) const chunkFileNamesByRouteFilePath = new Map>() const cssFilesBySourcePath = new Map>() + const cssContentByFileName = new Map() for (const chunk of chunksByFileName.values()) { const bundleEntry = clientBundle[chunk.fileName] as Rollup.OutputChunk @@ -78,6 +80,22 @@ export function normalizeViteClientBuild( } } + for (const fileName in clientBundle) { + if (!fileName.endsWith('.css')) { + continue + } + + const bundleEntry = clientBundle[fileName]! + if (bundleEntry.type !== 'asset') { + continue + } + + const css = getCssAssetSource(bundleEntry.source) + if (css !== undefined) { + cssContentByFileName.set(fileName, css) + } + } + if (!entryChunkFileName) { throw new Error('No entry file found') } @@ -87,6 +105,7 @@ export function normalizeViteClientBuild( chunksByFileName, chunkFileNamesByRouteFilePath, cssFilesBySourcePath, + cssContentByFileName, } } 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 22a290f08b..dc027cf32f 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 @@ -44,7 +44,7 @@ export function startManifestPlugin(opts: { moduleId: VIRTUAL_MODULES.startManifest, enforce: 'pre', load() { - const { resolvedStartConfig } = opts.getConfig() + const { resolvedStartConfig, startConfig } = opts.getConfig() const clientEntry = joinURL( resolvedStartConfig.basePaths.publicBase, '@id', @@ -70,6 +70,7 @@ export function startManifestPlugin(opts: { clientBuild, routeTreeRoutes, basePath: resolvedStartConfig.basePaths.publicBase, + inlineCss: startConfig.server.build.inlineCss, additionalRouteAssets: getViteAdditionalRouteAssets({ cssCodeSplitDisabledFileName, basePath: resolvedStartConfig.basePaths.publicBase, diff --git a/packages/start-plugin-core/tests/start-manifest-plugin/manifestBuilder.test.ts b/packages/start-plugin-core/tests/start-manifest-plugin/manifestBuilder.test.ts index 8d673e07ae..de1d67c3e0 100644 --- a/packages/start-plugin-core/tests/start-manifest-plugin/manifestBuilder.test.ts +++ b/packages/start-plugin-core/tests/start-manifest-plugin/manifestBuilder.test.ts @@ -1,5 +1,6 @@ import { describe, expect, test } from 'vitest' import { deserialize } from 'seroval' +import { shouldRebaseInlineCssUrls } from '../../src/start-manifest-plugin/inlineCss' import { appendUniqueAssets, appendUniqueStrings, @@ -60,6 +61,18 @@ function makeChunk(options: { } as unknown as Rollup.OutputChunk } +function makeCssAsset(fileName: string, source: string): Rollup.OutputAsset { + return { + type: 'asset', + fileName, + name: fileName, + names: [fileName], + source, + needsCodeReference: false, + originalFileNames: [], + } as unknown as Rollup.OutputAsset +} + describe('getRouteFilePathsFromModuleIds', () => { test('returns unique route file paths only for tsr split modules', () => { expect( @@ -389,6 +402,81 @@ describe('createChunkCssAssetCollector', () => { }) describe('buildStartManifest', () => { + test('skips inline CSS transforms when no relative URLs need rebasing', () => { + expect(shouldRebaseInlineCssUrls('.root {\n color: red;\n}')).toBe(false) + expect(shouldRebaseInlineCssUrls('.root{background:url(/dot.svg)}')).toBe( + false, + ) + expect( + shouldRebaseInlineCssUrls( + '.root{background:url(data:image/svg+xml,foo)}', + ), + ).toBe(false) + expect(shouldRebaseInlineCssUrls('.card{background:url(./dot.svg)}')).toBe( + true, + ) + expect(shouldRebaseInlineCssUrls('@import "../theme.css";')).toBe(true) + }) + + test('embeds rebased inline CSS content when enabled', () => { + const entryChunk = makeChunk({ + fileName: 'entry.js', + isEntry: true, + importedCss: ['root.css'], + }) + const routeChunk = makeChunk({ + fileName: 'dashboard.js', + importedCss: ['dashboard.css'], + moduleIds: ['/routes/dashboard.tsx?tsr-split=component'], + }) + + const manifest = buildStartManifest({ + clientBuild: normalizeTestBuild({ + 'entry.js': entryChunk, + 'dashboard.js': routeChunk, + 'root.css': makeCssAsset('root.css', '.root{color:red}'), + 'dashboard.css': makeCssAsset( + 'dashboard.css', + '.card{background:url("./dot.svg")}', + ), + }), + routeTreeRoutes: { + __root__: {}, + '/dashboard': { filePath: '/routes/dashboard.tsx' }, + }, + basePath: '/assets', + inlineCss: true, + }) + + expect(manifest.inlineCss?.styles['/assets/root.css']).toBe( + '.root{color:red}', + ) + expect(manifest.inlineCss?.styles['/assets/dashboard.css']).toBe( + '.card{background:url(/assets/dot.svg)}', + ) + }) + + test('throws when inline CSS content is missing for a stylesheet asset', () => { + const entryChunk = makeChunk({ + fileName: 'entry.js', + isEntry: true, + importedCss: ['root.css'], + }) + + expect(() => + buildStartManifest({ + clientBuild: normalizeTestBuild({ + 'entry.js': entryChunk, + }), + routeTreeRoutes: { + __root__: {}, + }, + basePath: '/assets', + inlineCss: true, + }), + ).toThrow('could not find CSS content') + }) + test('allows callers to attach additional route assets', () => { const entryChunk = makeChunk({ fileName: 'entry.js', diff --git a/packages/start-server-core/src/router-manifest.ts b/packages/start-server-core/src/router-manifest.ts index d20be26942..f15b689c7d 100644 --- a/packages/start-server-core/src/router-manifest.ts +++ b/packages/start-server-core/src/router-manifest.ts @@ -62,6 +62,7 @@ export async function getStartManifest( } const manifest = { + inlineCss: startManifest.inlineCss, routes: Object.fromEntries( Object.entries(startManifest.routes).flatMap(([k, v]) => { const result = {} as { diff --git a/packages/start-server-core/src/transformAssetUrls.ts b/packages/start-server-core/src/transformAssetUrls.ts index 6c347e2343..e34cafedec 100644 --- a/packages/start-server-core/src/transformAssetUrls.ts +++ b/packages/start-server-core/src/transformAssetUrls.ts @@ -410,7 +410,7 @@ export async function transformManifestAssets( ) } - if (route.assets) { + if (route.assets && !source.manifest.inlineCss) { for (const asset of route.assets) { if (asset.tag === 'link' && asset.attrs?.href) { const rel = asset.attrs.rel @@ -481,5 +481,5 @@ export function buildManifestWithClientEntry( }, } - return { routes } + return { inlineCss: source.manifest.inlineCss, routes } } diff --git a/packages/vue-router/src/Asset.tsx b/packages/vue-router/src/Asset.tsx index 128ffa8ad3..fdbf140c79 100644 --- a/packages/vue-router/src/Asset.tsx +++ b/packages/vue-router/src/Asset.tsx @@ -3,6 +3,8 @@ import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' import type { RouterManagedTag } from '@tanstack/router-core' +const INLINE_CSS_HYDRATION_ATTR = 'data-tsr-inline-css' + interface ScriptAttrs { [key: string]: string | boolean | undefined src?: string @@ -171,7 +173,42 @@ const Script = Vue.defineComponent({ }, }) -export function Asset({ tag, attrs, children }: RouterManagedTag): any { +const InlineCssStyle = Vue.defineComponent({ + name: 'InlineCssStyle', + props: { + attrs: { + type: Object as Vue.PropType>, + default: () => ({}), + }, + children: { + type: String, + default: undefined, + }, + }, + setup(props) { + const isInlineCssPlaceholder = props.children === undefined + const hydratedInlineCss = + isInlineCssPlaceholder && typeof document !== 'undefined' + ? (document.querySelector( + `style[${INLINE_CSS_HYDRATION_ATTR}]`, + )?.textContent ?? '') + : undefined + + return () => + Vue.h('style', { + ...props.attrs, + [INLINE_CSS_HYDRATION_ATTR]: '', + 'data-allow-mismatch': true, + innerHTML: isInlineCssPlaceholder + ? (hydratedInlineCss ?? '') + : (props.children ?? ''), + }) + }, +}) + +export function Asset(asset: RouterManagedTag): any { + const { tag, attrs, children } = asset + switch (tag) { case 'title': return Vue.h(Title, { children: children }) @@ -180,7 +217,21 @@ export function Asset({ tag, attrs, children }: RouterManagedTag): any { case 'link': return case 'style': - return + + + + {children} + + + + ) +} diff --git a/e2e/react-start/deferred-hydration/src/routes/components.tsx b/e2e/react-start/deferred-hydration/src/routes/components.tsx new file mode 100644 index 0000000000..95fa7531a4 --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/components.tsx @@ -0,0 +1,179 @@ +import { createFileRoute } from '@tanstack/react-router' +import * as React from 'react' +import { Hydrate } from '@tanstack/react-start' +import { + condition, + idle, + interaction, + load, + media, + never, + visible, +} from '@tanstack/react-start/hydration' + +export const Route = createFileRoute('/components')({ + component: ComponentHydrationPage, +}) + +function InteractiveBox(props: { id: string; label: string }) { + const [count, setCount] = React.useState(0) + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( + + ) +} + +type HydrationFallbackWindow = Window & { + __componentFallbackReady?: boolean + __componentFallbackPromise?: Promise +} + +function DelayedFallbackBox() { + if (typeof window !== 'undefined') { + const win = window as HydrationFallbackWindow + + if (!win.__componentFallbackReady) { + win.__componentFallbackPromise ??= new Promise((resolve) => { + win.setTimeout(() => { + win.__componentFallbackReady = true + resolve() + }, 1000) + }) + + throw win.__componentFallbackPromise + } + } + + return
fallback child
+} + +function ComponentHydrationPage() { + const [hydratedCallbacks, setHydratedCallbacks] = React.useState(0) + const [conditionReady, setConditionReady] = React.useState(false) + const [showClientFallbackBoundary, setShowClientFallbackBoundary] = + React.useState(false) + + return ( +
+

Component Deferred Hydration

+
+ Manual test guide + + Pink buttons are server HTML that has not hydrated yet. Green buttons + have hydrated and should increment when clicked. Follow the notes + below to trigger each strategy intentionally. + +
+

{hydratedCallbacks}

+

+ load and idle should become green + without interaction shortly after the page loads. +

+ + + + + + +
+ Scroll down to reveal the visible boundary +
+

+ visible hydrates only after this button enters the + viewport. +

+ + + +

+ media hydrates when (min-width: 1px) + matches. interaction hydrates on hover, focus, pointer + down, or click intent. +

+ + + + + + +

+ Custom interaction boundaries below hydrate only for their configured + events: double-click for the single-event example, and right-click or + double-click for the multi-event example. The prefetch example should + download code on hover but hydrate on click. +

+ setHydratedCallbacks((count) => count + 1)} + > + + + + + + + + + + + + + + + + + + + + + + + +

+ never stays as server HTML forever on the initial page, + so clicking should not increment it. +

+ + {showClientFallbackBoundary ? ( + client fallback + } + > + + + ) : null} +
+ ) +} diff --git a/e2e/react-start/deferred-hydration/src/routes/css.tsx b/e2e/react-start/deferred-hydration/src/routes/css.tsx new file mode 100644 index 0000000000..2c01aa9e57 --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/css.tsx @@ -0,0 +1,57 @@ +import { createFileRoute } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { media, never, visible } from '@tanstack/react-start/hydration' +import outerStyles from './css/outer.module.css' +import deferredStyles from './css/deferred-only.module.css' +import sharedStyles from './css/shared.module.css' + +export const Route = createFileRoute('/css')({ + component: CssHydrationPage, +}) + +function CssHydrationPage() { + return ( +
+
+

+ CSS Deferred Hydration +

+

+ CSS from deferred, never, shared, and nested Hydrate boundaries should + be available even before the client JavaScript hydrates those islands. +

+
+
+
+ Outer CSS +
+
+ Shared outer CSS +
+
+ +
+ Deferred CSS +
+
+ +
+ Never CSS +
+
+ + +
+ Nested CSS +
+
+
+
+ ) +} diff --git a/e2e/react-start/deferred-hydration/src/routes/css/deferred-only.module.css b/e2e/react-start/deferred-hydration/src/routes/css/deferred-only.module.css new file mode 100644 index 0000000000..05eafda03c --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/css/deferred-only.module.css @@ -0,0 +1,15 @@ +.deferredBox { + background-color: rgb(23, 45, 67); + color: rgb(255, 255, 255); + padding: 12px; +} + +.neverBox { + color: rgb(45, 67, 89); + padding: 12px; +} + +.nestedBox { + border-left: 5px solid rgb(67, 89, 123); + padding-left: 12px; +} diff --git a/e2e/react-start/deferred-hydration/src/routes/css/outer.module.css b/e2e/react-start/deferred-hydration/src/routes/css/outer.module.css new file mode 100644 index 0000000000..98ca5e0934 --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/css/outer.module.css @@ -0,0 +1,9 @@ +.heading { + color: rgb(11, 31, 53); +} + +.outerBox { + background-color: rgb(242, 250, 255); + color: rgb(12, 34, 56); + padding: 12px; +} diff --git a/e2e/react-start/deferred-hydration/src/routes/css/shared.module.css b/e2e/react-start/deferred-hydration/src/routes/css/shared.module.css new file mode 100644 index 0000000000..020da5d7ad --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/css/shared.module.css @@ -0,0 +1,4 @@ +.sharedBox { + border-top: 4px solid rgb(98, 76, 54); + margin-top: 8px; +} diff --git a/e2e/react-start/deferred-hydration/src/routes/enhanced.tsx b/e2e/react-start/deferred-hydration/src/routes/enhanced.tsx new file mode 100644 index 0000000000..628a5c4ae3 --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/enhanced.tsx @@ -0,0 +1,339 @@ +import { createFileRoute } from '@tanstack/react-router' +import * as React from 'react' +import { Hydrate } from '@tanstack/react-start' +import { interaction, media } from '@tanstack/react-start/hydration' +import { EnhancedNestedWidget } from '../shared/EnhancedNestedWidget' + +type EnhancedSearch = { + dynamic?: 'interaction' +} + +export const Route = createFileRoute('/enhanced')({ + validateSearch: (search: Record): EnhancedSearch => ({ + dynamic: search.dynamic === 'interaction' ? 'interaction' : undefined, + }), + component: EnhancedHydrationPage, +}) + +type DeferredGate = { + promise: Promise + resolve: () => void +} + +const clickIntent = interaction({ events: 'click' }) +const pointerOverIntent = interaction({ events: 'pointerover' }) +const doubleClickIntent = interaction({ events: 'dblclick' }) + +function createDeferredGate(): DeferredGate { + let resolve!: () => void + const promise = new Promise((next) => { + resolve = next + }) + return { promise, resolve } +} + +function useDeferredGate() { + const ref = React.useRef(undefined) + ref.current ??= createDeferredGate() + return ref.current +} + +function mergeStatus>( + setStatus: React.Dispatch>, + patch: Partial, +) { + setStatus((current) => ({ ...current, ...patch })) +} + +function InteractiveBox(props: { id: string; label: string }) { + const [count, setCount] = React.useState(0) + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( + + ) +} + +function DynamicWhenExamples() { + const search = Route.useSearch() + const searchDrivenHydration = React.useCallback( + () => (search.dynamic === 'interaction' ? clickIntent : doubleClickIntent), + [search.dynamic], + ) + + return ( + <> +

+ Dynamic callbacks are client-only. The first boundary always hydrates on + click; the second reads typed router search state before choosing its + interaction event. +

+ clickIntent}> + + + + + + + ) +} + +function SplitPrefetchExample() { + const gate = useDeferredGate() + const [status, setStatus] = React.useState({ + wait: 'idle', + preload: 'idle', + query: 'idle', + }) + + return ( + <> +

{status.wait}

+

{status.preload}

+

{status.query}

+ + { + mergeStatus(setStatus, { + query: element ? 'element' : 'missing-element', + wait: 'waiting', + }) + + const reason = await waitFor(pointerOverIntent) + mergeStatus(setStatus, { wait: reason }) + if (reason === 'abort' || signal.aborted) return + + await preload() + mergeStatus(setStatus, { preload: 'done' }) + await gate.promise + mergeStatus(setStatus, { query: 'done' }) + }} + > + + + + ) +} + +function FireAndForgetPrefetchExample() { + const gate = useDeferredGate() + const [status, setStatus] = React.useState({ + wait: 'idle', + work: 'idle', + query: 'idle', + }) + + return ( + <> +

{status.work}

+

{status.wait}

+

{status.query}

+ + { + mergeStatus(setStatus, { wait: 'waiting' }) + void waitFor(pointerOverIntent).then((reason) => { + mergeStatus(setStatus, { wait: reason }) + if (reason === 'abort') return + + mergeStatus(setStatus, { work: 'started' }) + void gate.promise.then(() => { + mergeStatus(setStatus, { query: 'done' }) + }) + }) + }} + > + + + + ) +} + +function HydrateFirstPrefetchExample() { + const [reason, setReason] = React.useState('idle') + + return ( + <> +

{reason}

+ { + setReason(await waitFor(doubleClickIntent)) + }} + > + + + + ) +} + +function RuntimeOnlyPrefetchExample() { + const gate = useDeferredGate() + const [status, setStatus] = React.useState({ + wait: 'idle', + ready: 'idle', + }) + + return ( + <> +

{status.wait}

+

{status.ready}

+ + { + mergeStatus(setStatus, { wait: 'waiting' }) + const reason = await waitFor(pointerOverIntent) + mergeStatus(setStatus, { wait: reason }) + if (reason === 'abort') return + + await gate.promise + await preload() + mergeStatus(setStatus, { ready: 'ready' }) + }} + > + + + + ) +} + +function WaitForAbortExample() { + const [showBoundary, setShowBoundary] = React.useState(true) + const [reason, setReason] = React.useState('idle') + + return ( + <> +

{reason}

+ + {showBoundary ? ( + { + setReason('waiting') + setReason(await waitFor(pointerOverIntent)) + }} + > + + + ) : null} + + ) +} + +function SignalAbortExample() { + const [showBoundary, setShowBoundary] = React.useState(true) + const [status, setStatus] = React.useState('idle') + + return ( + <> +

{status}

+ + {showBoundary ? ( + { + setStatus('listening') + await new Promise((resolve) => { + const onAbort = () => { + setStatus('aborted') + resolve() + } + + if (signal.aborted) { + onAbort() + return + } + + signal.addEventListener('abort', onAbort, { once: true }) + }) + }} + > + + + ) : null} + + ) +} + +function NestedDynamicExamples() { + return ( + <> + + clickIntent}> + + + + + + ) +} + +function EnhancedHydrationPage() { + return ( +
+

Enhanced Hydrate APIs

+ + + + + + + + +
+ ) +} diff --git a/e2e/react-start/deferred-hydration/src/routes/imported.tsx b/e2e/react-start/deferred-hydration/src/routes/imported.tsx new file mode 100644 index 0000000000..bf0f8b74bd --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/imported.tsx @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/react-router' +import { ImportedHydrateWidget } from '../shared/ImportedHydrateWidget' + +export const Route = createFileRoute('/imported')({ + component: ImportedHydrationPage, +}) + +function ImportedHydrationPage() { + return ( +
+

Imported Hydrate

+ +
+ ) +} diff --git a/e2e/react-start/deferred-hydration/src/routes/index.tsx b/e2e/react-start/deferred-hydration/src/routes/index.tsx new file mode 100644 index 0000000000..0585f4bc87 --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/index.tsx @@ -0,0 +1,23 @@ +import { Link, createFileRoute } from '@tanstack/react-router' + +export const Route = createFileRoute('/')({ + component: Home, +}) + +function Home() { + return ( +
+

Deferred Hydration

+

Component strategies

+ component strategies +

CSS

+ CSS deferred hydration +

Imported component

+ + imported Hydrate + +

Enhanced APIs

+ enhanced Hydrate APIs +
+ ) +} diff --git a/e2e/react-start/deferred-hydration/src/routes/scroll-restoration.tsx b/e2e/react-start/deferred-hydration/src/routes/scroll-restoration.tsx new file mode 100644 index 0000000000..7b52cf25fe --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/routes/scroll-restoration.tsx @@ -0,0 +1,93 @@ +import { ClientOnly, createFileRoute } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { visible } from '@tanstack/react-start/hydration' +import * as React from 'react' + +export const Route = createFileRoute('/scroll-restoration')({ + component: ScrollRestorationRoute, +}) + +function BottomWidget() { + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( +
+

Bottom widget

+

+ This visible deferred boundary is intentionally near the bottom of the + document. +

+

+ The hydrated widget is taller than the server skeleton so the test can + catch scroll restoration that happens before late hydration settles. +

+
+ ) +} + +function BottomWidgetSkeleton() { + return ( +
+

Bottom widget skeleton

+

+ The server-rendered placeholder reserves the same vertical space as the + hydrated widget. +

+
+ ) +} + +function ScrollRestorationRoute() { + return ( +
+

+ Scroll restoration deferred hydration +

+

+ This route keeps the reproduction small: a tall page, a visible Hydrate + boundary near the bottom, and normal router scroll restoration. +

+
+ Scroll to the bottom widget +
+ + }> + + + +
+ ) +} diff --git a/e2e/react-start/deferred-hydration/src/shared/EnhancedNestedWidget.tsx b/e2e/react-start/deferred-hydration/src/shared/EnhancedNestedWidget.tsx new file mode 100644 index 0000000000..fb2f094e51 --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/shared/EnhancedNestedWidget.tsx @@ -0,0 +1,33 @@ +import * as React from 'react' +import { Hydrate } from '@tanstack/react-start' +import { interaction, media } from '@tanstack/react-start/hydration' + +function CrossFileNestedButton() { + const [count, setCount] = React.useState(0) + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( + + ) +} + +export function EnhancedNestedWidget() { + return ( + + + + + + ) +} diff --git a/e2e/react-start/deferred-hydration/src/shared/ImportedHydrateWidget.tsx b/e2e/react-start/deferred-hydration/src/shared/ImportedHydrateWidget.tsx new file mode 100644 index 0000000000..f2be89ec1c --- /dev/null +++ b/e2e/react-start/deferred-hydration/src/shared/ImportedHydrateWidget.tsx @@ -0,0 +1,39 @@ +import * as React from 'react' +import { Hydrate } from '@tanstack/react-start' +import { interaction } from '@tanstack/react-start/hydration' + +function ImportedHydrateChild() { + const [count, setCount] = React.useState(0) + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( + + ) +} + +export function ImportedHydrateWidget() { + return ( + + imported hydrate fallback + + } + > + + + ) +} diff --git a/e2e/react-start/deferred-hydration/tests/hydration.spec.ts b/e2e/react-start/deferred-hydration/tests/hydration.spec.ts new file mode 100644 index 0000000000..0a2c332271 --- /dev/null +++ b/e2e/react-start/deferred-hydration/tests/hydration.spec.ts @@ -0,0 +1,1028 @@ +import { expect } from '@playwright/test' +import { createHmrFileEditor, test } from '@tanstack/router-e2e-utils' +import crypto from 'node:crypto' +import path from 'node:path' +import type { APIRequestContext, Page } from '@playwright/test' + +const isDev = process.env.MODE === 'dev' +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const isVite = toolchain === 'vite' +const hmrExpect = expect.configure({ timeout: 20_000 }) +const componentsRouteFile = path.join( + process.cwd(), + 'src/routes/components.tsx', +) +const interactiveBoxLabelSource = + ' {props.label}: {count}' +const interactiveBoxHmrLabelSource = + ' hmr {props.label}: {count}' + +function normalizeComponentsRouteSource(source: string) { + return source + .split(interactiveBoxHmrLabelSource) + .join(interactiveBoxLabelSource) +} + +const componentsRouteEditor = createHmrFileEditor({ + files: { + componentsRoute: componentsRouteFile, + }, + normalizeSource: (_fileKey, source) => normalizeComponentsRouteSource(source), +}) + +function getVisibleHydrateVirtualPath() { + const normalizedSourcePath = path + .relative(process.cwd(), componentsRouteFile) + .replaceAll('\\', '/') + const sourceHash = crypto + .createHash('sha1') + .update(normalizedSourcePath) + .digest('hex') + .slice(0, 10) + const params = new URLSearchParams() + params.set('tss-hydrate', `0_${sourceHash}`) + + return `${componentsRouteFile}?${params.toString()}` +} + +async function waitForVisibleHydrateVirtualModule(page: Page, marker: string) { + const virtualPath = getVisibleHydrateVirtualPath() + + await expect + .poll( + async () => { + try { + const response = await page.request.get(virtualPath) + const text = await response.text() + + if (response.ok() && text.includes(marker)) { + return 'ready' + } + + return `${response.status()} ${text.slice(0, 240)}` + } catch (error) { + return String(error) + } + }, + { timeout: 20_000 }, + ) + .toBe('ready') +} + +async function clickAndExpectCount( + page: Page, + buttonTestId: string, + countTestId: string, + count: string, +) { + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await page.getByTestId(buttonTestId).click() + await expect(page.getByTestId(countTestId)).toHaveText(count) +} + +async function clickIntentAndExpectReplayedCount( + page: Page, + buttonTestId: string, + countTestId: string, + count: string, +) { + await expectRouteToStayUnhydrated(page, buttonTestId) + await page.getByTestId(buttonTestId).click() + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await expect(page.getByTestId(countTestId)).toHaveText(count) +} + +async function clickToHydrateThenClickAndExpectIncrement( + page: Page, + buttonTestId: string, + countTestId: string, +) { + await expectRouteToStayUnhydrated(page, buttonTestId) + await page.getByTestId(buttonTestId).click() + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'true', + ) + const previousCount = Number( + await page.getByTestId(countTestId).textContent(), + ) + await page.getByTestId(buttonTestId).click() + await expect + .poll(async () => Number(await page.getByTestId(countTestId).textContent())) + .toBe(previousCount + 1) +} + +async function hoverIntentAndExpectCount( + page: Page, + buttonTestId: string, + countTestId: string, + count: string, +) { + await expectRouteToStayUnhydrated(page, buttonTestId) + await page.mouse.move(0, 0) + await page.getByTestId(buttonTestId).hover() + await clickAndExpectCount(page, buttonTestId, countTestId, count) +} + +async function dispatchHydrationIntent( + page: Page, + buttonTestId: string, + eventName: string, +) { + await page.getByTestId(buttonTestId).evaluate((element, eventName) => { + const marker = element.closest('[data-ts-hydrate-id]') + + if (!marker) { + throw new Error('Expected Hydrate marker to exist') + } + + marker.dispatchEvent( + new Event(eventName, { bubbles: true, cancelable: true }), + ) + }, eventName) +} + +async function expectRouteToStayUnhydrated( + page: Page, + buttonTestId: string, + duration = 250, +) { + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'false', + ) + await page.waitForTimeout(duration) + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'false', + ) +} + +async function scrollToBoundary(page: Page, buttonTestId: string) { + const button = page.getByTestId(buttonTestId) + for (let attempt = 0; attempt < 3; attempt++) { + await button.evaluate((element) => { + element.scrollIntoView({ block: 'center', inline: 'nearest' }) + }) + + await page.waitForTimeout(100) + const isVisible = await button.evaluate((element) => { + const rect = element.getBoundingClientRect() + return rect.bottom > 0 && rect.top < window.innerHeight + }) + + if (isVisible) return + } + + await expect(button).toBeInViewport() +} + +async function expectCssProperty( + page: Page, + testId: string, + property: string, + value: string, +) { + await expect + .poll(() => + page.getByTestId(testId).evaluate((element, propertyName) => { + return getComputedStyle(element).getPropertyValue(propertyName) + }, property), + ) + .toBe(value) +} + +function htmlContainsText(html: string, text: string) { + const pattern = text.split(' ').join('(?:\\s|)+') + expect(html).toMatch(new RegExp(pattern)) +} + +async function waitForComponentsServerHtmlText(page: Page, text: string) { + await expect + .poll( + async () => { + const response = await page.request.get('/components') + const html = await response.text() + + if (!response.ok()) { + return `${response.status()} ${html.slice(0, 240)}` + } + + try { + htmlContainsText(html, text) + return 'ready' + } catch { + return html.slice(0, 240) + } + }, + { timeout: 20_000 }, + ) + .toBe('ready') +} + +function getModulePreloadHrefs(html: string) { + return Array.from(html.matchAll(/]*>/g), (match) => match[0]) + .filter((tag) => /\brel="modulepreload"/.test(tag)) + .map((tag) => tag.match(/\bhref="([^"]+)"/)?.[1]) + .filter((href): href is string => !!href) +} + +async function modulePreloadContentsContain( + request: APIRequestContext, + hrefs: Array, + marker: string, +) { + for (const href of hrefs) { + const response = await request.get(href) + if (!response.ok()) continue + + const text = await response.text() + if (text.includes(marker)) return true + } + + return false +} + +async function resourceContentsContain( + page: Page, + request: APIRequestContext, + marker: string, + filter: (url: string) => boolean, +) { + const resourceUrls = await page.evaluate(() => + performance.getEntriesByType('resource').map((entry) => entry.name), + ) + + return modulePreloadContentsContain( + request, + resourceUrls.filter(filter), + marker, + ) +} + +async function documentModulePreloadHrefs(page: Page) { + return page.evaluate(() => + Array.from( + document.querySelectorAll('link[rel~="modulepreload"]'), + (link) => link.href, + ), + ) +} + +function isHydrateBoundaryResource(url: string) { + return ( + url.includes('/assets/components-') || url.includes('/static/js/async/') + ) +} + +function isClientJavaScriptResource(url: string) { + return ( + url.includes('/assets/') || + url.includes('/static/js/') || + url.includes('/static/js/async/') + ) +} + +async function expectClientRouterReady(page: Page) { + await expect + .poll(() => + page.evaluate(() => + Boolean( + ( + globalThis as typeof globalThis & { + __TSR_ROUTER__?: unknown + } + ).__TSR_ROUTER__, + ), + ), + ) + .toBe(true) +} + +async function gotoEnhanced(page: Page, search = '') { + await page.goto(`/enhanced${search}`) + await expectClientRouterReady(page) +} + +test.describe('Hydrate HMR', () => { + test.skip(!isDev, 'HMR regression coverage runs against the dev server only') + + test.beforeAll(async () => { + await componentsRouteEditor.capturePromise + }) + + test.afterEach(async () => { + await componentsRouteEditor.capturePromise + await componentsRouteEditor.restoreFiles() + }) + + test.afterAll(async () => { + await componentsRouteEditor.capturePromise + await componentsRouteEditor.restoreFiles() + }) + + test('updates deferred child chunks after the parent route is edited', async ({ + page, + }) => { + const pageErrors: Array = [] + page.on('pageerror', (error) => { + pageErrors.push(error.message) + }) + + await page.goto('/components') + await expectClientRouterReady(page) + await expectRouteToStayUnhydrated(page, 'component-visible-button') + + await componentsRouteEditor.replaceText( + 'componentsRoute', + interactiveBoxLabelSource, + interactiveBoxHmrLabelSource, + ) + + await waitForComponentsServerHtmlText(page, 'hmr visible') + if (isVite) { + await waitForVisibleHydrateVirtualModule(page, 'hmr ') + } + + await page.goto('/components') + await expectClientRouterReady(page) + await expectRouteToStayUnhydrated(page, 'component-visible-button') + await scrollToBoundary(page, 'component-visible-button') + await hmrExpect(page.getByTestId('component-visible-button')).toContainText( + 'hmr visible', + ) + await clickAndExpectCount( + page, + 'component-visible-button', + 'component-visible-count', + '1', + ) + expect(pageErrors).toEqual([]) + }) +}) + +test.describe('component-level Hydrate runtime strategies', () => { + test.skip( + isDev, + 'production hydration coverage runs against the preview server', + ) + + test('renders SSR HTML and hydrates each runtime when appropriately', async ({ + page, + request, + }) => { + await page.goto('/components') + + await expect(page.getByTestId('component-heading')).toHaveText( + 'Component Deferred Hydration', + ) + + await clickAndExpectCount( + page, + 'component-load-button', + 'component-load-count', + '1', + ) + await clickAndExpectCount( + page, + 'component-idle-button', + 'component-idle-count', + '1', + ) + await expect( + resourceContentsContain(page, request, 'component-visible', (url) => + isHydrateBoundaryResource(url), + ), + ).resolves.toBe(false) + await expectRouteToStayUnhydrated(page, 'component-visible-button') + await scrollToBoundary(page, 'component-visible-button') + await clickAndExpectCount( + page, + 'component-visible-button', + 'component-visible-count', + '1', + ) + await expect + .poll(() => + resourceContentsContain(page, request, 'component-visible', (url) => + isHydrateBoundaryResource(url), + ), + ) + .toBe(true) + await clickAndExpectCount( + page, + 'component-media-button', + 'component-media-count', + '1', + ) + await hoverIntentAndExpectCount( + page, + 'component-interaction-button', + 'component-interaction-count', + '1', + ) + await expect(page.getByTestId('component-on-hydrated-count')).toHaveText( + '0', + ) + await expectRouteToStayUnhydrated(page, 'component-custom-single-button') + await page.getByTestId('component-custom-single-button').hover() + await expectRouteToStayUnhydrated(page, 'component-custom-single-button') + await page.getByTestId('component-custom-single-button').click() + await expectRouteToStayUnhydrated(page, 'component-custom-single-button') + await dispatchHydrationIntent( + page, + 'component-custom-single-button', + 'dblclick', + ) + await expect( + page.getByTestId('component-custom-single-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expect(page.getByTestId('component-on-hydrated-count')).toHaveText( + '1', + ) + await clickAndExpectCount( + page, + 'component-custom-single-button', + 'component-custom-single-count', + '1', + ) + await expect(page.getByTestId('component-on-hydrated-count')).toHaveText( + '1', + ) + await expectRouteToStayUnhydrated(page, 'component-custom-multi-button') + await dispatchHydrationIntent( + page, + 'component-custom-multi-button', + 'contextmenu', + ) + await clickAndExpectCount( + page, + 'component-custom-multi-button', + 'component-custom-multi-count', + '1', + ) + await expectRouteToStayUnhydrated(page, 'component-condition-button') + await page.getByTestId('component-enable-condition').click() + await clickAndExpectCount( + page, + 'component-condition-button', + 'component-condition-count', + '1', + ) + await expectRouteToStayUnhydrated(page, 'component-click-replay-button') + await page.getByTestId('component-click-replay-button').click() + await expect( + page.getByTestId('component-click-replay-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expect(page.getByTestId('component-click-replay-count')).toHaveText( + '1', + ) + await expectRouteToStayUnhydrated(page, 'component-prefetch-button') + await expect( + resourceContentsContain(page, request, 'component-prefetch', (url) => + isHydrateBoundaryResource(url), + ), + ).resolves.toBe(false) + await page.mouse.move(0, 0) + await page.getByTestId('component-prefetch-button').hover() + await expect(page.getByTestId('component-prefetch-button')).toHaveAttribute( + 'data-hydrated', + 'false', + ) + await expect + .poll(() => + resourceContentsContain(page, request, 'component-prefetch', (url) => + isHydrateBoundaryResource(url), + ), + ) + .toBe(true) + await expect(page.getByTestId('component-prefetch-button')).toHaveAttribute( + 'data-hydrated', + 'false', + ) + await page.getByTestId('component-prefetch-button').click() + await expect(page.getByTestId('component-prefetch-button')).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await expect(page.getByTestId('component-prefetch-count')).toHaveText('1') + await hoverIntentAndExpectCount( + page, + 'component-nested-child-button', + 'component-nested-child-count', + '1', + ) + + await page.getByTestId('component-never-button').click() + await expect(page.getByTestId('component-never-count')).toHaveText('0') + }) + + test('replays click after another interaction boundary hydrates first', async ({ + page, + }) => { + await page.goto('/components') + await expectClientRouterReady(page) + + await scrollToBoundary(page, 'component-custom-multi-button') + await expectRouteToStayUnhydrated(page, 'component-custom-multi-button') + await page.getByTestId('component-custom-multi-button').click({ + button: 'right', + }) + await expect( + page.getByTestId('component-custom-multi-button'), + ).toHaveAttribute('data-hydrated', 'true') + + await scrollToBoundary(page, 'component-click-replay-button') + await expectRouteToStayUnhydrated(page, 'component-click-replay-button') + await page.getByTestId('component-click-replay-button').click() + await expect( + page.getByTestId('component-click-replay-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expect(page.getByTestId('component-click-replay-count')).toHaveText( + '1', + ) + }) + + test('shows fallback during a client-only mount while the child suspends', async ({ + page, + }) => { + await page.goto('/components') + await expect(page.getByTestId('component-load-button')).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await page.getByTestId('component-show-client-fallback').click() + + await expect(page.getByTestId('component-client-fallback')).toHaveText( + 'client fallback', + ) + await expect(page.getByTestId('component-fallback-child')).toHaveText( + 'fallback child', + ) + await expect(page.getByTestId('component-client-fallback')).toHaveCount(0) + }) + + test('preserves scroll position after a force reload on a visible boundary', async ({ + page, + }) => { + await page.goto('/scroll-restoration') + await expectClientRouterReady(page) + await page + .getByTestId('scroll-restoration-skeleton') + .scrollIntoViewIfNeeded() + await expect(page.getByTestId('scroll-restoration-widget')).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await page.evaluate(() => { + window.scrollTo(0, document.documentElement.scrollHeight) + }) + + const beforeReloadDistanceFromBottom = await page.evaluate( + () => + document.documentElement.scrollHeight - + window.innerHeight - + window.scrollY, + ) + expect(beforeReloadDistanceFromBottom).toBeLessThan(5) + + const client = await page.context().newCDPSession(page) + const reloaded = page.waitForEvent('load') + await client.send('Page.reload', { ignoreCache: true }) + await reloaded + + await expectClientRouterReady(page) + await expect(page.getByTestId('scroll-restoration-widget')).toHaveAttribute( + 'data-hydrated', + 'true', + ) + + await expect + .poll(() => + page.evaluate( + () => + document.documentElement.scrollHeight - + window.innerHeight - + window.scrollY, + ), + ) + .toBeLessThan(20) + }) +}) + +test.describe('enhanced Hydrate API combinations', () => { + test.skip( + isDev, + 'production hydration coverage runs against the preview server', + ) + + test('server renders dynamic markers without evaluating client-only callbacks or prefetch functions', async ({ + request, + }) => { + const response = await request.get('/enhanced?dynamic=interaction') + const html = await response.text() + + expect(response.ok()).toBe(true) + htmlContainsText(html, 'Enhanced Hydrate APIs') + htmlContainsText(html, 'conditional dynamic') + expect(html).toContain('data-ts-hydrate-when="dynamic"') + expect(html).not.toContain('missing-element') + }) + + test('dynamic when functions hydrate and replay interaction events', async ({ + page, + }) => { + await gotoEnhanced(page, '?dynamic=interaction') + await expect(page.getByTestId('enhanced-heading')).toHaveText( + 'Enhanced Hydrate APIs', + ) + await clickIntentAndExpectReplayedCount( + page, + 'enhanced-dynamic-interaction-button', + 'enhanced-dynamic-interaction-count', + '1', + ) + + await expectRouteToStayUnhydrated( + page, + 'enhanced-dynamic-conditional-button', + ) + await page.getByTestId('enhanced-dynamic-conditional-button').hover() + await expectRouteToStayUnhydrated( + page, + 'enhanced-dynamic-conditional-button', + ) + await clickIntentAndExpectReplayedCount( + page, + 'enhanced-dynamic-conditional-button', + 'enhanced-dynamic-conditional-count', + '1', + ) + }) + + test('procedural prefetch can block hydration, preload the split chunk, and prepare query-like work', async ({ + page, + request, + }) => { + await gotoEnhanced(page) + await expect( + resourceContentsContain( + page, + request, + 'enhanced-procedural-split-child', + isClientJavaScriptResource, + ), + ).resolves.toBe(false) + + await expectRouteToStayUnhydrated(page, 'enhanced-procedural-split-button') + await expect(page.getByTestId('enhanced-split-wait-reason')).toHaveText( + 'waiting', + ) + await dispatchHydrationIntent( + page, + 'enhanced-procedural-split-button', + 'pointerover', + ) + await expect(page.getByTestId('enhanced-split-query')).toHaveText('element') + await expect(page.getByTestId('enhanced-split-wait-reason')).toHaveText( + 'prefetch', + ) + await expect(page.getByTestId('enhanced-split-preload')).toHaveText('done') + await expect + .poll(() => + resourceContentsContain( + page, + request, + 'enhanced-procedural-split-child', + isClientJavaScriptResource, + ), + ) + .toBe(true) + + await page.getByTestId('enhanced-procedural-split-button').click() + await expect( + page.getByTestId('enhanced-procedural-split-button'), + ).toHaveAttribute('data-hydrated', 'false') + await expect( + page.getByTestId('enhanced-procedural-split-count'), + ).toHaveText('0') + await page.getByTestId('enhanced-release-split-prefetch').click() + await expect( + page.getByTestId('enhanced-procedural-split-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expect( + page.getByTestId('enhanced-procedural-split-count'), + ).toHaveText('1') + await expect(page.getByTestId('enhanced-split-query')).toHaveText('done') + }) + + test('function prefetch supports fire-and-forget work and waitFor hydrate-first resolution', async ({ + page, + }) => { + await gotoEnhanced(page) + + await expect(page.getByTestId('enhanced-fire-wait-reason')).toHaveText( + 'waiting', + ) + await dispatchHydrationIntent( + page, + 'enhanced-fire-and-forget-button', + 'pointerover', + ) + await expect(page.getByTestId('enhanced-fire-wait-reason')).toHaveText( + 'prefetch', + ) + await expect(page.getByTestId('enhanced-fire-status')).toHaveText('started') + await clickIntentAndExpectReplayedCount( + page, + 'enhanced-fire-and-forget-button', + 'enhanced-fire-and-forget-count', + '1', + ) + await expect(page.getByTestId('enhanced-fire-query')).toHaveText('idle') + await page.getByTestId('enhanced-release-fire-prefetch').click() + await expect(page.getByTestId('enhanced-fire-query')).toHaveText('done') + + await clickIntentAndExpectReplayedCount( + page, + 'enhanced-hydrate-first-button', + 'enhanced-hydrate-first-count', + '1', + ) + await expect(page.getByTestId('enhanced-hydrate-first-reason')).toHaveText( + 'hydrate', + ) + }) + + test('split=false procedural prefetch blocks hydration without requiring a child preload chunk', async ({ + page, + }) => { + await gotoEnhanced(page) + + await expectRouteToStayUnhydrated(page, 'enhanced-runtime-only-button') + await expect(page.getByTestId('enhanced-runtime-wait-reason')).toHaveText( + 'waiting', + ) + await dispatchHydrationIntent( + page, + 'enhanced-runtime-only-button', + 'pointerover', + ) + await expect(page.getByTestId('enhanced-runtime-wait-reason')).toHaveText( + 'prefetch', + ) + await page.getByTestId('enhanced-runtime-only-button').click() + await expect( + page.getByTestId('enhanced-runtime-only-button'), + ).toHaveAttribute('data-hydrated', 'false') + await expect(page.getByTestId('enhanced-runtime-only-count')).toHaveText( + '0', + ) + await page.getByTestId('enhanced-release-runtime-prefetch').click() + await expect(page.getByTestId('enhanced-runtime-status')).toHaveText( + 'ready', + ) + await expect( + page.getByTestId('enhanced-runtime-only-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expect(page.getByTestId('enhanced-runtime-only-count')).toHaveText( + '1', + ) + }) + + test('procedural prefetch aborts waiters and signals when boundaries unmount', async ({ + page, + }) => { + await gotoEnhanced(page) + + await expectRouteToStayUnhydrated(page, 'enhanced-wait-abort-button') + await expect(page.getByTestId('enhanced-wait-abort-reason')).toHaveText( + 'waiting', + ) + await page.getByTestId('enhanced-hide-wait-abort').click() + await expect(page.getByTestId('enhanced-wait-abort-reason')).toHaveText( + 'abort', + ) + + await expect(page.getByTestId('enhanced-abort-status')).toHaveText( + 'listening', + ) + await page.getByTestId('enhanced-hide-abort').click() + await expect(page.getByTestId('enhanced-abort-status')).toHaveText( + 'aborted', + ) + }) + + test('nested dynamic interaction boundaries delegate through outer boundaries', async ({ + page, + }) => { + await gotoEnhanced(page) + + await clickToHydrateThenClickAndExpectIncrement( + page, + 'enhanced-dynamic-nested-button', + 'enhanced-dynamic-nested-count', + ) + await clickToHydrateThenClickAndExpectIncrement( + page, + 'enhanced-cross-file-nested-button', + 'enhanced-cross-file-nested-count', + ) + }) +}) + +test.describe('Hydrate CSS delivery', () => { + test.skip( + isDev, + 'production hydration coverage runs against the preview server', + ) + + test('ships CSS for deferred, never, shared, and nested boundaries without JavaScript', async ({ + browser, + request, + }) => { + const response = await request.get('/css') + const html = await response.text() + + htmlContainsText(html, 'CSS Deferred Hydration') + htmlContainsText(html, 'Outer CSS') + htmlContainsText(html, 'Deferred CSS') + htmlContainsText(html, 'Never CSS') + htmlContainsText(html, 'Nested CSS') + + const context = await browser.newContext({ javaScriptEnabled: false }) + const page = await context.newPage() + + try { + await page.goto('/css') + + await expect(page.getByTestId('css-heading')).toHaveText( + 'CSS Deferred Hydration', + ) + await expect(page.getByTestId('css-deferred')).toHaveText('Deferred CSS') + await expect(page.getByTestId('css-never')).toHaveText('Never CSS') + await expect(page.getByTestId('css-nested')).toHaveText('Nested CSS') + + await expectCssProperty(page, 'css-outer', 'color', 'rgb(12, 34, 56)') + await expectCssProperty( + page, + 'css-deferred', + 'background-color', + 'rgb(23, 45, 67)', + ) + await expectCssProperty(page, 'css-never', 'color', 'rgb(45, 67, 89)') + await expectCssProperty( + page, + 'css-shared-outer', + 'border-top-color', + 'rgb(98, 76, 54)', + ) + await expectCssProperty( + page, + 'css-deferred', + 'border-top-color', + 'rgb(98, 76, 54)', + ) + await expectCssProperty( + page, + 'css-nested', + 'border-left-color', + 'rgb(67, 89, 123)', + ) + await expectCssProperty(page, 'css-nested', 'border-left-width', '5px') + } finally { + await context.close() + } + }) + + test('renders deferred content and omits never content after client-side navigation', async ({ + page, + }) => { + await page.goto('/') + await expectClientRouterReady(page) + await page.getByRole('link', { name: 'CSS', exact: true }).click() + await expect(page).toHaveURL(/\/css$/) + + await expect(page.getByTestId('css-heading')).toHaveText( + 'CSS Deferred Hydration', + ) + await expect(page.getByTestId('css-deferred')).toHaveText('Deferred CSS') + await expect(page.getByTestId('css-never')).toHaveCount(0) + await expect(page.getByTestId('css-nested')).toHaveCount(0) + + await expectCssProperty( + page, + 'css-deferred', + 'background-color', + 'rgb(23, 45, 67)', + ) + }) +}) + +test.describe('imported Hydrate boundaries', () => { + test.skip( + isDev, + 'production hydration coverage runs against the preview server', + ) + + test('does not emit filtered shared Hydrate child JS on the initial document', async ({ + request, + }) => { + const response = await request.get('/imported') + const html = await response.text() + + htmlContainsText(html, 'Imported Hydrate') + htmlContainsText(html, 'Imported Hydrate Child') + + await expect( + modulePreloadContentsContain( + request, + getModulePreloadHrefs(html), + 'imported-hydrate-child', + ), + ).resolves.toBe(false) + }) + + test('does not preload Hydrate child chunks before client navigation', async ({ + page, + request, + }) => { + await page.goto('/') + await expect(page.getByTestId('home-heading')).toHaveText( + 'Deferred Hydration', + ) + await expectClientRouterReady(page) + + const link = page.getByRole('link', { name: 'imported Hydrate' }) + await page.mouse.move(0, 0) + await link.hover() + await link.focus() + + await expect( + modulePreloadContentsContain( + request, + await documentModulePreloadHrefs(page), + 'imported-hydrate-child', + ), + ).resolves.toBe(false) + await expect( + resourceContentsContain(page, request, 'imported-hydrate-child', (url) => + isClientJavaScriptResource(url), + ), + ).resolves.toBe(false) + + await page.getByRole('link', { name: 'imported Hydrate' }).click() + await expect(page).toHaveURL(/\/imported$/) + await expect(page.getByTestId('imported-hydrate-fallback')).toHaveCount(0) + await expect(page.getByTestId('imported-hydrate-child')).toContainText( + 'Imported Hydrate Child', + ) + await clickAndExpectCount( + page, + 'imported-hydrate-child', + 'imported-hydrate-count', + '1', + ) + }) + + test('hydrates imported child boundaries from the initial document on interaction', async ({ + page, + request, + }) => { + await page.goto('/imported') + await expect(page.getByTestId('imported-heading')).toHaveText( + 'Imported Hydrate', + ) + await expectClientRouterReady(page) + await expect(page.getByTestId('imported-hydrate-fallback')).toHaveCount(0) + await expectRouteToStayUnhydrated(page, 'imported-hydrate-child') + await expect( + resourceContentsContain(page, request, 'imported-hydrate-child', (url) => + isClientJavaScriptResource(url), + ), + ).resolves.toBe(false) + + await page.getByTestId('imported-hydrate-child').click() + await expect(page.getByTestId('imported-hydrate-child')).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await expect(page.getByTestId('imported-hydrate-count')).toHaveText('1') + await expect + .poll(() => + resourceContentsContain( + page, + request, + 'imported-hydrate-child', + isClientJavaScriptResource, + ), + ) + .toBe(true) + }) +}) diff --git a/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts b/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts new file mode 100644 index 0000000000..1117664a14 --- /dev/null +++ b/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts @@ -0,0 +1,38 @@ +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +function getE2EPortKey() { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +} + +export default async function setup() { + if (process.env.MODE !== 'dev') return + + const e2ePortKey = getE2EPortKey() + + await e2eStartDummyServer(e2ePortKey) + + const port = await getTestServerPort(e2ePortKey) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + warmup: async (page) => { + await page.goto(`${baseURL}/components`, { + waitUntil: 'domcontentloaded', + }) + await page.getByTestId('component-heading').waitFor({ + state: 'visible', + }) + await page.waitForLoadState('networkidle') + }, + }) +} diff --git a/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts b/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..df79f50e82 --- /dev/null +++ b/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts @@ -0,0 +1,13 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +function getE2EPortKey() { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +} + +export default async function teardown() { + if (process.env.MODE !== 'dev') return + + await e2eStopDummyServer(getE2EPortKey()) +} diff --git a/e2e/react-start/deferred-hydration/tsconfig.json b/e2e/react-start/deferred-hydration/tsconfig.json new file mode 100644 index 0000000000..cef9369516 --- /dev/null +++ b/e2e/react-start/deferred-hydration/tsconfig.json @@ -0,0 +1,21 @@ +{ + "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 + } +} diff --git a/e2e/react-start/deferred-hydration/vite.config.ts b/e2e/react-start/deferred-hydration/vite.config.ts new file mode 100644 index 0000000000..1289bc0be7 --- /dev/null +++ b/e2e/react-start/deferred-hydration/vite.config.ts @@ -0,0 +1,14 @@ +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-vite-ssr' + +export default defineConfig({ + resolve: { tsconfigPaths: true }, + build: { + outDir, + }, + server: { port: 3000 }, + plugins: [tanstackStart(), viteReact()], +}) diff --git a/e2e/react-start/hmr/tests/app.spec.ts b/e2e/react-start/hmr/tests/app.spec.ts index b3ac8b6a1a..95914f6270 100644 --- a/e2e/react-start/hmr/tests/app.spec.ts +++ b/e2e/react-start/hmr/tests/app.spec.ts @@ -1,7 +1,10 @@ -import { readFile, writeFile } from 'node:fs/promises' -import path from 'node:path' import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' +import { + createHmrFileEditor, + replaceAll, + test, +} from '@tanstack/router-e2e-utils' +import path from 'node:path' import type { Page } from '@playwright/test' @@ -115,14 +118,6 @@ const routeFileRestoreChecks: Partial< }, } -// Capture original file contents once so beforeEach can restore them -const originalContents: Partial> = {} -const routeKeysPendingRestoreCheck = new Set() - -function replaceAll(source: string, from: string, to: string) { - return source.split(from).join(to) -} - function normalizeRouteSource(routeFileKey: RouteFileKey, source: string) { let next = source @@ -254,59 +249,14 @@ function normalizeRouteSource(routeFileKey: RouteFileKey, source: string) { return next } -async function captureOriginals() { - for (const [key, filePath] of Object.entries(routeFiles) as Array< - [RouteFileKey, string] - >) { - const current = await readFile(filePath, 'utf8') - const normalized = normalizeRouteSource(key, current) - if (normalized !== current) { - await writeFile(filePath, normalized) - routeKeysPendingRestoreCheck.add(key) - } - originalContents[key] = normalized - } -} - -const capturePromise = captureOriginals() - -async function restoreRouteFiles( - forceRouteFileKeys: Iterable = [], -) { - const forceRestoreKeys = new Set(forceRouteFileKeys) - const restoredRouteKeys: Array = [] - - for (const [key, filePath] of Object.entries(routeFiles) as Array< - [RouteFileKey, string] - >) { - const content = originalContents[key] - if (content === undefined) continue - const current = await readFile(filePath, 'utf8') - // Re-emit pending restores in case the watcher coalesced the previous - // restore write and the dev server is still serving stale route options. - if (current !== content || forceRestoreKeys.has(key)) { - await writeFile(filePath, content) - restoredRouteKeys.push(key) - } - } - - return restoredRouteKeys -} - -async function replaceRouteText( - routeFileKey: RouteFileKey, - from: string, - to: string, -) { - const filePath = routeFiles[routeFileKey] - const source = await readFile(filePath, 'utf8') - - if (!source.includes(from)) { - throw new Error(`Expected route file to include ${JSON.stringify(from)}`) - } - - await writeFile(filePath, source.replace(from, to)) -} +const routeFileEditor = createHmrFileEditor({ + files: routeFiles, + normalizeSource: normalizeRouteSource, +}) +const capturePromise = routeFileEditor.capturePromise +const routeKeysPendingRestoreCheck = routeFileEditor.pendingRestoreKeys +const restoreRouteFiles = routeFileEditor.restoreFiles +const replaceRouteText = routeFileEditor.replaceText async function replaceRouteTextAndWait( page: Page, @@ -315,7 +265,7 @@ async function replaceRouteTextAndWait( to: string, assertion: () => Promise, ) { - await replaceRouteText(routeFileKey, from, to) + await routeFileEditor.replaceText(routeFileKey, from, to) await assertion() } @@ -326,17 +276,7 @@ async function rewriteRouteFile( assertion: () => Promise, options: { allowNoop?: boolean } = {}, ) { - const filePath = routeFiles[routeFileKey] - const source = await readFile(filePath, 'utf8') - const updated = updater(source) - - if (updated === source && !options.allowNoop) { - throw new Error(`Expected ${filePath} to change during rewrite`) - } - - // Even a no-op write is useful for tests that need to force the dev server - // to reconcile a stale in-memory module with the current file contents. - await writeFile(filePath, updated) + await routeFileEditor.rewriteFile(routeFileKey, updater, options) await assertion() } diff --git a/e2e/react-start/rsc-deferred-hydration/.gitignore b/e2e/react-start/rsc-deferred-hydration/.gitignore new file mode 100644 index 0000000000..cc99170fbb --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/.gitignore @@ -0,0 +1,5 @@ +dist +node_modules +port*.txt +test-results +playwright-report diff --git a/e2e/react-start/rsc-deferred-hydration/package.json b/e2e/react-start/rsc-deferred-hydration/package.json new file mode 100644 index 0000000000..7944b81552 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/package.json @@ -0,0 +1,45 @@ +{ + "name": "tanstack-react-start-e2e-rsc-deferred-hydration", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "preview": "vite preview", + "start": "node server.js", + "test:e2e": "pnpm test:e2e:dev && pnpm test:e2e:prod", + "test:e2e:dev": "MODE=dev playwright test --project=chromium", + "test:e2e:prod": "MODE=prod playwright test --project=chromium" + }, + "nx": { + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr", + "shards": 1 + } + ] + } + }, + "dependencies": { + "@tanstack/react-router": "workspace:^", + "@tanstack/react-start": "workspace:^", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "vite": "^8.0.0" + }, + "devDependencies": { + "@playwright/test": "^1.50.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", + "@vitejs/plugin-rsc": "^0.5.20", + "srvx": "^0.11.9", + "typescript": "^6.0.2" + } +} diff --git a/e2e/react-start/rsc-deferred-hydration/playwright.config.ts b/e2e/react-start/rsc-deferred-hydration/playwright.config.ts new file mode 100644 index 0000000000..10f41cd911 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/playwright.config.ts @@ -0,0 +1,35 @@ +import { defineConfig, devices } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } + +const PORT = await getTestServerPort(packageJson.name) +const baseURL = `http://localhost:${PORT}` +const mode = process.env.MODE ?? 'prod' +const isDev = mode === 'dev' + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { baseURL }, + webServer: { + command: isDev ? 'pnpm dev:e2e' : 'pnpm build && pnpm start', + url: baseURL, + reuseExistingServer: !process.env.CI, + stdout: 'pipe', + env: { + VITE_NODE_ENV: 'test', + NODE_ENV: isDev ? 'development' : 'production', + PORT: String(PORT), + VITE_SERVER_PORT: String(PORT), + }, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/react-start/rsc-deferred-hydration/server.js b/e2e/react-start/rsc-deferred-hydration/server.js new file mode 100644 index 0000000000..6365c568d4 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/server.js @@ -0,0 +1,47 @@ +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/rsc-deferred-hydration/src/components/CssHydrateIsland.module.css b/e2e/react-start/rsc-deferred-hydration/src/components/CssHydrateIsland.module.css new file mode 100644 index 0000000000..d80e17aebe --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/components/CssHydrateIsland.module.css @@ -0,0 +1,42 @@ +.cssIsland { + border-color: rgba(16, 185, 129, 0.38); + background: + linear-gradient( + 135deg, + rgba(236, 253, 245, 0.96), + rgba(255, 255, 255, 0.9) + ), + repeating-linear-gradient( + 45deg, + rgba(16, 185, 129, 0.12) 0 8px, + transparent 8px 16px + ); + color: rgb(6, 78, 59); +} + +.cssIsland h2 { + color: rgb(6, 95, 70); +} + +.cssMarker { + width: fit-content; + padding: 0.45rem 0.7rem; + border-radius: 999px; + font-weight: 900; + transition: + background 180ms ease, + color 180ms ease, + box-shadow 180ms ease; +} + +.cssMarkerPending { + background: rgb(252, 231, 243); + color: rgb(157, 23, 77); + box-shadow: 0 8px 26px rgba(219, 39, 119, 0.18); +} + +.cssMarkerHydrated { + background: rgb(209, 250, 229); + color: rgb(6, 95, 70); + box-shadow: 0 8px 26px rgba(5, 150, 105, 0.18); +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/components/CssHydrateIsland.tsx b/e2e/react-start/rsc-deferred-hydration/src/components/CssHydrateIsland.tsx new file mode 100644 index 0000000000..7f023bd10c --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/components/CssHydrateIsland.tsx @@ -0,0 +1,45 @@ +'use client' + +import * as React from 'react' +import { Hydrate } from '@tanstack/react-start' +import { media } from '@tanstack/react-start/hydration' +import { DeferredHydrateIsland } from './DeferredHydrateIsland' +import styles from './CssHydrateIsland.module.css' + +function CssHydratePanel() { + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( +
+ CSS module Hydrate island +

CSS modules survive the RSC to client boundary

+

+ {hydrated + ? 'Hydrated module-styled client content' + : 'Pending module-styled client content'} +

+ +
+ ) +} + +export function CssHydrateIsland() { + return ( +
+ + + +
+ ) +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/components/DeferredHydrateIsland.tsx b/e2e/react-start/rsc-deferred-hydration/src/components/DeferredHydrateIsland.tsx new file mode 100644 index 0000000000..0a716fe39c --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/components/DeferredHydrateIsland.tsx @@ -0,0 +1,67 @@ +'use client' + +import * as React from 'react' +import { Hydrate } from '@tanstack/react-start' +import { interaction, media, visible } from '@tanstack/react-start/hydration' + +type Strategy = 'interaction' | 'visible' | 'media' + +const strategyCopy: Record = { + interaction: 'Hydrates after pointer or focus intent reaches this island.', + visible: 'Hydrates only after the island scrolls into the viewport.', + media: 'Hydrates immediately when the matching media query is true.', +} + +function getStrategy(strategy: Strategy) { + if (strategy === 'interaction') return interaction() + if (strategy === 'visible') return visible({ rootMargin: '0px' }) + return media('(min-width: 1px)') +} + +export function CounterButton(props: { id: string; label: string }) { + const [count, setCount] = React.useState(0) + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( + + ) +} + +export function DeferredHydrateIsland(props: { + id: string + title: string + strategy: Strategy + className?: string +}) { + return ( +
+ Client Hydrate island +

{props.title}

+

{strategyCopy[props.strategy]}

+ + + +
+ ) +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/routeTree.gen.ts b/e2e/react-start/rsc-deferred-hydration/src/routeTree.gen.ts new file mode 100644 index 0000000000..246737b515 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/routeTree.gen.ts @@ -0,0 +1,122 @@ +/* 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 ServerClientRouteImport } from './routes/server-client' +import { Route as CssRouteImport } from './routes/css' +import { Route as CompositeRouteImport } from './routes/composite' +import { Route as IndexRouteImport } from './routes/index' + +const ServerClientRoute = ServerClientRouteImport.update({ + id: '/server-client', + path: '/server-client', + getParentRoute: () => rootRouteImport, +} as any) +const CssRoute = CssRouteImport.update({ + id: '/css', + path: '/css', + getParentRoute: () => rootRouteImport, +} as any) +const CompositeRoute = CompositeRouteImport.update({ + id: '/composite', + path: '/composite', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/composite': typeof CompositeRoute + '/css': typeof CssRoute + '/server-client': typeof ServerClientRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/composite': typeof CompositeRoute + '/css': typeof CssRoute + '/server-client': typeof ServerClientRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/composite': typeof CompositeRoute + '/css': typeof CssRoute + '/server-client': typeof ServerClientRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/' | '/composite' | '/css' | '/server-client' + fileRoutesByTo: FileRoutesByTo + to: '/' | '/composite' | '/css' | '/server-client' + id: '__root__' | '/' | '/composite' | '/css' | '/server-client' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + CompositeRoute: typeof CompositeRoute + CssRoute: typeof CssRoute + ServerClientRoute: typeof ServerClientRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/server-client': { + id: '/server-client' + path: '/server-client' + fullPath: '/server-client' + preLoaderRoute: typeof ServerClientRouteImport + parentRoute: typeof rootRouteImport + } + '/css': { + id: '/css' + path: '/css' + fullPath: '/css' + preLoaderRoute: typeof CssRouteImport + parentRoute: typeof rootRouteImport + } + '/composite': { + id: '/composite' + path: '/composite' + fullPath: '/composite' + preLoaderRoute: typeof CompositeRouteImport + parentRoute: typeof rootRouteImport + } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + CompositeRoute: CompositeRoute, + CssRoute: CssRoute, + ServerClientRoute: ServerClientRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { createStart } from '@tanstack/react-start' +declare module '@tanstack/react-start' { + interface Register { + ssr: true + router: Awaited> + } +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/router.tsx b/e2e/react-start/rsc-deferred-hydration/src/router.tsx new file mode 100644 index 0000000000..9d87d8748b --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/router.tsx @@ -0,0 +1,9 @@ +import { createRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + return createRouter({ + routeTree, + scrollRestoration: true, + }) +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/routes/__root.tsx b/e2e/react-start/rsc-deferred-hydration/src/routes/__root.tsx new file mode 100644 index 0000000000..7ce2e7bdb1 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/routes/__root.tsx @@ -0,0 +1,122 @@ +/// +import * as React from 'react' +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/react-router' + +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { charSet: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + { title: 'RSC Deferred Hydration E2E' }, + ], + }), + shellComponent: RootDocument, + component: () => ( +
+ +
+ ), +}) + +function RootDocument({ children }: { children: React.ReactNode }) { + return ( + + + + + + + + {children} + + + + ) +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/routes/composite.tsx b/e2e/react-start/rsc-deferred-hydration/src/routes/composite.tsx new file mode 100644 index 0000000000..3241ee487d --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/routes/composite.tsx @@ -0,0 +1,24 @@ +import { createFileRoute } from '@tanstack/react-router' +import { CompositeComponent } from '@tanstack/react-start/rsc' +import { getCompositeHydrate } from '~/server/serverHydrateComponents' +import { DeferredHydrateIsland } from '~/components/DeferredHydrateIsland' + +export const Route = createFileRoute('/composite')({ + loader: async () => ({ + Composite: await getCompositeHydrate(), + }), + component: CompositeRoute, +}) + +function CompositeRoute() { + const { Composite } = Route.useLoaderData() + return ( + + + + ) +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/routes/css.tsx b/e2e/react-start/rsc-deferred-hydration/src/routes/css.tsx new file mode 100644 index 0000000000..ddb22f318a --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/routes/css.tsx @@ -0,0 +1,14 @@ +import { createFileRoute } from '@tanstack/react-router' +import { getCssModuleHydrate } from '~/server/serverHydrateComponents' + +export const Route = createFileRoute('/css')({ + loader: async () => ({ + Server: await getCssModuleHydrate(), + }), + component: CssRoute, +}) + +function CssRoute() { + const { Server } = Route.useLoaderData() + return Server +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/routes/index.tsx b/e2e/react-start/rsc-deferred-hydration/src/routes/index.tsx new file mode 100644 index 0000000000..ebe57e7028 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/routes/index.tsx @@ -0,0 +1,35 @@ +import { createFileRoute, Link } from '@tanstack/react-router' + +export const Route = createFileRoute('/')({ + component: Home, +}) + +function Home() { + return ( +
+

RSC meets Deferred Hydration

+

+ These routes render React Server Components that cross into client + components using Hydrate. Each card explains when its + client island should hydrate and keeps server-rendered HTML visible + first. +

+
+ + Server component to client Hydrate + The RSC renders a separate "use client" component that + defers hydration until interaction. + + + Composite server shellA server component owns the + visual frame while a client child hydrates only after it becomes + visible. + + + CSS module client islandA server component renders a + client Hydrate boundary whose child uses CSS modules. + +
+
+ ) +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/routes/server-client.tsx b/e2e/react-start/rsc-deferred-hydration/src/routes/server-client.tsx new file mode 100644 index 0000000000..f39b635241 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/routes/server-client.tsx @@ -0,0 +1,14 @@ +import { createFileRoute } from '@tanstack/react-router' +import { getServerClientHydrate } from '~/server/serverHydrateComponents' + +export const Route = createFileRoute('/server-client')({ + loader: async () => ({ + Server: await getServerClientHydrate(), + }), + component: ServerClientRoute, +}) + +function ServerClientRoute() { + const { Server } = Route.useLoaderData() + return Server +} diff --git a/e2e/react-start/rsc-deferred-hydration/src/server/serverHydrateComponents.tsx b/e2e/react-start/rsc-deferred-hydration/src/server/serverHydrateComponents.tsx new file mode 100644 index 0000000000..d4e431061a --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/server/serverHydrateComponents.tsx @@ -0,0 +1,35 @@ +import * as React from 'react' +import { createServerFn } from '@tanstack/react-start' +import { + createCompositeComponent, + renderServerComponent, +} from '@tanstack/react-start/rsc' +import { + CompositeHydrateContent, + CssModuleHydrateContent, + ServerClientHydrateContent, +} from './serverHydrateContent' + +export const getServerClientHydrate = createServerFn({ method: 'GET' }).handler( + async () => { + const renderedAt = new Date().toISOString() + + return renderServerComponent( + , + ) + }, +) + +export const getCompositeHydrate = createServerFn({ method: 'GET' }).handler( + async () => { + return createCompositeComponent((props: { children?: React.ReactNode }) => ( + {props.children} + )) + }, +) + +export const getCssModuleHydrate = createServerFn({ method: 'GET' }).handler( + async () => { + return renderServerComponent() + }, +) diff --git a/e2e/react-start/rsc-deferred-hydration/src/server/serverHydrateContent.tsx b/e2e/react-start/rsc-deferred-hydration/src/server/serverHydrateContent.tsx new file mode 100644 index 0000000000..dc785a16ce --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/src/server/serverHydrateContent.tsx @@ -0,0 +1,63 @@ +import * as React from 'react' +import { DeferredHydrateIsland } from '../components/DeferredHydrateIsland' +import { CssHydrateIsland } from '../components/CssHydrateIsland' + +export function ServerClientHydrateContent({ + renderedAt, +}: { + renderedAt: string +}) { + return ( +
+ React Server Component +

Server component renders a deferred client island

+

+ Server rendered at . The button below is + present in HTML but stays unhydrated until interaction. +

+ +
+ ) +} + +export function CompositeHydrateContent({ + children, +}: { + children?: React.ReactNode +}) { + return ( +
+ Composite Server Component +

Server shell, client Hydrate slot

+

+ The server owns this descriptive shell. The client slot below remains + server HTML until an interaction reaches it. +

+
+ {children} +
+ ) +} + +export function CssModuleHydrateContent() { + return ( +
+ + Server Component plus CSS module client island + +

CSS module Hydrate boundary

+

+ This server component renders a separate client component that uses + Hydrate and CSS modules. +

+ +
+ ) +} diff --git a/e2e/react-start/rsc-deferred-hydration/tests/hydration.spec.ts b/e2e/react-start/rsc-deferred-hydration/tests/hydration.spec.ts new file mode 100644 index 0000000000..2d543c5406 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/tests/hydration.spec.ts @@ -0,0 +1,82 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import type { Page } from '@playwright/test' + +async function expectUnhydrated(page: Page, id: string) { + await expect(page.getByTestId(`${id}-button`)).toHaveAttribute( + 'data-hydrated', + 'false', + ) +} + +async function clickAndExpectCount(page: Page, id: string, count: string) { + await expect(page.getByTestId(`${id}-button`)).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await page.getByTestId(`${id}-button`).click() + await expect(page.getByTestId(`${id}-count`)).toHaveText(count) +} + +async function waitForHydrateMarkerToMount(page: Page, id: string) { + await page.waitForFunction((testId) => { + const button = document.querySelector(`[data-testid="${testId}-button"]`) + const marker = button?.closest('[data-ts-hydrate-id]') + return Object.keys(marker ?? {}).some((key) => key.startsWith('__react')) + }, id) +} + +test.describe('RSC deferred hydration', () => { + test('server component renders a client Hydrate island that hydrates on interaction', async ({ + page, + }) => { + await page.goto('/server-client') + + await expect(page.getByTestId('server-client-rsc')).toContainText( + 'Server component renders a deferred client island', + ) + await expect(page.getByTestId('server-client-island')).toContainText( + 'Interaction strategy inside RSC output', + ) + await expectUnhydrated(page, 'server-client') + + await page.getByTestId('server-client-button').hover() + await clickAndExpectCount(page, 'server-client', '1') + }) + + test('composite server component can wrap an interaction Hydrate client island', async ({ + page, + }) => { + await page.goto('/composite') + + await expect(page.getByTestId('composite-rsc')).toContainText( + 'Server shell, client Hydrate slot', + ) + await expect( + page.getByTestId('composite-interaction-island'), + ).toContainText('Interaction strategy inside a composite server component') + await expectUnhydrated(page, 'composite-interaction') + + await waitForHydrateMarkerToMount(page, 'composite-interaction') + await page.getByTestId('composite-interaction-button').hover() + await clickAndExpectCount(page, 'composite-interaction', '1') + }) + + test('server component can render a CSS module Hydrate client island', async ({ + page, + }) => { + await page.goto('/css') + + await expect(page.getByTestId('css-rsc')).toContainText( + 'CSS module Hydrate boundary', + ) + await expect(page.getByTestId('css-module-marker')).toHaveCSS( + 'font-weight', + '900', + ) + await expectUnhydrated(page, 'css-nested') + await waitForHydrateMarkerToMount(page, 'css-nested') + await page.getByTestId('css-nested-button').hover() + await clickAndExpectCount(page, 'css-nested', '1') + }) +}) diff --git a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3d1579ee87 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts @@ -0,0 +1,28 @@ +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) + + if (process.env.MODE !== 'dev') return + + const port = await getTestServerPort(packageJson.name) + const baseURL = `http://localhost:${port}` + + await waitForServer(baseURL) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + warmup: async (page) => { + for (const route of ['/server-client', '/composite', '/css']) { + await page.goto(`${baseURL}${route}`, { waitUntil: 'domcontentloaded' }) + await page.waitForLoadState('networkidle') + } + }, + }) +} diff --git a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/rsc-deferred-hydration/tsconfig.json b/e2e/react-start/rsc-deferred-hydration/tsconfig.json new file mode 100644 index 0000000000..cef9369516 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/tsconfig.json @@ -0,0 +1,21 @@ +{ + "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 + } +} diff --git a/e2e/react-start/rsc-deferred-hydration/vite.config.ts b/e2e/react-start/rsc-deferred-hydration/vite.config.ts new file mode 100644 index 0000000000..1919761bc3 --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/vite.config.ts @@ -0,0 +1,25 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import viteReact from '@vitejs/plugin-react' +import rsc from '@vitejs/plugin-rsc' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + resolve: { tsconfigPaths: true }, + build: { + outDir, + }, + server: { + port: Number(process.env.VITE_SERVER_PORT ?? 3000), + }, + plugins: [ + tanstackStart({ + rsc: { + enabled: true, + }, + }), + rsc(), + viteReact(), + ], +}) diff --git a/e2e/solid-start/deferred-hydration/.gitignore b/e2e/solid-start/deferred-hydration/.gitignore new file mode 100644 index 0000000000..1b3a07ede1 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/.gitignore @@ -0,0 +1,15 @@ +node_modules +package-lock.json +yarn.lock +.DS_Store +.cache +.env +.vercel +.output +/build/ +/api/ +/server/build +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ diff --git a/e2e/solid-start/deferred-hydration/package.json b/e2e/solid-start/deferred-hydration/package.json new file mode 100644 index 0000000000..77f55458fe --- /dev/null +++ b/e2e/solid-start/deferred-hydration/package.json @@ -0,0 +1,56 @@ +{ + "name": "tanstack-solid-start-e2e-deferred-hydration", + "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": "pnpm start:vite", + "start:vite": "srvx --prod --dir=. -s dist-vite-ssr/client --entry dist-vite-ssr/server/server.js", + "start:rsbuild": "srvx --prod --dir=. -s dist-rsbuild-ssr/client --entry dist-rsbuild-ssr/server/index.js", + "test:e2e": "playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/solid-router": "workspace:^", + "@tanstack/solid-start": "workspace:^", + "solid-js": "^1.9.10", + "vite": "^8.0.0" + }, + "devDependencies": { + "@rsbuild/core": "^2.0.1", + "@rsbuild/plugin-babel": "^1.1.2", + "@rsbuild/plugin-solid": "^1.1.1", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "^22.10.2", + "rolldown": "1.0.0-rc.18", + "srvx": "^0.11.9", + "typescript": "^6.0.2", + "vite-plugin-solid": "^2.11.11" + }, + "nx": { + "targets": { + "test:e2e": { + "parallelism": false + } + }, + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + } + ] + } + } +} diff --git a/e2e/solid-start/deferred-hydration/playwright.config.ts b/e2e/solid-start/deferred-hydration/playwright.config.ts new file mode 100644 index 0000000000..ea9e73a856 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/playwright.config.ts @@ -0,0 +1,43 @@ +import fs from 'node:fs' +import { defineConfig, devices } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } + +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const distDir = process.env.E2E_DIST_DIR ?? `dist-${toolchain}-ssr` +const e2ePortKey = + process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +const serverEntryFile = toolchain === 'rsbuild' ? 'index.js' : 'server.js' +const startCommand = `pnpm exec srvx --prod --dir=. -s ${distDir}/client --entry ${distDir}/server/${serverEntryFile}` + +if (process.env.TEST_WORKER_INDEX === undefined) { + fs.rmSync(`port-${e2ePortKey}.txt`, { force: true }) +} + +const PORT = await getTestServerPort(e2ePortKey) +const baseURL = `http://localhost:${PORT}` + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + use: { baseURL }, + webServer: { + command: startCommand, + url: baseURL, + reuseExistingServer: !process.env.CI, + stdout: 'pipe', + env: { + E2E_DIST_DIR: distDir, + NODE_ENV: 'production', + PORT: String(PORT), + VITE_SERVER_PORT: String(PORT), + }, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/solid-start/deferred-hydration/rsbuild.config.ts b/e2e/solid-start/deferred-hydration/rsbuild.config.ts new file mode 100644 index 0000000000..7ab152bb58 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/rsbuild.config.ts @@ -0,0 +1,21 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginBabel } from '@rsbuild/plugin-babel' +import { pluginSolid } from '@rsbuild/plugin-solid' +import { tanstackStart } from '@tanstack/solid-start/plugin/rsbuild' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist-rsbuild-ssr' + +export default defineConfig({ + plugins: [ + pluginBabel({ + include: /\.(?:jsx|tsx)$/, + }), + pluginSolid(), + tanstackStart(), + ], + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/solid-start/deferred-hydration/src/routeTree.gen.ts b/e2e/solid-start/deferred-hydration/src/routeTree.gen.ts new file mode 100644 index 0000000000..e75225b500 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routeTree.gen.ts @@ -0,0 +1,140 @@ +/* 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 ImportedRouteImport } from './routes/imported' +import { Route as EnhancedRouteImport } from './routes/enhanced' +import { Route as CssRouteImport } from './routes/css' +import { Route as ComponentsRouteImport } from './routes/components' +import { Route as IndexRouteImport } from './routes/index' + +const ImportedRoute = ImportedRouteImport.update({ + id: '/imported', + path: '/imported', + getParentRoute: () => rootRouteImport, +} as any) +const EnhancedRoute = EnhancedRouteImport.update({ + id: '/enhanced', + path: '/enhanced', + getParentRoute: () => rootRouteImport, +} as any) +const CssRoute = CssRouteImport.update({ + id: '/css', + path: '/css', + getParentRoute: () => rootRouteImport, +} as any) +const ComponentsRoute = ComponentsRouteImport.update({ + id: '/components', + path: '/components', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/components': typeof ComponentsRoute + '/css': typeof CssRoute + '/enhanced': typeof EnhancedRoute + '/imported': typeof ImportedRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/components': typeof ComponentsRoute + '/css': typeof CssRoute + '/enhanced': typeof EnhancedRoute + '/imported': typeof ImportedRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/components': typeof ComponentsRoute + '/css': typeof CssRoute + '/enhanced': typeof EnhancedRoute + '/imported': typeof ImportedRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/' | '/components' | '/css' | '/enhanced' | '/imported' + fileRoutesByTo: FileRoutesByTo + to: '/' | '/components' | '/css' | '/enhanced' | '/imported' + id: '__root__' | '/' | '/components' | '/css' | '/enhanced' | '/imported' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + ComponentsRoute: typeof ComponentsRoute + CssRoute: typeof CssRoute + EnhancedRoute: typeof EnhancedRoute + ImportedRoute: typeof ImportedRoute +} + +declare module '@tanstack/solid-router' { + interface FileRoutesByPath { + '/imported': { + id: '/imported' + path: '/imported' + fullPath: '/imported' + preLoaderRoute: typeof ImportedRouteImport + parentRoute: typeof rootRouteImport + } + '/enhanced': { + id: '/enhanced' + path: '/enhanced' + fullPath: '/enhanced' + preLoaderRoute: typeof EnhancedRouteImport + parentRoute: typeof rootRouteImport + } + '/css': { + id: '/css' + path: '/css' + fullPath: '/css' + preLoaderRoute: typeof CssRouteImport + parentRoute: typeof rootRouteImport + } + '/components': { + id: '/components' + path: '/components' + fullPath: '/components' + preLoaderRoute: typeof ComponentsRouteImport + parentRoute: typeof rootRouteImport + } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + ComponentsRoute: ComponentsRoute, + CssRoute: CssRoute, + EnhancedRoute: EnhancedRoute, + ImportedRoute: ImportedRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +import type { getRouter } from './router.tsx' +import type { createStart } from '@tanstack/solid-start' +declare module '@tanstack/solid-start' { + interface Register { + ssr: true + router: Awaited> + } +} diff --git a/e2e/solid-start/deferred-hydration/src/router.tsx b/e2e/solid-start/deferred-hydration/src/router.tsx new file mode 100644 index 0000000000..aa7ead6752 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/router.tsx @@ -0,0 +1,9 @@ +import { createRouter } from '@tanstack/solid-router' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + return createRouter({ + routeTree, + scrollRestoration: true, + }) +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/__root.tsx b/e2e/solid-start/deferred-hydration/src/routes/__root.tsx new file mode 100644 index 0000000000..b8c8189c6b --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/__root.tsx @@ -0,0 +1,98 @@ +/// +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/solid-router' +import { HydrationScript } from 'solid-js/web' + +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { charSet: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + { title: 'Deferred Hydration E2E' }, + ], + }), + component: RootDocument, +}) + +function RootDocument() { + return ( + + + + + + + + +
+ +
+ + + + ) +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/components.tsx b/e2e/solid-start/deferred-hydration/src/routes/components.tsx new file mode 100644 index 0000000000..9dd6387f09 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/components.tsx @@ -0,0 +1,171 @@ +import * as Solid from 'solid-js' + +import { createFileRoute } from '@tanstack/solid-router' +import { Hydrate } from '@tanstack/solid-start' +import { + condition, + idle, + interaction, + load, + media, + never, + visible, +} from '@tanstack/solid-start/hydration' + +export const Route = createFileRoute('/components')({ + component: ComponentHydrationPage, +}) + +function InteractiveBox(props: { id: string; label: string }) { + const [count, setCount] = Solid.createSignal(0) + const [hydrated, setHydrated] = Solid.createSignal(false) + + Solid.onMount(() => { + setHydrated(true) + }) + + return ( + + ) +} + +function DelayedFallbackBox() { + if (typeof window !== 'undefined') { + const [ready] = Solid.createResource(async () => { + await new Promise((resolve) => window.setTimeout(resolve, 1000)) + return true + }) + + return ( + +
fallback child
+
+ ) + } + + return
fallback child
+} + +function ComponentHydrationPage() { + const [hydratedCallbacks, setHydratedCallbacks] = Solid.createSignal(0) + const [conditionReady, setConditionReady] = Solid.createSignal(false) + const [showClientFallbackBoundary, setShowClientFallbackBoundary] = + Solid.createSignal(false) + + return ( +
+

Component Deferred Hydration

+
+ Manual test guide + + Pink buttons are server HTML that has not hydrated yet. Green buttons + have hydrated and should increment when clicked. Follow the notes + below to trigger each strategy intentionally. + +
+

{hydratedCallbacks()}

+

+ load and idle should become green + without interaction shortly after the page loads. +

+ + + + + + +
Scroll down to reveal the visible boundary
+

+ visible hydrates only after this button enters the + viewport. +

+ + + +

+ media hydrates when (min-width: 1px) + matches. interaction hydrates on hover, focus, pointer + down, or click intent. +

+ + + + + + +

+ Custom interaction boundaries below hydrate only for their configured + events: double-click for the single-event example, and right-click or + double-click for the multi-event example. The prefetch example should + download code on hover but hydrate on click. +

+ setHydratedCallbacks((count) => count + 1)} + > + + + + + + + + + + + + + + + + + + + + + + + +

+ never stays as server HTML forever on the initial page, + so clicking should not increment it. +

+ + + client fallback + } + > + + + +
+ ) +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/css.tsx b/e2e/solid-start/deferred-hydration/src/routes/css.tsx new file mode 100644 index 0000000000..c1a80d492b --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/css.tsx @@ -0,0 +1,57 @@ +import { createFileRoute } from '@tanstack/solid-router' +import { Hydrate } from '@tanstack/solid-start' +import { media, never, visible } from '@tanstack/solid-start/hydration' +import outerStyles from './css/outer.module.css' +import deferredStyles from './css/deferred-only.module.css' +import sharedStyles from './css/shared.module.css' + +export const Route = createFileRoute('/css')({ + component: CssHydrationPage, +}) + +function CssHydrationPage() { + return ( +
+
+

+ CSS Deferred Hydration +

+

+ CSS from deferred, never, shared, and nested Hydrate boundaries should + be available even before the client JavaScript hydrates those islands. +

+
+
+
+ Outer CSS +
+
+ Shared outer CSS +
+
+ +
+ Deferred CSS +
+
+ +
+ Never CSS +
+
+ + +
+ Nested CSS +
+
+
+
+ ) +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/css/deferred-only.module.css b/e2e/solid-start/deferred-hydration/src/routes/css/deferred-only.module.css new file mode 100644 index 0000000000..05eafda03c --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/css/deferred-only.module.css @@ -0,0 +1,15 @@ +.deferredBox { + background-color: rgb(23, 45, 67); + color: rgb(255, 255, 255); + padding: 12px; +} + +.neverBox { + color: rgb(45, 67, 89); + padding: 12px; +} + +.nestedBox { + border-left: 5px solid rgb(67, 89, 123); + padding-left: 12px; +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/css/outer.module.css b/e2e/solid-start/deferred-hydration/src/routes/css/outer.module.css new file mode 100644 index 0000000000..98ca5e0934 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/css/outer.module.css @@ -0,0 +1,9 @@ +.heading { + color: rgb(11, 31, 53); +} + +.outerBox { + background-color: rgb(242, 250, 255); + color: rgb(12, 34, 56); + padding: 12px; +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/css/shared.module.css b/e2e/solid-start/deferred-hydration/src/routes/css/shared.module.css new file mode 100644 index 0000000000..020da5d7ad --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/css/shared.module.css @@ -0,0 +1,4 @@ +.sharedBox { + border-top: 4px solid rgb(98, 76, 54); + margin-top: 8px; +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/enhanced.tsx b/e2e/solid-start/deferred-hydration/src/routes/enhanced.tsx new file mode 100644 index 0000000000..d699a644f1 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/enhanced.tsx @@ -0,0 +1,316 @@ +import { Show, createSignal, onMount, type JSX } from 'solid-js' +import { createFileRoute } from '@tanstack/solid-router' +import { Hydrate } from '@tanstack/solid-start' +import { interaction, media } from '@tanstack/solid-start/hydration' +import { EnhancedNestedWidget } from '../shared/EnhancedNestedWidget' + +type EnhancedSearch = { + dynamic?: 'interaction' +} + +export const Route = createFileRoute('/enhanced')({ + validateSearch: (search: Record): EnhancedSearch => ({ + dynamic: search.dynamic === 'interaction' ? 'interaction' : undefined, + }), + component: EnhancedHydrationPage, +}) + +type DeferredGate = { + promise: Promise + resolve: () => void +} + +const clickIntent = interaction({ events: 'click' }) +const pointerOverIntent = interaction({ events: 'pointerover' }) +const doubleClickIntent = interaction({ events: 'dblclick' }) + +function createDeferredGate(): DeferredGate { + let resolve!: () => void + const promise = new Promise((next) => { + resolve = next + }) + return { promise, resolve } +} + +function InteractiveBox(props: { id: string; label: string }): JSX.Element { + const [count, setCount] = createSignal(0) + const [hydrated, setHydrated] = createSignal(false) + + onMount(() => { + setHydrated(true) + }) + + return ( + + ) +} + +function DynamicWhenExamples(): JSX.Element { + const search = Route.useSearch() + const searchDrivenHydration = () => + search().dynamic === 'interaction' ? clickIntent : doubleClickIntent + + return ( + <> +

+ Dynamic callbacks are client-only. The first boundary always hydrates on + click; the second reads typed router search state before choosing its + interaction event. +

+ clickIntent}> + + + + + + + ) +} + +function SplitPrefetchExample(): JSX.Element { + const gate = createDeferredGate() + const [waitReason, setWaitReason] = createSignal('idle') + const [preloadStatus, setPreloadStatus] = createSignal('idle') + const [queryStatus, setQueryStatus] = createSignal('idle') + + return ( + <> +

{waitReason()}

+

{preloadStatus()}

+

{queryStatus()}

+ + { + setQueryStatus(element ? 'element' : 'missing-element') + setWaitReason('waiting') + + const reason = await waitFor(pointerOverIntent) + setWaitReason(reason) + if (reason === 'abort' || signal.aborted) return + + await preload() + setPreloadStatus('done') + await gate.promise + setQueryStatus('done') + }} + > + + + + ) +} + +function FireAndForgetPrefetchExample(): JSX.Element { + const gate = createDeferredGate() + const [waitReason, setWaitReason] = createSignal('idle') + const [workStatus, setWorkStatus] = createSignal('idle') + const [queryStatus, setQueryStatus] = createSignal('idle') + + return ( + <> +

{workStatus()}

+

{waitReason()}

+

{queryStatus()}

+ + { + setWaitReason('waiting') + void waitFor(pointerOverIntent).then((reason) => { + setWaitReason(reason) + if (reason === 'abort') return + + setWorkStatus('started') + void gate.promise.then(() => { + setQueryStatus('done') + }) + }) + }} + > + + + + ) +} + +function HydrateFirstPrefetchExample(): JSX.Element { + const [reason, setReason] = createSignal('idle') + + return ( + <> +

{reason()}

+ { + setReason(await waitFor(doubleClickIntent)) + }} + > + + + + ) +} + +function RuntimeOnlyPrefetchExample(): JSX.Element { + const gate = createDeferredGate() + const [waitReason, setWaitReason] = createSignal('idle') + const [runtimeStatus, setRuntimeStatus] = createSignal('idle') + + return ( + <> +

{waitReason()}

+

{runtimeStatus()}

+ + { + setWaitReason('waiting') + const reason = await waitFor(pointerOverIntent) + setWaitReason(reason) + if (reason === 'abort') return + + await gate.promise + await preload() + setRuntimeStatus('ready') + }} + > + + + + ) +} + +function WaitForAbortExample(): JSX.Element { + const [showBoundary, setShowBoundary] = createSignal(true) + const [reason, setReason] = createSignal('idle') + + return ( + <> +

{reason()}

+ + + { + setReason('waiting') + setReason(await waitFor(pointerOverIntent)) + }} + > + + + + + ) +} + +function SignalAbortExample(): JSX.Element { + const [showBoundary, setShowBoundary] = createSignal(true) + const [status, setStatus] = createSignal('idle') + + return ( + <> +

{status()}

+ + + { + setStatus('listening') + await new Promise((resolve) => { + const onAbort = () => { + setStatus('aborted') + resolve() + } + + if (signal.aborted) { + onAbort() + return + } + + signal.addEventListener('abort', onAbort, { once: true }) + }) + }} + > + + + + + ) +} + +function NestedDynamicExamples(): JSX.Element { + return ( + <> + + clickIntent}> + + + + + + ) +} + +function EnhancedHydrationPage(): JSX.Element { + return ( +
+

Enhanced Hydrate APIs

+ + + + + + + + +
+ ) +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/imported.tsx b/e2e/solid-start/deferred-hydration/src/routes/imported.tsx new file mode 100644 index 0000000000..abfb827c91 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/imported.tsx @@ -0,0 +1,15 @@ +import { createFileRoute } from '@tanstack/solid-router' +import { ImportedHydrateWidget } from '../shared/ImportedHydrateWidget' + +export const Route = createFileRoute('/imported')({ + component: ImportedHydrationPage, +}) + +function ImportedHydrationPage() { + return ( +
+

Imported Hydrate

+ +
+ ) +} diff --git a/e2e/solid-start/deferred-hydration/src/routes/index.tsx b/e2e/solid-start/deferred-hydration/src/routes/index.tsx new file mode 100644 index 0000000000..61fbf7f6dc --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/routes/index.tsx @@ -0,0 +1,23 @@ +import { Link, createFileRoute } from '@tanstack/solid-router' + +export const Route = createFileRoute('/')({ + component: Home, +}) + +function Home() { + return ( +
+

Deferred Hydration

+

Component strategies

+ component strategies +

CSS

+ CSS deferred hydration +

Imported component

+ + imported Hydrate + +

Enhanced APIs

+ enhanced Hydrate APIs +
+ ) +} diff --git a/e2e/solid-start/deferred-hydration/src/shared/EnhancedNestedWidget.tsx b/e2e/solid-start/deferred-hydration/src/shared/EnhancedNestedWidget.tsx new file mode 100644 index 0000000000..e595e38da8 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/shared/EnhancedNestedWidget.tsx @@ -0,0 +1,33 @@ +import { createSignal, onMount } from 'solid-js' +import { Hydrate } from '@tanstack/solid-start' +import { interaction, media } from '@tanstack/solid-start/hydration' + +function CrossFileNestedButton() { + const [count, setCount] = createSignal(0) + const [hydrated, setHydrated] = createSignal(false) + + onMount(() => { + setHydrated(true) + }) + + return ( + + ) +} + +export function EnhancedNestedWidget() { + return ( + + + + + + ) +} diff --git a/e2e/solid-start/deferred-hydration/src/shared/ImportedHydrateWidget.tsx b/e2e/solid-start/deferred-hydration/src/shared/ImportedHydrateWidget.tsx new file mode 100644 index 0000000000..859b741755 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/src/shared/ImportedHydrateWidget.tsx @@ -0,0 +1,34 @@ +import { createSignal } from 'solid-js' + +import { Hydrate } from '@tanstack/solid-start' +import { media } from '@tanstack/solid-start/hydration' + +function ImportedHydrateChild() { + const [count, setCount] = createSignal(0) + + return ( + + ) +} + +export function ImportedHydrateWidget() { + return ( + + imported hydrate fallback + + } + > + + + ) +} diff --git a/e2e/solid-start/deferred-hydration/tests/hydration.spec.ts b/e2e/solid-start/deferred-hydration/tests/hydration.spec.ts new file mode 100644 index 0000000000..dff2357837 --- /dev/null +++ b/e2e/solid-start/deferred-hydration/tests/hydration.spec.ts @@ -0,0 +1,909 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import type { APIRequestContext, Page } from '@playwright/test' + +async function clickAndExpectCount( + page: Page, + buttonTestId: string, + countTestId: string, + count: string, +) { + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await page.getByTestId(buttonTestId).click() + await expect(page.getByTestId(countTestId)).toHaveText(count) +} + +async function clickIntentAndExpectReplayedCount( + page: Page, + buttonTestId: string, + countTestId: string, + count: string, +) { + await expectRouteToStayUnhydrated(page, buttonTestId) + await page.getByTestId(buttonTestId).click() + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await expect(page.getByTestId(countTestId)).toHaveText(count) +} + +async function clickToHydrateThenClickAndExpectIncrement( + page: Page, + buttonTestId: string, + countTestId: string, +) { + await expectRouteToStayUnhydrated(page, buttonTestId) + await page.getByTestId(buttonTestId).click() + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'true', + ) + const previousCount = Number( + await page.getByTestId(countTestId).textContent(), + ) + await page.getByTestId(buttonTestId).click() + await expect + .poll(async () => Number(await page.getByTestId(countTestId).textContent())) + .toBe(previousCount + 1) +} + +async function hoverIntentAndExpectCount( + page: Page, + buttonTestId: string, + countTestId: string, + count: string, +) { + await expectRouteToStayUnhydrated(page, buttonTestId) + await page.mouse.move(0, 0) + await page.getByTestId(buttonTestId).hover() + await clickAndExpectCount(page, buttonTestId, countTestId, count) +} + +async function dispatchHydrationIntent( + page: Page, + buttonTestId: string, + eventName: string, +) { + await page.getByTestId(buttonTestId).evaluate((element, eventName) => { + const marker = element.closest('[data-ts-hydrate-id]') + + if (!marker) { + throw new Error('Expected Hydrate marker to exist') + } + + marker.dispatchEvent( + new Event(eventName, { bubbles: true, cancelable: true }), + ) + }, eventName) +} + +async function trackBoundaryStability(page: Page, buttonTestId: string) { + await page.getByTestId(buttonTestId).evaluate((element, testId) => { + const marker = element.closest('[data-ts-hydrate-id]') + + if (!(marker instanceof HTMLElement)) { + throw new Error('Expected Hydrate marker to exist') + } + + const win = window as typeof window & { + __hydrateBoundaryVisualGapCount?: number + __hydrateBoundaryMaxScrollDelta?: number + __hydrateBoundaryStabilityDone?: boolean + } + const hasBoundaryButton = () => + Array.from(marker.querySelectorAll('[data-testid]')).some( + (child) => child.getAttribute('data-testid') === testId, + ) + const hasHydratedBoundaryButton = () => + Array.from(marker.querySelectorAll('[data-testid]')).some( + (child) => + child.getAttribute('data-testid') === testId && + child.getAttribute('data-hydrated') === 'true', + ) + const initialScrollY = window.scrollY + + win.__hydrateBoundaryVisualGapCount = 0 + win.__hydrateBoundaryMaxScrollDelta = 0 + win.__hydrateBoundaryStabilityDone = false + + let frameCount = 0 + let hydratedFrameCount = 0 + let observer: MutationObserver | undefined + const recordScroll = () => { + win.__hydrateBoundaryMaxScrollDelta = Math.max( + win.__hydrateBoundaryMaxScrollDelta ?? 0, + Math.abs(window.scrollY - initialScrollY), + ) + + if (hasHydratedBoundaryButton()) hydratedFrameCount++ + + frameCount++ + if (hydratedFrameCount >= 10 || frameCount >= 300) { + observer?.disconnect() + win.__hydrateBoundaryStabilityDone = true + return + } + + requestAnimationFrame(recordScroll) + } + + observer = new MutationObserver(() => { + if (!hasBoundaryButton()) { + win.__hydrateBoundaryVisualGapCount!++ + } + }) + observer.observe(marker, { childList: true }) + + requestAnimationFrame(recordScroll) + }, buttonTestId) +} + +async function expectBoundaryStable(page: Page) { + await expect + .poll(() => + page.evaluate( + () => + ( + window as typeof window & { + __hydrateBoundaryStabilityDone?: boolean + } + ).__hydrateBoundaryStabilityDone ?? false, + ), + ) + .toBe(true) + await expect + .poll(() => + page.evaluate( + () => + ( + window as typeof window & { + __hydrateBoundaryVisualGapCount?: number + } + ).__hydrateBoundaryVisualGapCount ?? 0, + ), + ) + .toBe(0) + await expect + .poll(() => + page.evaluate( + () => + ( + window as typeof window & { + __hydrateBoundaryMaxScrollDelta?: number + } + ).__hydrateBoundaryMaxScrollDelta ?? 0, + ), + ) + .toBeLessThanOrEqual(1) +} + +async function expectRouteToStayUnhydrated( + page: Page, + buttonTestId: string, + duration = 250, +) { + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'false', + ) + await page.waitForTimeout(duration) + await expect(page.getByTestId(buttonTestId)).toHaveAttribute( + 'data-hydrated', + 'false', + ) +} + +async function scrollToBoundary(page: Page, buttonTestId: string) { + const button = page.getByTestId(buttonTestId) + for (let attempt = 0; attempt < 3; attempt++) { + await button.evaluate((element) => { + element.scrollIntoView({ block: 'center', inline: 'nearest' }) + }) + + await page.waitForTimeout(100) + const isVisible = await button.evaluate((element) => { + const rect = element.getBoundingClientRect() + return rect.bottom > 0 && rect.top < window.innerHeight + }) + + if (isVisible) return + } + + await expect(button).toBeInViewport() +} + +async function expectCssProperty( + page: Page, + testId: string, + property: string, + value: string, +) { + await expect + .poll(() => + page.getByTestId(testId).evaluate((element, propertyName) => { + return getComputedStyle(element).getPropertyValue(propertyName) + }, property), + ) + .toBe(value) +} + +function htmlContainsText(html: string, text: string) { + const pattern = text.split(' ').join('(?:\\s|)+') + expect(html).toMatch(new RegExp(pattern)) +} + +function getModulePreloadHrefs(html: string) { + return Array.from(html.matchAll(/]*>/g), (match) => match[0]) + .filter((tag) => /\brel="modulepreload"/.test(tag)) + .map((tag) => tag.match(/\bhref="([^"]+)"/)?.[1]) + .filter((href): href is string => !!href) +} + +async function modulePreloadContentsContain( + request: APIRequestContext, + hrefs: Array, + marker: string, +) { + for (const href of hrefs) { + const response = await request.get(href) + if (!response.ok()) continue + + const text = await response.text() + if (text.includes(marker)) return true + } + + return false +} + +async function resourceContentsContain( + page: Page, + request: APIRequestContext, + marker: string, + filter: (url: string) => boolean, +) { + const resourceUrls = await page.evaluate(() => + performance.getEntriesByType('resource').map((entry) => entry.name), + ) + + return modulePreloadContentsContain( + request, + resourceUrls.filter(filter), + marker, + ) +} + +async function documentModulePreloadHrefs(page: Page) { + return page.evaluate(() => + Array.from( + document.querySelectorAll('link[rel~="modulepreload"]'), + (link) => link.href, + ), + ) +} + +function isHydrateBoundaryResource(url: string) { + return ( + url.includes('/assets/components-') || url.includes('/static/js/async/') + ) +} + +function isClientJavaScriptResource(url: string) { + return ( + url.includes('/assets/') || + url.includes('/static/js/') || + url.includes('/static/js/async/') + ) +} + +async function expectClientRouterReady(page: Page) { + await expect + .poll(() => + page.evaluate(() => + Boolean( + ( + globalThis as typeof globalThis & { + __TSR_ROUTER__?: unknown + } + ).__TSR_ROUTER__, + ), + ), + ) + .toBe(true) +} + +async function gotoEnhanced(page: Page, search = '') { + await page.goto(`/enhanced${search}`) + await expectClientRouterReady(page) +} + +test.describe('component-level Hydrate runtime strategies', () => { + test('renders SSR HTML and hydrates each runtime when appropriately', async ({ + page, + request, + }) => { + await page.goto('/components') + + await expect(page.getByTestId('component-heading')).toHaveText( + 'Component Deferred Hydration', + ) + + await clickAndExpectCount( + page, + 'component-load-button', + 'component-load-count', + '1', + ) + await clickAndExpectCount( + page, + 'component-idle-button', + 'component-idle-count', + '1', + ) + await expect( + resourceContentsContain(page, request, 'component-visible', (url) => + isHydrateBoundaryResource(url), + ), + ).resolves.toBe(false) + await expectRouteToStayUnhydrated(page, 'component-visible-button') + await scrollToBoundary(page, 'component-visible-button') + await clickAndExpectCount( + page, + 'component-visible-button', + 'component-visible-count', + '1', + ) + await expect + .poll(() => + resourceContentsContain(page, request, 'component-visible', (url) => + isHydrateBoundaryResource(url), + ), + ) + .toBe(true) + await clickAndExpectCount( + page, + 'component-media-button', + 'component-media-count', + '1', + ) + await hoverIntentAndExpectCount( + page, + 'component-interaction-button', + 'component-interaction-count', + '1', + ) + await expect(page.getByTestId('component-on-hydrated-count')).toHaveText( + '0', + ) + await expectRouteToStayUnhydrated(page, 'component-custom-single-button') + await page.getByTestId('component-custom-single-button').hover() + await expectRouteToStayUnhydrated(page, 'component-custom-single-button') + await page.getByTestId('component-custom-single-button').click() + await expectRouteToStayUnhydrated(page, 'component-custom-single-button') + await dispatchHydrationIntent( + page, + 'component-custom-single-button', + 'dblclick', + ) + await expect( + page.getByTestId('component-custom-single-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expect(page.getByTestId('component-on-hydrated-count')).toHaveText( + '1', + ) + await clickAndExpectCount( + page, + 'component-custom-single-button', + 'component-custom-single-count', + '1', + ) + await expect(page.getByTestId('component-on-hydrated-count')).toHaveText( + '1', + ) + await expectRouteToStayUnhydrated(page, 'component-custom-multi-button') + await dispatchHydrationIntent( + page, + 'component-custom-multi-button', + 'contextmenu', + ) + await clickAndExpectCount( + page, + 'component-custom-multi-button', + 'component-custom-multi-count', + '1', + ) + await expectRouteToStayUnhydrated(page, 'component-condition-button') + await page.getByTestId('component-enable-condition').click() + await clickAndExpectCount( + page, + 'component-condition-button', + 'component-condition-count', + '1', + ) + await scrollToBoundary(page, 'component-click-replay-button') + await expectRouteToStayUnhydrated(page, 'component-click-replay-button') + await trackBoundaryStability(page, 'component-click-replay-button') + await page.getByTestId('component-click-replay-button').click() + await expect( + page.getByTestId('component-click-replay-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expectBoundaryStable(page) + await expect(page.getByTestId('component-click-replay-count')).toHaveText( + '1', + ) + await expectRouteToStayUnhydrated(page, 'component-prefetch-button') + await expect( + resourceContentsContain(page, request, 'component-prefetch', (url) => + isHydrateBoundaryResource(url), + ), + ).resolves.toBe(false) + await page.mouse.move(0, 0) + await page.getByTestId('component-prefetch-button').hover() + await expect(page.getByTestId('component-prefetch-button')).toHaveAttribute( + 'data-hydrated', + 'false', + ) + await expect + .poll(() => + resourceContentsContain(page, request, 'component-prefetch', (url) => + isHydrateBoundaryResource(url), + ), + ) + .toBe(true) + await expect(page.getByTestId('component-prefetch-button')).toHaveAttribute( + 'data-hydrated', + 'false', + ) + await page.getByTestId('component-prefetch-button').click() + await expect(page.getByTestId('component-prefetch-button')).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await expect(page.getByTestId('component-prefetch-count')).toHaveText('1') + await hoverIntentAndExpectCount( + page, + 'component-nested-child-button', + 'component-nested-child-count', + '1', + ) + + await page.getByTestId('component-never-button').click() + await expect(page.getByTestId('component-never-count')).toHaveText('0') + }) + + test('replays click after another interaction boundary hydrates first', async ({ + page, + }) => { + await page.goto('/components') + await expectClientRouterReady(page) + + await scrollToBoundary(page, 'component-custom-multi-button') + await expectRouteToStayUnhydrated(page, 'component-custom-multi-button') + await page.getByTestId('component-custom-multi-button').click({ + button: 'right', + }) + await expect( + page.getByTestId('component-custom-multi-button'), + ).toHaveAttribute('data-hydrated', 'true') + + await scrollToBoundary(page, 'component-click-replay-button') + await expectRouteToStayUnhydrated(page, 'component-click-replay-button') + await trackBoundaryStability(page, 'component-click-replay-button') + await page.getByTestId('component-click-replay-button').click() + await expect( + page.getByTestId('component-click-replay-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expectBoundaryStable(page) + await expect(page.getByTestId('component-click-replay-count')).toHaveText( + '1', + ) + }) + + test('keeps bottom scroll stable when a condition boundary hydrates', async ({ + page, + }) => { + await page.goto('/components') + await expectClientRouterReady(page) + await expectRouteToStayUnhydrated(page, 'component-condition-button') + + await page.evaluate(() => { + window.scrollTo(0, document.documentElement.scrollHeight) + }) + await page.waitForTimeout(100) + await expect( + page.getByTestId('component-enable-condition'), + ).toBeInViewport() + + await trackBoundaryStability(page, 'component-condition-button') + await page.getByTestId('component-enable-condition').click() + await expect( + page.getByTestId('component-condition-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expectBoundaryStable(page) + await clickAndExpectCount( + page, + 'component-condition-button', + 'component-condition-count', + '1', + ) + }) + + test('shows fallback during a client-only mount while the child suspends', async ({ + page, + }) => { + await page.goto('/components') + await expect(page.getByTestId('component-load-button')).toHaveAttribute( + 'data-hydrated', + 'true', + ) + await page.getByTestId('component-show-client-fallback').click() + + await expect(page.getByTestId('component-client-fallback')).toHaveText( + 'client fallback', + ) + await expect(page.getByTestId('component-fallback-child')).toHaveText( + 'fallback child', + ) + await expect(page.getByTestId('component-client-fallback')).toHaveCount(0) + }) +}) + +test.describe('enhanced Hydrate API combinations', () => { + test('server renders dynamic markers without evaluating client-only callbacks or prefetch functions', async ({ + request, + }) => { + const response = await request.get('/enhanced?dynamic=interaction') + const html = await response.text() + + expect(response.ok()).toBe(true) + htmlContainsText(html, 'Enhanced Hydrate APIs') + htmlContainsText(html, 'conditional dynamic') + expect(html).toContain('data-ts-hydrate-when="dynamic"') + expect(html).not.toContain('missing-element') + }) + + test('dynamic when functions hydrate and replay interaction events', async ({ + page, + }) => { + await gotoEnhanced(page, '?dynamic=interaction') + await expect(page.getByTestId('enhanced-heading')).toHaveText( + 'Enhanced Hydrate APIs', + ) + await clickIntentAndExpectReplayedCount( + page, + 'enhanced-dynamic-interaction-button', + 'enhanced-dynamic-interaction-count', + '1', + ) + + await expectRouteToStayUnhydrated( + page, + 'enhanced-dynamic-conditional-button', + ) + await page.getByTestId('enhanced-dynamic-conditional-button').hover() + await expectRouteToStayUnhydrated( + page, + 'enhanced-dynamic-conditional-button', + ) + await clickIntentAndExpectReplayedCount( + page, + 'enhanced-dynamic-conditional-button', + 'enhanced-dynamic-conditional-count', + '1', + ) + }) + + test('procedural prefetch can block hydration, preload the split chunk, and prepare query-like work', async ({ + page, + request, + }) => { + await gotoEnhanced(page) + await expect( + resourceContentsContain( + page, + request, + 'enhanced-procedural-split-child', + isClientJavaScriptResource, + ), + ).resolves.toBe(false) + + await expectRouteToStayUnhydrated(page, 'enhanced-procedural-split-button') + await expect(page.getByTestId('enhanced-split-wait-reason')).toHaveText( + 'waiting', + ) + await dispatchHydrationIntent( + page, + 'enhanced-procedural-split-button', + 'pointerover', + ) + await expect(page.getByTestId('enhanced-split-query')).toHaveText('element') + await expect(page.getByTestId('enhanced-split-wait-reason')).toHaveText( + 'prefetch', + ) + await expect(page.getByTestId('enhanced-split-preload')).toHaveText('done') + await expect + .poll(() => + resourceContentsContain( + page, + request, + 'enhanced-procedural-split-child', + isClientJavaScriptResource, + ), + ) + .toBe(true) + + await page.getByTestId('enhanced-procedural-split-button').click() + await expect( + page.getByTestId('enhanced-procedural-split-button'), + ).toHaveAttribute('data-hydrated', 'false') + await expect( + page.getByTestId('enhanced-procedural-split-count'), + ).toHaveText('0') + await page.getByTestId('enhanced-release-split-prefetch').click() + await expect( + page.getByTestId('enhanced-procedural-split-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expect( + page.getByTestId('enhanced-procedural-split-count'), + ).toHaveText('1') + await expect(page.getByTestId('enhanced-split-query')).toHaveText('done') + }) + + test('function prefetch supports fire-and-forget work and waitFor hydrate-first resolution', async ({ + page, + }) => { + await gotoEnhanced(page) + + await expect(page.getByTestId('enhanced-fire-wait-reason')).toHaveText( + 'waiting', + ) + await dispatchHydrationIntent( + page, + 'enhanced-fire-and-forget-button', + 'pointerover', + ) + await expect(page.getByTestId('enhanced-fire-wait-reason')).toHaveText( + 'prefetch', + ) + await expect(page.getByTestId('enhanced-fire-status')).toHaveText('started') + await clickIntentAndExpectReplayedCount( + page, + 'enhanced-fire-and-forget-button', + 'enhanced-fire-and-forget-count', + '1', + ) + await expect(page.getByTestId('enhanced-fire-query')).toHaveText('idle') + await page.getByTestId('enhanced-release-fire-prefetch').click() + await expect(page.getByTestId('enhanced-fire-query')).toHaveText('done') + + await clickIntentAndExpectReplayedCount( + page, + 'enhanced-hydrate-first-button', + 'enhanced-hydrate-first-count', + '1', + ) + await expect(page.getByTestId('enhanced-hydrate-first-reason')).toHaveText( + 'hydrate', + ) + }) + + test('split=false procedural prefetch blocks hydration without requiring a child preload chunk', async ({ + page, + }) => { + await gotoEnhanced(page) + + await expectRouteToStayUnhydrated(page, 'enhanced-runtime-only-button') + await expect(page.getByTestId('enhanced-runtime-wait-reason')).toHaveText( + 'waiting', + ) + await dispatchHydrationIntent( + page, + 'enhanced-runtime-only-button', + 'pointerover', + ) + await expect(page.getByTestId('enhanced-runtime-wait-reason')).toHaveText( + 'prefetch', + ) + await page.getByTestId('enhanced-runtime-only-button').click() + await expect( + page.getByTestId('enhanced-runtime-only-button'), + ).toHaveAttribute('data-hydrated', 'false') + await expect(page.getByTestId('enhanced-runtime-only-count')).toHaveText( + '0', + ) + await page.getByTestId('enhanced-release-runtime-prefetch').click() + await expect(page.getByTestId('enhanced-runtime-status')).toHaveText( + 'ready', + ) + await expect( + page.getByTestId('enhanced-runtime-only-button'), + ).toHaveAttribute('data-hydrated', 'true') + await expect(page.getByTestId('enhanced-runtime-only-count')).toHaveText( + '1', + ) + }) + + test('procedural prefetch aborts waiters and signals when boundaries unmount', async ({ + page, + }) => { + await gotoEnhanced(page) + + await expectRouteToStayUnhydrated(page, 'enhanced-wait-abort-button') + await expect(page.getByTestId('enhanced-wait-abort-reason')).toHaveText( + 'waiting', + ) + await page.getByTestId('enhanced-hide-wait-abort').click() + await expect(page.getByTestId('enhanced-wait-abort-reason')).toHaveText( + 'abort', + ) + + await expect(page.getByTestId('enhanced-abort-status')).toHaveText( + 'listening', + ) + await page.getByTestId('enhanced-hide-abort').click() + await expect(page.getByTestId('enhanced-abort-status')).toHaveText( + 'aborted', + ) + }) + + test('nested dynamic interaction boundaries delegate through outer boundaries', async ({ + page, + }) => { + await gotoEnhanced(page) + + await clickToHydrateThenClickAndExpectIncrement( + page, + 'enhanced-dynamic-nested-button', + 'enhanced-dynamic-nested-count', + ) + await clickToHydrateThenClickAndExpectIncrement( + page, + 'enhanced-cross-file-nested-button', + 'enhanced-cross-file-nested-count', + ) + }) +}) + +test.describe('Hydrate CSS delivery', () => { + test('ships CSS for deferred, never, shared, and nested boundaries without JavaScript', async ({ + browser, + request, + }) => { + const response = await request.get('/css') + const html = await response.text() + + htmlContainsText(html, 'CSS Deferred Hydration') + htmlContainsText(html, 'Outer CSS') + htmlContainsText(html, 'Deferred CSS') + htmlContainsText(html, 'Never CSS') + htmlContainsText(html, 'Nested CSS') + + const context = await browser.newContext({ javaScriptEnabled: false }) + const page = await context.newPage() + + try { + await page.goto('/css') + + await expect(page.getByTestId('css-heading')).toHaveText( + 'CSS Deferred Hydration', + ) + await expect(page.getByTestId('css-deferred')).toHaveText('Deferred CSS') + await expect(page.getByTestId('css-never')).toHaveText('Never CSS') + await expect(page.getByTestId('css-nested')).toHaveText('Nested CSS') + + await expectCssProperty(page, 'css-outer', 'color', 'rgb(12, 34, 56)') + await expectCssProperty( + page, + 'css-deferred', + 'background-color', + 'rgb(23, 45, 67)', + ) + await expectCssProperty(page, 'css-never', 'color', 'rgb(45, 67, 89)') + await expectCssProperty( + page, + 'css-shared-outer', + 'border-top-color', + 'rgb(98, 76, 54)', + ) + await expectCssProperty( + page, + 'css-deferred', + 'border-top-color', + 'rgb(98, 76, 54)', + ) + await expectCssProperty( + page, + 'css-nested', + 'border-left-color', + 'rgb(67, 89, 123)', + ) + await expectCssProperty(page, 'css-nested', 'border-left-width', '5px') + } finally { + await context.close() + } + }) + + test('renders deferred content and omits never content after client-side navigation', async ({ + page, + }) => { + await page.goto('/') + await expectClientRouterReady(page) + await page.getByRole('link', { name: 'CSS', exact: true }).click() + await expect(page).toHaveURL(/\/css$/) + + await expect(page.getByTestId('css-heading')).toHaveText( + 'CSS Deferred Hydration', + ) + await expect(page.getByTestId('css-deferred')).toHaveText('Deferred CSS') + await expect(page.getByTestId('css-never')).toHaveCount(0) + await expect(page.getByTestId('css-nested')).toHaveCount(0) + + await expectCssProperty( + page, + 'css-deferred', + 'background-color', + 'rgb(23, 45, 67)', + ) + }) +}) + +test.describe('imported Hydrate boundaries', () => { + test('does not emit filtered shared Hydrate child JS on the initial document', async ({ + request, + }) => { + const response = await request.get('/imported') + const html = await response.text() + + htmlContainsText(html, 'Imported Hydrate') + htmlContainsText(html, 'Imported Hydrate Child') + + await expect( + modulePreloadContentsContain( + request, + getModulePreloadHrefs(html), + 'imported-hydrate-child', + ), + ).resolves.toBe(false) + }) + + test('does not preload Hydrate child chunks before client navigation', async ({ + page, + request, + }) => { + await page.goto('/') + await expect(page.getByTestId('home-heading')).toHaveText( + 'Deferred Hydration', + ) + await expectClientRouterReady(page) + + const link = page.getByRole('link', { name: 'imported Hydrate' }) + await page.mouse.move(0, 0) + await link.hover() + await link.focus() + + await expect( + modulePreloadContentsContain( + request, + await documentModulePreloadHrefs(page), + 'imported-hydrate-child', + ), + ).resolves.toBe(false) + await expect( + resourceContentsContain(page, request, 'imported-hydrate-child', (url) => + isClientJavaScriptResource(url), + ), + ).resolves.toBe(false) + + await page.getByRole('link', { name: 'imported Hydrate' }).click() + await expect(page).toHaveURL(/\/imported$/) + await expect(page.getByTestId('imported-hydrate-fallback')).toHaveCount(0) + await expect(page.getByTestId('imported-hydrate-child')).toContainText( + 'Imported Hydrate Child', + ) + await page.getByTestId('imported-hydrate-child').click() + await expect(page.getByTestId('imported-hydrate-count')).toHaveText('1') + }) +}) diff --git a/e2e/solid-start/deferred-hydration/tsconfig.json b/e2e/solid-start/deferred-hydration/tsconfig.json new file mode 100644 index 0000000000..76cf3401fa --- /dev/null +++ b/e2e/solid-start/deferred-hydration/tsconfig.json @@ -0,0 +1,23 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "preserve", + "jsxImportSource": "solid-js", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2024", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true, + "types": ["vite/client"] + } +} diff --git a/e2e/solid-start/deferred-hydration/vite.config.ts b/e2e/solid-start/deferred-hydration/vite.config.ts new file mode 100644 index 0000000000..70f388638a --- /dev/null +++ b/e2e/solid-start/deferred-hydration/vite.config.ts @@ -0,0 +1,14 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' +import viteSolid from 'vite-plugin-solid' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist-vite-ssr' + +export default defineConfig({ + resolve: { tsconfigPaths: true }, + build: { + outDir, + }, + server: { port: 3000 }, + plugins: [tanstackStart(), viteSolid({ ssr: true })], +}) diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index 48de353b2e..6637c7542b 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -129,6 +129,7 @@ export type { AwaitOptions } from './awaited' export { CatchBoundary, ErrorComponent } from './CatchBoundary' export { ClientOnly, useHydrated } from './ClientOnly' +export { reactUse, useLayoutEffect } from './utils' export { FileRoute, diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 0e2129bb01..83dee85c78 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -48,6 +48,12 @@ "default": "./dist/esm/index.js" } }, + "./hydration": { + "import": { + "types": "./dist/esm/hydration.d.ts", + "default": "./dist/esm/hydration.js" + } + }, "./package.json": "./package.json" }, "sideEffects": false, diff --git a/packages/react-start-client/src/GenericHydrate.tsx b/packages/react-start-client/src/GenericHydrate.tsx new file mode 100644 index 0000000000..e92042a0d7 --- /dev/null +++ b/packages/react-start-client/src/GenericHydrate.tsx @@ -0,0 +1,436 @@ +'use client' + +import * as React from 'react' + +import { reactUse, useHydrated, useLayoutEffect } from '@tanstack/react-router' +import { isServer } from '@tanstack/router-core/isServer' +import { + hydrateIdAttribute, + hydrateWhenAttribute, +} from '@tanstack/start-client-core/hydration/constants' +import { + createResolvedGate, + getFallbackHtml, + getOrCreateGate, + onGateResolve, + releaseGate, + runHydrationStrategyCleanup, + saveFallbackHtml, + waitForHydrationPrefetchStrategy, +} from '@tanstack/start-client-core/hydration/runtime' +import { listenForDelegatedHydrationIntent } from '@tanstack/start-client-core/hydration' +import type { + HydrationRuntimeContext, + HydrationStrategy, + HydrationWhen, +} from '@tanstack/start-client-core/hydration' +import type { HydrationGateRecord } from '@tanstack/start-client-core/hydration/runtime' +import type { HydrateProps, InternalHydrateProps } from './Hydrate' + +type Gate = HydrationGateRecord & { promise: Promise } +type PrefetchController = { + abortController: AbortController + hydrationRequested: boolean + hydrationListeners: Set<() => void> + hydrationResolvePending: boolean + started: boolean + promise?: Promise + cleanup?: () => void +} + +const dynamicType = 'dynamic' +const dynamicHydrateStrategy = { + _t: dynamicType, + _d: () => true, +} satisfies HydrationStrategy + +function shouldDeferHydration(strategy: HydrationStrategy) { + return strategy._d ? strategy._d() : strategy._t !== 'load' +} + +function useLatest(value: T) { + const ref = React.useRef(value) + ref.current = value + return ref +} + +function useHydrationGate(props: InternalHydrateProps) { + const hydrated = useHydrated() + const reactId = React.useId() + const id = props.h ? `${props.h}${reactId}` : reactId + const when = props.when + const isDynamicHydrate = typeof when === 'function' + const dynamicHydrateStrategyRef = React.useRef( + undefined, + ) + if (isDynamicHydrate) { + dynamicHydrateStrategyRef.current ??= + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') + ? dynamicHydrateStrategy + : when() + } + const hydrateStrategy = isDynamicHydrate + ? dynamicHydrateStrategyRef.current! + : when + const markerHydrateType: HydrationWhen = isDynamicHydrate + ? dynamicType + : hydrateStrategy._t! + const [prefetchError, setPrefetchError] = React.useState() + const latestRef = useLatest({ + prefetch: props.prefetch, + preload: props.p, + }) + const gateRef = React.useRef(undefined) + const markerElementRef = React.useRef(null) + const shouldPreserveServerHTMLRef = React.useRef( + undefined, + ) + const shouldDeferInitialHydrationRef = React.useRef( + undefined, + ) + const didPrefetchRef = React.useRef(false) + const prefetchControllerRef = React.useRef( + undefined, + ) + + prefetchControllerRef.current ??= { + abortController: new AbortController(), + hydrationRequested: false, + hydrationListeners: new Set<() => void>(), + hydrationResolvePending: false, + started: false, + } + + shouldPreserveServerHTMLRef.current ??= + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') || !hydrated + shouldDeferInitialHydrationRef.current ??= + !hydrated && shouldDeferHydration(hydrateStrategy) + + if (!gateRef.current) { + gateRef.current = + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') + ? createResolvedGate(id, hydrateStrategy._t!) + : getOrCreateGate(id, hydrateStrategy._t!) + } + + gateRef.current.when = hydrateStrategy._t! + + if ( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + !(isServer ?? typeof window === 'undefined') && + hydrateStrategy._t !== 'never' && + (!shouldDeferInitialHydrationRef.current || + !shouldDeferHydration(hydrateStrategy)) + ) { + gateRef.current.resolve() + } + + const markerRef = React.useCallback( + (element: HTMLDivElement | null) => { + markerElementRef.current = element + if (element) { + if ( + hydrateStrategy._t === 'never' && + !shouldPreserveServerHTMLRef.current + ) { + element.replaceChildren() + } + saveFallbackHtml(id, element) + } + }, + [hydrateStrategy._t, id], + ) + + React.useEffect(() => { + const gate = gateRef.current! + return () => { + const controller = prefetchControllerRef.current + controller?.abortController.abort() + controller?.cleanup?.() + controller?.hydrationListeners.clear() + releaseGate(gate) + } + }, []) + + React.useEffect(() => { + if ( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') || + !latestRef.current.prefetch + ) { + return + } + + const controller = prefetchControllerRef.current! + if (controller.started) return + controller.started = true + + const onHydrate = (listener: () => void) => { + if (controller.hydrationRequested) { + listener() + return () => {} + } + + controller.hydrationListeners.add(listener) + return () => { + controller.hydrationListeners.delete(listener) + } + } + + const preload = () => latestRef.current.preload?.() ?? Promise.resolve() + const prefetchInput = latestRef.current.prefetch + + if (typeof prefetchInput === 'function') { + const promise = Promise.resolve() + .then(() => + prefetchInput({ + element: markerElementRef.current, + signal: controller.abortController.signal, + preload, + waitFor: (strategy) => + waitForHydrationPrefetchStrategy(strategy, { + element: markerElementRef.current, + signal: controller.abortController.signal, + onHydrate, + }), + }), + ) + .then(() => undefined) + + controller.promise = promise + promise.catch((error) => { + if (!controller.abortController.signal.aborted) { + setPrefetchError(error) + } + }) + return + } + + if (!latestRef.current.preload) return + + const prefetch = () => { + if (didPrefetchRef.current) return + didPrefetchRef.current = true + void preload() + } + + controller.cleanup = runHydrationStrategyCleanup( + prefetchInput._s?.({ + element: markerElementRef.current, + prefetch, + }), + ) + }, [hydrateStrategy, latestRef]) + + useLayoutEffect(() => { + const gate = gateRef.current! + if ( + !shouldDeferInitialHydrationRef.current || + hydrateStrategy._t === 'never' + ) { + return + } + + if (gate.resolved) { + return + } + + const cleanups: Array<() => void> = [] + let removeResolveListener = () => {} + let disposed = false + const resolveGate = gate.resolve + + const cleanup = () => { + if (disposed) return + disposed = true + if (gate.resolve === requestHydration) { + gate.resolve = resolveGate + } + removeResolveListener() + cleanups.forEach((fn) => fn()) + } + + const addCleanup = (fn: void | (() => void)) => { + if (!fn) return + if (disposed || gate.resolved) { + fn() + return + } + cleanups.push(fn) + } + + const requestHydration = () => { + const controller = prefetchControllerRef.current! + if (!controller.hydrationRequested) { + controller.hydrationRequested = true + controller.hydrationListeners.forEach((listener) => listener()) + controller.hydrationListeners.clear() + } + + if (!controller.promise) { + resolveGate() + return + } + if (controller.hydrationResolvePending) return + controller.hydrationResolvePending = true + + controller.promise.then( + () => resolveGate(), + (error) => { + if (!controller.abortController.signal.aborted) { + setPrefetchError(error) + } + }, + ) + } + + gate.resolve = requestHydration + removeResolveListener = onGateResolve(gate, cleanup) + + const context: HydrationRuntimeContext = { + element: markerElementRef.current, + gate, + } + addCleanup(runHydrationStrategyCleanup(hydrateStrategy._s?.(context))) + + if (hydrateStrategy._t !== 'interaction') { + addCleanup( + runHydrationStrategyCleanup( + markerElementRef.current + ? listenForDelegatedHydrationIntent( + markerElementRef.current, + context, + ) + : undefined, + ), + ) + } + + return cleanup + }, [hydrateStrategy, latestRef]) + + return { + gate: gateRef.current, + markerRef, + markerElementRef, + hydrateStrategy, + markerHydrateType, + prefetchError, + shouldPreserveServerHTML: shouldPreserveServerHTMLRef.current, + } +} + +function HydrationGate(props: { gate: Gate; children: React.ReactNode }) { + if ( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + isServer ?? + typeof window === 'undefined' + ) { + return props.children as React.JSX.Element + } + + if (props.gate.resolved) { + return props.children as React.JSX.Element + } + + if (!reactUse) { + throw props.gate.promise + } + + reactUse(props.gate.promise) + + return props.children as React.JSX.Element +} + +function HydratedBoundary(props: { + id: string + onHydrated?: () => void + onStrategyHydrated?: (id: string) => void + children: React.ReactNode +}) { + const { id, onHydrated, onStrategyHydrated } = props + const didHydrateRef = React.useRef(false) + + React.useEffect(() => { + if (didHydrateRef.current) return + didHydrateRef.current = true + onHydrated?.() + onStrategyHydrated?.(id) + }, [id, onHydrated, onStrategyHydrated]) + + return props.children as React.JSX.Element +} + +export function GenericHydrate(props: HydrateProps): React.JSX.Element { + const internalProps = props as InternalHydrateProps + const { + gate, + hydrateStrategy, + markerHydrateType, + markerElementRef, + markerRef, + prefetchError, + shouldPreserveServerHTML, + } = useHydrationGate(internalProps) + if (prefetchError) throw prefetchError + + const fallback = shouldPreserveServerHTML + ? (() => { + const html = getFallbackHtml(gate.id) + return html ? ( +
+ ) : null + })() + : (props.fallback ?? null) + const markerAttributes = + markerHydrateType === dynamicType ? undefined : hydrateStrategy._a?.() + + const hydrateType = hydrateStrategy._t! + + if (hydrateType === 'never' && !shouldPreserveServerHTML) { + return ( +
+ {props.fallback ?? null} +
+ ) + } + + return ( +
+ + + { + markerElementRef.current?.removeAttribute(hydrateWhenAttribute) + hydrateStrategy._o?.(id) + }} + > + {props.children} + + + +
+ ) +} diff --git a/packages/react-start-client/src/Hydrate.tsx b/packages/react-start-client/src/Hydrate.tsx new file mode 100644 index 0000000000..019730f3be --- /dev/null +++ b/packages/react-start-client/src/Hydrate.tsx @@ -0,0 +1,107 @@ +'use client' + +import * as React from 'react' + +import { isServer } from '@tanstack/router-core/isServer' +import type { + HydrationStrategy as CoreHydrationStrategy, + HydrationPrefetchFunction, + HydrationPrefetchStrategy, + HydrationWhen, +} from '@tanstack/start-client-core/hydration' + +export type { + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationPrefetchContext, + HydrationPrefetchFunction, + HydrationPrefetchStrategy, + HydrationPrefetchWaitReason, + HydrationWhen, +} from '@tanstack/start-client-core/hydration' + +export type ReactHydrationStrategy< + TWhen extends HydrationWhen = HydrationWhen, + TCanPrefetch extends boolean = boolean, +> = CoreHydrationStrategy & { + _h: (this: ReactHydrationStrategy, props: HydrateProps) => React.JSX.Element +} + +export type HydrationStrategy< + TWhen extends HydrationWhen = HydrationWhen, + TCanPrefetch extends boolean = boolean, +> = ReactHydrationStrategy + +export type HydrateWhen = + | ReactHydrationStrategy + | (() => ReactHydrationStrategy) + +type HydrateCommonOptions = { + when: HydrateWhen + fallback?: React.ReactNode + onHydrated?: () => void +} + +export type HydrateOptions = + | (HydrateCommonOptions & { + prefetch?: never + split?: boolean + }) + | (HydrateCommonOptions & { + prefetch: HydrationPrefetchStrategy + split?: true + }) + | (HydrateCommonOptions & { + prefetch: HydrationPrefetchFunction + split?: boolean + }) + +export type HydrateProps = HydrateOptions & { + children: React.ReactNode +} + +export type InternalHydrateProps = HydrateProps & { + h?: string + p?: () => Promise +} + +const dynamicType = 'dynamic' +const hydrateIdAttribute = 'data-ts-hydrate-id' +const hydrateWhenAttribute = 'data-ts-hydrate-when' + +/* @__NO_SIDE_EFFECTS__ */ +function ServerDynamicHydrate(props: HydrateProps): React.JSX.Element { + const internalProps = props as InternalHydrateProps + const reactId = React.useId() + const id = internalProps.h ? `${internalProps.h}${reactId}` : reactId + + return ( +
+ + {props.children} + +
+ ) +} + +/* @__NO_SIDE_EFFECTS__ */ +export function Hydrate(props: HydrateProps): React.JSX.Element { + if (typeof props.when === 'function') { + if ( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + isServer ?? + typeof window === 'undefined' + ) { + return + } + + return props.when()._h(props) + } + + return props.when._h(props) +} diff --git a/packages/react-start-client/src/hydration.ts b/packages/react-start-client/src/hydration.ts new file mode 100644 index 0000000000..fad458175c --- /dev/null +++ b/packages/react-start-client/src/hydration.ts @@ -0,0 +1,22 @@ +'use client' + +export { condition, interaction, media } from './hydration/generic' +export { idle } from './hydration/idle' +export { load } from './hydration/load' +export { never } from './hydration/never' +export { visible } from './hydration/visible' +export type { + HydrationCondition, + HydrationInteractionEvent, + HydrationInteractionEvents, + IdleHydrationOptions, + HydrationPrefetchContext, + HydrationPrefetchFunction, + HydrationPrefetchWhen, + HydrationPrefetchStrategy, + HydrationPrefetchWaitReason, + HydrationStrategyTypes, + HydrationWhen, + VisibleHydrationOptions, +} from '@tanstack/start-client-core/hydration' +export type { HydrationStrategy, ReactHydrationStrategy } from './Hydrate' diff --git a/packages/react-start-client/src/hydration/generic.ts b/packages/react-start-client/src/hydration/generic.ts new file mode 100644 index 0000000000..5ee6d3c3d6 --- /dev/null +++ b/packages/react-start-client/src/hydration/generic.ts @@ -0,0 +1,43 @@ +'use client' + +import { + condition as coreCondition, + interaction as coreInteraction, + media as coreMedia, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import { GenericHydrate } from '../GenericHydrate' +import type { + HydrationCondition, + HydrationInteractionEvents, + HydrationPrefetchStrategy, +} from '@tanstack/start-client-core/hydration' +import type { ReactHydrationStrategy } from '../Hydrate' + +/* @__NO_SIDE_EFFECTS__ */ +export function media( + query: string, +): ReactHydrationStrategy<'media', true> & HydrationPrefetchStrategy<'media'> { + return /* @__PURE__ */ withHydrationRenderer(coreMedia(query), GenericHydrate) +} + +/* @__NO_SIDE_EFFECTS__ */ +export function condition( + condition: HydrationCondition, +): ReactHydrationStrategy<'condition', false> { + return /* @__PURE__ */ withHydrationRenderer( + coreCondition(condition), + GenericHydrate, + ) +} + +/* @__NO_SIDE_EFFECTS__ */ +export function interaction(options?: { + events?: HydrationInteractionEvents +}): ReactHydrationStrategy<'interaction', true> & + HydrationPrefetchStrategy<'interaction'> { + return /* @__PURE__ */ withHydrationRenderer( + coreInteraction(options), + GenericHydrate, + ) +} diff --git a/packages/react-start-client/src/hydration/idle.ts b/packages/react-start-client/src/hydration/idle.ts new file mode 100644 index 0000000000..58c7f265eb --- /dev/null +++ b/packages/react-start-client/src/hydration/idle.ts @@ -0,0 +1,22 @@ +'use client' + +import { + idle as coreIdle, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import { GenericHydrate } from '../GenericHydrate' +import type { + HydrationPrefetchStrategy, + IdleHydrationOptions, +} from '@tanstack/start-client-core/hydration' +import type { ReactHydrationStrategy } from '../Hydrate' + +/* @__NO_SIDE_EFFECTS__ */ +export function idle( + options: IdleHydrationOptions = {}, +): ReactHydrationStrategy<'idle', true> & HydrationPrefetchStrategy<'idle'> { + return /* @__PURE__ */ withHydrationRenderer( + coreIdle(options), + GenericHydrate, + ) +} diff --git a/packages/react-start-client/src/hydration/load.tsx b/packages/react-start-client/src/hydration/load.tsx new file mode 100644 index 0000000000..006f4e6952 --- /dev/null +++ b/packages/react-start-client/src/hydration/load.tsx @@ -0,0 +1,49 @@ +'use client' + +import * as React from 'react' + +import { + load as coreLoad, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import type { HydrationPrefetchStrategy } from '@tanstack/start-client-core/hydration' +import type { HydrateProps, ReactHydrationStrategy } from '../Hydrate' + +function HydratedBoundary(props: { + onHydrated?: () => void + children: React.ReactNode +}) { + const { onHydrated, children } = props + const didHydrateRef = React.useRef(false) + + React.useEffect(() => { + if (didHydrateRef.current) return + didHydrateRef.current = true + onHydrated?.() + }, [onHydrated]) + + return children as React.JSX.Element +} + +export function LoadHydrate(props: HydrateProps): React.JSX.Element { + return ( +
+ + + {props.children} + + +
+ ) +} + +const loadStrategy = /* @__PURE__ */ withHydrationRenderer( + coreLoad(), + LoadHydrate, +) as ReactHydrationStrategy<'load', true> & HydrationPrefetchStrategy<'load'> + +/* @__NO_SIDE_EFFECTS__ */ +export function load(): ReactHydrationStrategy<'load', true> & + HydrationPrefetchStrategy<'load'> { + return loadStrategy +} diff --git a/packages/react-start-client/src/hydration/never.tsx b/packages/react-start-client/src/hydration/never.tsx new file mode 100644 index 0000000000..250a8ed1ae --- /dev/null +++ b/packages/react-start-client/src/hydration/never.tsx @@ -0,0 +1,97 @@ +'use client' + +import * as React from 'react' + +import { reactUse, useHydrated } from '@tanstack/react-router' +import { isServer } from '@tanstack/router-core/isServer' +import { + never as coreNever, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import { + hydrateIdAttribute, + hydrateWhenAttribute, +} from '@tanstack/start-client-core/hydration/constants' +import { + getFallbackHtml, + saveFallbackHtml, +} from '@tanstack/start-client-core/hydration/runtime' +import type { + HydrateProps, + InternalHydrateProps, + ReactHydrationStrategy, +} from '../Hydrate' + +const neverType = 'never' +const neverPromise = new Promise(() => {}) + +function NeverGate(props: { children: React.ReactNode }) { + if ( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + isServer ?? + typeof window === 'undefined' + ) { + return props.children as React.JSX.Element + } + + if (!reactUse) { + throw neverPromise + } + + reactUse(neverPromise) + + return props.children as React.JSX.Element +} + +export function NeverHydrate(props: HydrateProps): React.JSX.Element { + const internalProps = props as InternalHydrateProps + const hydrated = useHydrated() + const reactId = React.useId() + const id = internalProps.h ? `${internalProps.h}${reactId}` : reactId + const shouldPreserveServerHTMLRef = React.useRef( + undefined, + ) + shouldPreserveServerHTMLRef.current ??= + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') || !hydrated + const markerRef = React.useCallback( + (element: HTMLDivElement | null) => { + if (!element) return + if (!shouldPreserveServerHTMLRef.current) { + element.replaceChildren() + } else { + saveFallbackHtml(id, element) + } + }, + [id], + ) + const markerProps = { + ref: markerRef, + [hydrateIdAttribute]: id, + [hydrateWhenAttribute]: neverType, + } + const fallback = (() => { + const html = getFallbackHtml(id) + return html ? ( +
+ ) : ( + (props.fallback ?? null) + ) + })() + + return ( +
+ + {props.children} + +
+ ) +} + +/* @__NO_SIDE_EFFECTS__ */ +export function never(): ReactHydrationStrategy<'never', false> { + return /* @__PURE__ */ withHydrationRenderer(coreNever(), NeverHydrate) +} diff --git a/packages/react-start-client/src/hydration/visible.tsx b/packages/react-start-client/src/hydration/visible.tsx new file mode 100644 index 0000000000..e274285cb8 --- /dev/null +++ b/packages/react-start-client/src/hydration/visible.tsx @@ -0,0 +1,139 @@ +'use client' + +import * as React from 'react' + +import { reactUse } from '@tanstack/react-router' +import { isServer } from '@tanstack/router-core/isServer' +import type { + HydrationPrefetchStrategy, + VisibleHydrationOptions, +} from '@tanstack/start-client-core/hydration' +import type { + HydrateProps, + InternalHydrateProps, + ReactHydrationStrategy, +} from '../Hydrate' + +type VisibleGate = { + p: Promise + r: boolean + s: () => void +} + +/* @__NO_SIDE_EFFECTS__ */ +function HydrationBoundary(props: { + g: VisibleGate + o?: () => void + children?: React.ReactNode +}) { + const { g, o } = props + + if (!g.r) { + if (!reactUse) { + throw g.p + } + + reactUse(g.p) + } + + React.useEffect(() => { + o?.() + }, [o]) + + return props.children as React.JSX.Element +} + +/* @__NO_SIDE_EFFECTS__ */ +export function VisibleHydrate( + this: ReactHydrationStrategy, + props: HydrateProps, +): React.JSX.Element { + const strategy = this as ReactHydrationStrategy<'visible', true> + const prefetchStrategy = props.prefetch + const preload = (props as InternalHydrateProps).p + const markerRef = React.useRef(null) + const [gate] = React.useState(() => { + let resolvePromise!: () => void + const nextGate: VisibleGate = { + p: new Promise((resolve) => { + resolvePromise = resolve + }), + r: false, + s: () => { + nextGate.r = true + resolvePromise() + }, + } + if ( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + isServer ?? + typeof window === 'undefined' + ) { + nextGate.s() + } + + return nextGate + }) + + React.useEffect(() => { + if (!preload || typeof prefetchStrategy === 'function') { + return + } + + return prefetchStrategy?._s?.({ + element: markerRef.current, + prefetch: preload, + }) + }, [prefetchStrategy, preload]) + + React.useEffect(() => { + if (gate.r) return + + return strategy._s?.({ + element: markerRef.current, + gate: gate as never, + }) + }, [gate, strategy]) + + return ( +
+ + + {props.children} + + +
+ ) +} + +/* @__NO_SIDE_EFFECTS__ */ +export function visible( + options?: VisibleHydrationOptions, +): ReactHydrationStrategy<'visible', true> & + HydrationPrefetchStrategy<'visible'> { + const rootMargin = options?.rootMargin ?? '600px' + const threshold = options?.threshold ?? 0 + + return { + _s: ({ element, gate, prefetch }) => { + const callback = prefetch || (gate as never as VisibleGate).s + + if (!element) { + callback() + return + } + + const observer = new IntersectionObserver( + (entries) => { + if (!entries[0]!.isIntersecting) return + observer.disconnect() + callback() + }, + { rootMargin, threshold }, + ) + observer.observe(element) + return () => observer.disconnect() + }, + _h: VisibleHydrate, + } +} diff --git a/packages/react-start-client/src/index.tsx b/packages/react-start-client/src/index.tsx index aa73990a57..669b1e0e3f 100644 --- a/packages/react-start-client/src/index.tsx +++ b/packages/react-start-client/src/index.tsx @@ -1,2 +1,18 @@ +'use client' + export { StartClient } from './StartClient' export { hydrateStart } from './hydrateStart' +export { Hydrate } from './Hydrate' +export type { + HydrateOptions, + HydrateProps, + HydrateWhen, + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationPrefetchContext, + HydrationPrefetchFunction, + HydrationPrefetchStrategy, + HydrationPrefetchWaitReason, + HydrationStrategy, + HydrationWhen, +} from './Hydrate' diff --git a/packages/react-start-client/src/tests/Hydrate.test-d.tsx b/packages/react-start-client/src/tests/Hydrate.test-d.tsx new file mode 100644 index 0000000000..2e3726edfa --- /dev/null +++ b/packages/react-start-client/src/tests/Hydrate.test-d.tsx @@ -0,0 +1,147 @@ +import { expectTypeOf, test } from 'vitest' +import { visible } from '../hydration' +import { Hydrate } from '../Hydrate' +import type { + HydrateOptions, + HydrateProps, + HydrationPrefetchFunction, + HydrationPrefetchStrategy, + HydrationStrategy, +} from '../Hydrate' +import type { HydrationStrategy as CoreHydrationStrategy } from '@tanstack/start-client-core/hydration' +import type { ReactNode } from 'react' + +type CommonHydrateProps = { + fallback?: ReactNode + onHydrated?: () => void + children: ReactNode +} + +type SplitHydrateProps = CommonHydrateProps & { + when: HydrationStrategy | (() => HydrationStrategy) + prefetch?: never + split?: boolean +} + +type PrefetchHydrateProps = CommonHydrateProps & { + when: HydrationStrategy | (() => HydrationStrategy) + prefetch: HydrationPrefetchStrategy + split?: true +} + +type FunctionPrefetchHydrateProps = CommonHydrateProps & { + when: HydrationStrategy | (() => HydrationStrategy) + prefetch: HydrationPrefetchFunction + split?: boolean +} + +test('Hydrate component accepts the public HydrateProps type', () => { + expectTypeOf(Hydrate).toBeFunction() + expectTypeOf(Hydrate).parameter(0).branded.toEqualTypeOf() +}) + +test('HydrateOptions supports reusable spread props', () => { + const belowFoldProps = { + when: () => visible({ rootMargin: '800px' }), + } satisfies HydrateOptions + + expectTypeOf(belowFoldProps).toMatchTypeOf() + + const withFunctionPrefetch = { + when: visible(), + split: false, + prefetch: (ctx) => { + expectTypeOf(ctx.element).toEqualTypeOf() + expectTypeOf(ctx.signal).toEqualTypeOf() + expectTypeOf(ctx.preload).returns.toEqualTypeOf>() + expectTypeOf(ctx.waitFor).returns.toEqualTypeOf< + Promise<'prefetch' | 'hydrate' | 'abort'> + >() + }, + } satisfies HydrateOptions + + expectTypeOf(withFunctionPrefetch).toMatchTypeOf() +}) + +test('Hydrate props are exact for strategy and prefetch forms', () => { + expectTypeOf< + Extract + >().branded.toEqualTypeOf() + expectTypeOf< + Extract + >().branded.toEqualTypeOf() + expectTypeOf< + Extract + >().branded.toEqualTypeOf() +}) + +test('Hydrate requires a strategy', () => { + expectTypeOf<{ + when: HydrationStrategy + children: ReactNode + }>().toMatchTypeOf() + + expectTypeOf<{ + when: () => HydrationStrategy + children: ReactNode + }>().toMatchTypeOf() + + expectTypeOf<{ + children: ReactNode + }>().not.toMatchTypeOf() + + expectTypeOf<{ + when: () => true + children: ReactNode + }>().not.toMatchTypeOf() + + expectTypeOf<{ + when: false + children: ReactNode + }>().not.toMatchTypeOf() +}) + +test('Hydrate requires a framework-renderable strategy', () => { + expectTypeOf().not.toMatchTypeOf() + expectTypeOf>().toMatchTypeOf() + + expectTypeOf<{ + when: CoreHydrationStrategy + children: ReactNode + }>().not.toMatchTypeOf() +}) + +test('Hydrate enforces prefetch only with split boundaries', () => { + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchStrategy + children: ReactNode + }>().toMatchTypeOf() + + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchStrategy + split: true + children: ReactNode + }>().toMatchTypeOf() + + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchStrategy + split: false + children: ReactNode + }>().not.toMatchTypeOf() + + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchFunction + split: false + children: ReactNode + }>().toMatchTypeOf() + + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchFunction + children: ReactNode + }>().toMatchTypeOf() +}) diff --git a/packages/react-start-client/src/tests/Hydrate.test.tsx b/packages/react-start-client/src/tests/Hydrate.test.tsx new file mode 100644 index 0000000000..0d0ce1faad --- /dev/null +++ b/packages/react-start-client/src/tests/Hydrate.test.tsx @@ -0,0 +1,676 @@ +import * as React from 'react' +import { renderToString } from 'react-dom/server' +import { hydrateRoot } from 'react-dom/client' +import { + act, + cleanup, + fireEvent, + render, + screen, + waitFor, +} from '@testing-library/react' +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 type { HydrateProps, HydrationPrefetchStrategy } from '../Hydrate' + +const InternalHydrate = Hydrate as React.ComponentType< + HydrateProps & { p?: () => Promise; h?: string } +> + +const hydrateIdSelector = `[${hydrateIdAttribute}]` + +function getMarker() { + const marker = document.querySelector(hydrateIdSelector) + + if (!marker) { + throw new Error('Expected Hydrate marker to exist') + } + + return marker +} + +function InteractiveChild() { + const [count, setCount] = React.useState(0) + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( + + ) +} + +function NamedInteractiveChild(props: { id: string }) { + const [hydrated, setHydrated] = React.useState(false) + + React.useEffect(() => { + setHydrated(true) + }, []) + + return ( + + ) +} + +function createSuspendingChild() { + let resolve!: () => void + let resolved = false + const promise = new Promise((resolvePromise) => { + resolve = () => { + resolved = true + resolvePromise() + } + }) + + function SuspendingChild() { + if (!resolved) { + throw promise + } + + return
child
+ } + + return { resolve, SuspendingChild } +} + +async function expectNoHydrationAfterDefaultIntentEvents() { + const marker = getMarker() + + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'false', + ) + + await act(async () => { + fireEvent.pointerEnter(marker) + fireEvent.focusIn(marker) + fireEvent.pointerDown(marker) + fireEvent.click(marker) + await new Promise((resolve) => setTimeout(resolve, 20)) + }) + + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'false', + ) +} + +async function fireIntent(event: () => void) { + await act(async () => { + event() + await Promise.resolve() + }) +} + +async function renderAsync(ui: React.ReactElement) { + await act(async () => { + render(ui) + await Promise.resolve() + }) +} + +async function hydrateFromServer(ui: React.ReactElement) { + vi.stubGlobal('window', undefined) + const html = renderToString(ui) + vi.unstubAllGlobals() + + const container = document.createElement('div') + document.body.append(container) + container.innerHTML = html + + let root!: ReturnType + await act(async () => { + root = hydrateRoot(container, ui) + await Promise.resolve() + }) + + return { container, html, root } +} + +async function unmountHydratedRoot( + root: ReturnType, + container: Element, +) { + await act(async () => { + root.unmount() + }) + container.remove() +} + +afterEach(() => { + cleanup() + vi.unstubAllGlobals() +}) + +describe('Hydrate', () => { + it('uses a single custom interaction event instead of the default intent events', async () => { + const { container, html, root } = await hydrateFromServer( + fallback
} + > + + , + ) + + try { + expect(html).toContain('data-testid="child"') + expect(html).not.toContain('data-testid="fallback"') + expect(screen.queryByTestId('fallback')).toBeNull() + await expectNoHydrationAfterDefaultIntentEvents() + + await fireIntent(() => + getMarker().dispatchEvent( + new MouseEvent('dblclick', { bubbles: true, cancelable: true }), + ), + ) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('uses every event in a custom interaction event list', async () => { + const { container, root } = await hydrateFromServer( + fallback
} + > + + , + ) + + try { + expect(screen.queryByTestId('fallback')).toBeNull() + await expectNoHydrationAfterDefaultIntentEvents() + + await fireIntent(() => + getMarker().dispatchEvent( + new MouseEvent('contextmenu', { bubbles: true, cancelable: true }), + ), + ) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('omits never content when mounted after the app is already hydrated', async () => { + await renderAsync( + + + , + ) + + expect(screen.queryByTestId('child')).toBeNull() + }) + + it('shows fallback for a client-only mount while children suspend', async () => { + const { resolve, SuspendingChild } = createSuspendingChild() + + await renderAsync( + fallback} + > + + , + ) + + expect(screen.getByTestId('fallback').textContent).toBe('fallback') + expect(screen.queryByTestId('child')).toBeNull() + + await act(async () => { + resolve() + await Promise.resolve() + }) + + await screen.findByTestId('child') + expect(screen.queryByTestId('fallback')).toBeNull() + }) + + it('does not use fallback for an initial never boundary', async () => { + const { container, html, root } = await hydrateFromServer( + fallback} + > + + , + ) + + try { + expect(html).toContain('data-testid="child"') + expect(html).not.toContain('data-testid="fallback"') + expect(screen.queryByTestId('fallback')).toBeNull() + + fireEvent.click(screen.getByTestId('child')) + await new Promise((resolve) => setTimeout(resolve, 20)) + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'false', + ) + expect(screen.getByTestId('child').textContent).toBe('0') + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('keeps repeated split boundaries independently gated', async () => { + const { container, root } = await hydrateFromServer( + <> + + + + + + + , + ) + + try { + const markers = container.querySelectorAll(hydrateIdSelector) + + expect(markers).toHaveLength(2) + expect(markers[0]!.getAttribute(hydrateIdAttribute)).not.toBe( + markers[1]!.getAttribute(hydrateIdAttribute), + ) + expect( + screen.getByTestId('child-one').getAttribute('data-hydrated'), + ).toBe('false') + expect( + screen.getByTestId('child-two').getAttribute('data-hydrated'), + ).toBe('false') + + await fireIntent(() => + markers[0]!.dispatchEvent( + new MouseEvent('click', { bubbles: true, cancelable: true }), + ), + ) + + await waitFor(() => + expect( + screen.getByTestId('child-one').getAttribute('data-hydrated'), + ).toBe('true'), + ) + expect( + screen.getByTestId('child-two').getAttribute('data-hydrated'), + ).toBe('false') + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('fires onHydrated once after the client hydration commit', async () => { + const onHydrated = vi.fn() + const app = ( + +
child
+
+ ) + + vi.stubGlobal('window', undefined) + const html = renderToString(app) + expect(html).toContain('child') + expect(onHydrated).not.toHaveBeenCalled() + vi.unstubAllGlobals() + + const container = document.createElement('div') + document.body.append(container) + container.innerHTML = html + + let root!: ReturnType + await act(async () => { + root = hydrateRoot(container, app) + }) + + await waitFor(() => expect(onHydrated).toHaveBeenCalledTimes(1)) + + fireEvent.click(screen.getByTestId('child')) + await new Promise((resolve) => setTimeout(resolve, 20)) + expect(onHydrated).toHaveBeenCalledTimes(1) + + await act(async () => { + root.unmount() + }) + container.remove() + }) + + it('prefetches split children without hydrating the boundary', async () => { + const preload = vi.fn(() => Promise.resolve()) + + const { container, root } = await hydrateFromServer( + + + , + ) + + try { + await waitFor(() => expect(preload).toHaveBeenCalledTimes(1)) + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'false', + ) + + await fireIntent(() => + getMarker().dispatchEvent( + new MouseEvent('click', { bubbles: true, cancelable: true }), + ), + ) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + expect(preload).toHaveBeenCalledTimes(1) + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('does not evaluate dynamic when callbacks on the server', async () => { + const when = vi.fn(() => interaction({ events: 'dblclick' })) + + vi.stubGlobal('window', undefined) + const html = renderToString( + + + , + ) + vi.unstubAllGlobals() + + expect(when).not.toHaveBeenCalled() + expect(html).toContain('data-ts-hydrate-when="dynamic"') + + const container = document.createElement('div') + document.body.append(container) + container.innerHTML = html + + let root!: ReturnType + try { + await act(async () => { + root = hydrateRoot( + container, + + + , + ) + await Promise.resolve() + }) + + expect(when).toHaveBeenCalled() + await expectNoHydrationAfterDefaultIntentEvents() + + await fireIntent(() => + getMarker().dispatchEvent( + new MouseEvent('dblclick', { bubbles: true, cancelable: true }), + ), + ) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('replays an interaction captured before the Hydrate component hydrates', async () => { + const when = () => interaction({ events: 'click' }) + + vi.stubGlobal('window', undefined) + const html = renderToString( + + + , + ) + vi.unstubAllGlobals() + + const container = document.createElement('div') + document.body.append(container) + container.innerHTML = html + + const button = container.querySelector('[data-testid="child"]') + if (!button) { + throw new Error('Expected server-rendered child button') + } + + button.dispatchEvent( + new MouseEvent('click', { bubbles: true, cancelable: true }), + ) + + let root!: ReturnType + try { + await act(async () => { + root = hydrateRoot( + container, + + + , + ) + await Promise.resolve() + }) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + await waitFor(() => + expect(screen.getByTestId('child').textContent).toBe('1'), + ) + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('blocks hydration on awaited procedural prefetch work', async () => { + const preload = vi.fn(() => Promise.resolve()) + let resolvePrefetch!: () => void + const prefetchBlocker = new Promise((resolve) => { + resolvePrefetch = resolve + }) + const waitReasons: Array = [] + const neverPrefetches = { + _t: 'idle', + _s: () => () => {}, + } as HydrationPrefetchStrategy<'idle'> + + const { container, root } = await hydrateFromServer( + { + waitReasons.push(await waitFor(neverPrefetches)) + await preload() + await prefetchBlocker + }} + p={preload} + > + + , + ) + + try { + await fireIntent(() => + getMarker().dispatchEvent( + new MouseEvent('click', { bubbles: true, cancelable: true }), + ), + ) + + await waitFor(() => expect(waitReasons).toEqual(['hydrate'])) + expect(preload).toHaveBeenCalledTimes(1) + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'false', + ) + + await act(async () => { + resolvePrefetch() + await prefetchBlocker + await Promise.resolve() + }) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('hydrates when a condition strategy changes after the initial render', async () => { + function ConditionHarness() { + const [ready, setReady] = React.useState(false) + + return ( + <> + + + + + + ) + } + + const { container, root } = await hydrateFromServer() + + try { + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'false', + ) + + await act(async () => { + fireEvent.click(screen.getByTestId('ready')) + await Promise.resolve() + }) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('does not block hydration on fire-and-forget procedural prefetch work', async () => { + let resolvePrefetch!: () => void + const prefetchBlocker = new Promise((resolve) => { + resolvePrefetch = resolve + }) + + const { container, root } = await hydrateFromServer( + { + void prefetchBlocker + }} + > + + , + ) + + try { + await fireIntent(() => + getMarker().dispatchEvent( + new MouseEvent('click', { bubbles: true, cancelable: true }), + ), + ) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + + await act(async () => { + resolvePrefetch() + await prefetchBlocker + }) + } finally { + await unmountHydratedRoot(root, container) + } + }) + + it('aborts procedural prefetch when the boundary unmounts', async () => { + const signals: Array = [] + + const { container, root } = await hydrateFromServer( + { + signals.push(signal) + return new Promise(() => {}) + }} + > + + , + ) + + expect(signals).toHaveLength(1) + expect(signals[0]!.aborted).toBe(false) + + await unmountHydratedRoot(root, container) + expect(signals[0]!.aborted).toBe(true) + }) + + it('delegates nested interaction boundaries at runtime', async () => { + const { container, root } = await hydrateFromServer( + + + + + , + ) + + try { + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'false', + ) + + await fireIntent(() => { + fireEvent.click(screen.getByTestId('child')) + }) + + await waitFor(() => + expect(screen.getByTestId('child').getAttribute('data-hydrated')).toBe( + 'true', + ), + ) + } finally { + await unmountHydratedRoot(root, container) + } + }) +}) diff --git a/packages/react-start-client/vite.config.ts b/packages/react-start-client/vite.config.ts index 32119eee3a..40e07174ac 100644 --- a/packages/react-start-client/vite.config.ts +++ b/packages/react-start-client/vite.config.ts @@ -20,7 +20,7 @@ export default mergeConfig( tanstackViteConfig({ tsconfigPath: './tsconfig.build.json', srcDir: './src', - entry: './src/index.tsx', + entry: ['./src/index.tsx', './src/hydration.ts'], cjs: false, }), ) diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 8f1ca3ba1a..637d9e7546 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -48,6 +48,12 @@ "default": "./dist/esm/client.js" } }, + "./hydration": { + "import": { + "types": "./dist/esm/hydration.d.ts", + "default": "./dist/esm/hydration.js" + } + }, "./client-rpc": { "import": { "types": "./dist/esm/client-rpc.d.ts", diff --git a/packages/react-start/src/hydration.ts b/packages/react-start/src/hydration.ts new file mode 100644 index 0000000000..e86169e71d --- /dev/null +++ b/packages/react-start/src/hydration.ts @@ -0,0 +1,18 @@ +export { + condition, + idle, + interaction, + load, + media, + never, + visible, +} from '@tanstack/react-start-client/hydration' +export type { + HydrationCondition, + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationPrefetchStrategy, + HydrationStrategy, + HydrationWhen, + VisibleHydrationOptions, +} from '@tanstack/react-start-client/hydration' diff --git a/packages/react-start/src/index.ts b/packages/react-start/src/index.ts index 8b51b6c783..65b116ec2e 100644 --- a/packages/react-start/src/index.ts +++ b/packages/react-start/src/index.ts @@ -1,2 +1,13 @@ export { useServerFn } from './useServerFn' export * from '@tanstack/start-client-core' +export { createServerFn } from '@tanstack/start-client-core' +export { Hydrate } from '@tanstack/react-start-client' +export type { + HydrateOptions, + HydrateProps, + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationPrefetchStrategy, + HydrationStrategy, + HydrationWhen, +} from '@tanstack/react-start-client' diff --git a/packages/react-start/vite.config.ts b/packages/react-start/vite.config.ts index 0995b1f9b4..652e4ef842 100644 --- a/packages/react-start/vite.config.ts +++ b/packages/react-start/vite.config.ts @@ -27,6 +27,7 @@ export default mergeConfig( entry: [ './src/index.ts', './src/client.tsx', + './src/hydration.ts', './src/client-rpc.ts', './src/server.tsx', './src/server.rsc.ts', diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index ded15fff6d..e737fa50f8 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -185,6 +185,7 @@ export type { RouteContextFn, ContextOptions, RouteContextOptions, + SsrContextOptions, BeforeLoadContextOptions, RootRouteOptions, RootRouteOptionsExtensions, diff --git a/packages/router-core/src/ssr/ssr-server.ts b/packages/router-core/src/ssr/ssr-server.ts index 2bca7009d9..c1e467f2fb 100644 --- a/packages/router-core/src/ssr/ssr-server.ts +++ b/packages/router-core/src/ssr/ssr-server.ts @@ -292,23 +292,27 @@ export function attachRouterServerSsrUtils({ }) { router.ssr = { get manifest() { + if (!manifest) return manifest + const requestAssets = getRequestAssets?.() - const inlineCssAsset = getInlineCssAssetForMatches( - manifest, - router.stores.matches.get(), - ) - if (!requestAssets?.length && !inlineCssAsset) return manifest + const matches = router.stores.matches.get() + const inlineCssAsset = getInlineCssAssetForMatches(manifest, matches) + + if (!requestAssets?.length && !inlineCssAsset) { + return manifest + } + // Merge request-scoped assets into root route without mutating cached manifest return { ...manifest, routes: { - ...manifest?.routes, + ...manifest.routes, [rootRouteId]: { - ...manifest?.routes?.[rootRouteId], + ...manifest.routes[rootRouteId], assets: [ ...(requestAssets ?? []), ...(inlineCssAsset ? [inlineCssAsset] : []), - ...(manifest?.routes?.[rootRouteId]?.assets ?? []), + ...(manifest.routes[rootRouteId]?.assets ?? []), ], }, }, diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index d59b4fa9af..32eade99af 100644 --- a/packages/router-plugin/src/core/code-splitter/compilers.ts +++ b/packages/router-plugin/src/core/code-splitter/compilers.ts @@ -2,15 +2,27 @@ import * as t from '@babel/types' import * as babel from '@babel/core' import * as template from '@babel/template' import { + buildDeclarationMap, + buildDependencyGraph, + collectIdentifiersFromPattern, + collectLocalBindingsFromStatement, + collectModuleLevelRefsFromNode, + createIdentifier, deadCodeElimination, + expandDestructuredDeclarations, + expandSharedDestructuredDeclarators, + expandTransitively, findReferencedIdentifiers, generateFromAst, parseAst, + removeBindingsTransitivelyDependingOn, + retainModuleLevelDeclarations, + stripUnreferencedTopLevelExpressionStatements, + unwrapExportedDeclarations, } from '@tanstack/router-utils' import { tsrShared, tsrSplit } from '../constants' import { createRouteHmrStatement } from '../hmr' import { getObjectPropertyKeyName } from '../utils' -import { createIdentifier } from './path-ids' import { getFrameworkOptions } from './framework-options' import type { CompileCodeSplitReferenceRouteOptions, @@ -20,6 +32,25 @@ import type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils' import type { CodeSplitGroupings, SplitRouteIdentNodes } from '../constants' import type { SplitNodeMeta } from './types' +export { + buildDeclarationMap, + buildDependencyGraph, + collectIdentifiersFromNode, + collectLocalBindingsFromStatement, + collectModuleLevelRefsFromNode, + expandDestructuredDeclarations, + expandSharedDestructuredDeclarators, + expandTransitively, + removeBindingsTransitivelyDependingOn, +} from '@tanstack/router-utils' + +export function removeBindingsDependingOnRoute( + bindings: Set, + dependencyGraph: Map>, +) { + removeBindingsTransitivelyDependingOn(bindings, dependencyGraph, ['Route']) +} + const SPLIT_NODES_CONFIG = new Map([ [ 'loader', @@ -108,124 +139,6 @@ const allCreateRouteFns = [ ...unsplittableCreateRouteFns, ] -/** - * Recursively walk an AST node and collect referenced identifier-like names. - * Much cheaper than babel.traverse — no path/scope overhead. - * - * Notes: - * - Uses @babel/types `isReferenced` to avoid collecting non-references like - * object keys, member expression properties, or binding identifiers. - * - Also handles JSX identifiers for component references. - */ -export function collectIdentifiersFromNode(node: t.Node): Set { - const ids = new Set() - - ;(function walk( - n: t.Node | null | undefined, - parent?: t.Node, - grandparent?: t.Node, - parentKey?: string, - ) { - if (!n) return - - if (t.isIdentifier(n)) { - // When we don't have parent info (node passed in isolation), treat as referenced. - if (!parent || t.isReferenced(n, parent, grandparent)) { - ids.add(n.name) - } - return - } - - if (t.isJSXIdentifier(n)) { - // Skip attribute names:
- if (parent && t.isJSXAttribute(parent) && parentKey === 'name') { - return - } - - // Skip member properties: should count Foo, not Bar - if ( - parent && - t.isJSXMemberExpression(parent) && - parentKey === 'property' - ) { - return - } - - // Intrinsic elements (lowercase) are not identifiers - const first = n.name[0] - if (first && first === first.toLowerCase()) { - return - } - - ids.add(n.name) - return - } - - for (const key of t.VISITOR_KEYS[n.type] || []) { - const child = (n as any)[key] - if (Array.isArray(child)) { - for (const c of child) { - if (c && typeof c.type === 'string') { - walk(c, n, parent, key) - } - } - } else if (child && typeof child.type === 'string') { - walk(child, n, parent, key) - } - } - })(node) - - return ids -} - -/** - * Build a map from binding name → declaration AST node for all - * locally-declared module-level bindings. Built once, O(1) lookup. - */ -export function buildDeclarationMap(ast: t.File): Map { - const map = new Map() - for (const stmt of ast.program.body) { - const decl = - t.isExportNamedDeclaration(stmt) && stmt.declaration - ? stmt.declaration - : stmt - - if (t.isVariableDeclaration(decl)) { - for (const declarator of decl.declarations) { - for (const name of collectIdentifiersFromPattern(declarator.id)) { - map.set(name, declarator) - } - } - } else if (t.isFunctionDeclaration(decl) && decl.id) { - map.set(decl.id.name, decl) - } else if (t.isClassDeclaration(decl) && decl.id) { - map.set(decl.id.name, decl) - } - } - return map -} - -/** - * Build a dependency graph: for each local binding, the set of other local - * bindings its declaration references. Built once via simple node walking. - */ -export function buildDependencyGraph( - declMap: Map, - localBindings: Set, -): Map> { - const graph = new Map>() - for (const [name, declNode] of declMap) { - if (!localBindings.has(name)) continue - const allIds = collectIdentifiersFromNode(declNode) - const deps = new Set() - for (const id of allIds) { - if (id !== name && localBindings.has(id)) deps.add(id) - } - graph.set(name, deps) - } - return graph -} - /** * Computes module-level bindings that are shared between split and non-split * route properties. These bindings need to be extracted into a shared virtual @@ -381,199 +294,11 @@ export function computeSharedBindings(opts: { // Remove shared bindings that transitively depend on `Route`. // The Route singleton must stay in the reference file; extracting a // binding that references it would duplicate Route in the shared module. - removeBindingsDependingOnRoute(shared, fullDepGraph) + removeBindingsTransitivelyDependingOn(shared, fullDepGraph, ['Route']) return shared } -/** - * If bindings from the same destructured declarator are referenced by - * different groups, mark all bindings from that declarator as shared. - */ -export function expandSharedDestructuredDeclarators( - ast: t.File, - refsByGroup: Map>, - shared: Set, -) { - for (const stmt of ast.program.body) { - const decl = - t.isExportNamedDeclaration(stmt) && stmt.declaration - ? stmt.declaration - : stmt - - if (!t.isVariableDeclaration(decl)) continue - - for (const declarator of decl.declarations) { - if (!t.isObjectPattern(declarator.id) && !t.isArrayPattern(declarator.id)) - continue - - const names = collectIdentifiersFromPattern(declarator.id) - - const usedGroups = new Set() - for (const name of names) { - const groups = refsByGroup.get(name) - if (!groups) continue - for (const g of groups) usedGroups.add(g) - } - - if (usedGroups.size >= 2) { - for (const name of names) { - shared.add(name) - } - } - } - } -} - -/** - * Collect locally-declared module-level binding names from a statement. - * Pure node inspection, no traversal. - */ -export function collectLocalBindingsFromStatement( - node: t.Statement | t.ModuleDeclaration, - bindings: Set, -) { - const decl = - t.isExportNamedDeclaration(node) && node.declaration - ? node.declaration - : node - - if (t.isVariableDeclaration(decl)) { - for (const declarator of decl.declarations) { - for (const name of collectIdentifiersFromPattern(declarator.id)) { - bindings.add(name) - } - } - } else if (t.isFunctionDeclaration(decl) && decl.id) { - bindings.add(decl.id.name) - } else if (t.isClassDeclaration(decl) && decl.id) { - bindings.add(decl.id.name) - } -} - -/** - * Collect direct module-level binding names referenced from a given AST node. - * Uses a simple recursive walk instead of babel.traverse. - */ -export function collectModuleLevelRefsFromNode( - node: t.Node, - localModuleLevelBindings: Set, -): Set { - const allIds = collectIdentifiersFromNode(node) - const refs = new Set() - for (const name of allIds) { - if (localModuleLevelBindings.has(name)) refs.add(name) - } - return refs -} - -/** - * Expand the shared set transitively using a prebuilt dependency graph. - * No AST traversals — pure graph BFS. - */ -export function expandTransitively( - shared: Set, - depGraph: Map>, -) { - const queue = [...shared] - const visited = new Set() - - while (queue.length > 0) { - const name = queue.pop()! - if (visited.has(name)) continue - visited.add(name) - - const deps = depGraph.get(name) - if (!deps) continue - - for (const dep of deps) { - if (!shared.has(dep)) { - shared.add(dep) - queue.push(dep) - } - } - } -} - -/** - * Remove any bindings from `shared` that transitively depend on `Route`. - * The Route singleton must remain in the reference file; if a shared binding - * references it (directly or transitively), extracting that binding would - * duplicate Route in the shared module. - * - * Uses `depGraph` which must include `Route` as a node so the dependency - * chain is visible. - */ -export function removeBindingsDependingOnRoute( - shared: Set, - depGraph: Map>, -) { - const reverseGraph = new Map>() - for (const [name, deps] of depGraph) { - for (const dep of deps) { - let parents = reverseGraph.get(dep) - if (!parents) { - parents = new Set() - reverseGraph.set(dep, parents) - } - parents.add(name) - } - } - - // Walk backwards from Route to find all bindings that can reach it. - const visited = new Set() - const queue = ['Route'] - while (queue.length > 0) { - const cur = queue.pop()! - if (visited.has(cur)) continue - visited.add(cur) - - const parents = reverseGraph.get(cur) - if (!parents) continue - for (const parent of parents) { - if (!visited.has(parent)) queue.push(parent) - } - } - - for (const name of [...shared]) { - if (visited.has(name)) { - shared.delete(name) - } - } -} - -/** - * If any binding from a destructured declaration is shared, - * ensure all bindings from that same declaration are also shared. - * Pure node inspection of program.body, no traversal. - */ -export function expandDestructuredDeclarations( - ast: t.File, - shared: Set, -) { - for (const stmt of ast.program.body) { - const decl = - t.isExportNamedDeclaration(stmt) && stmt.declaration - ? stmt.declaration - : stmt - - if (!t.isVariableDeclaration(decl)) continue - - for (const declarator of decl.declarations) { - if (!t.isObjectPattern(declarator.id) && !t.isArrayPattern(declarator.id)) - continue - - const names = collectIdentifiersFromPattern(declarator.id) - const hasShared = names.some((n) => shared.has(n)) - if (hasShared) { - for (const n of names) { - shared.add(n) - } - } - } - } -} - /** * Find which shared bindings are user-exported in the original source. * These need to be re-exported from the shared module. @@ -740,6 +465,21 @@ export function compileCodeSplitReferenceRoute( if (t.isObjectExpression(routeOptions)) { const insertionPath = path.getStatementParent() ?? path + opts.compilerPlugins?.forEach((plugin) => { + const pluginResult = plugin.onRouteOptions?.({ + programPath, + callExpressionPath: path, + insertionPath, + routeOptions, + createRouteFn, + opts: opts as CompileCodeSplitReferenceRouteOptions, + }) + + if (pluginResult?.modified) { + modified = true + } + }) + if (opts.deleteNodes && opts.deleteNodes.size > 0) { routeOptions.properties = routeOptions.properties.filter( (prop) => { @@ -1525,22 +1265,7 @@ export function compileCodeSplitVirtualRoute( }) deadCodeElimination(ast, refIdents) - - // Strip top-level expression statements that reference no locally-bound names. - // DCE only removes unused declarations; bare side-effect statements like - // `console.log(...)` survive even when the virtual file has no exports. - { - const locallyBound = new Set() - for (const stmt of ast.program.body) { - collectLocalBindingsFromStatement(stmt, locallyBound) - } - ast.program.body = ast.program.body.filter((stmt) => { - if (!t.isExpressionStatement(stmt)) return true - const refs = collectIdentifiersFromNode(stmt) - // Keep if it references at least one locally-bound identifier - return [...refs].some((name) => locallyBound.has(name)) - }) - } + stripUnreferencedTopLevelExpressionStatements(ast) // If the body is empty after DCE, strip directive prologues too. // A file containing only `'use client'` with no real code is useless. @@ -1595,49 +1320,8 @@ export function compileCodeSplitSharedRoute( keepBindings.delete('Route') expandTransitively(keepBindings, depGraph) - // Remove all statements except: - // - Import declarations (needed for deps; DCE will clean unused ones) - // - Declarations of bindings in keepBindings - ast.program.body = ast.program.body.filter((stmt) => { - // Always keep imports — DCE will remove unused ones - if (t.isImportDeclaration(stmt)) return true - - const decl = - t.isExportNamedDeclaration(stmt) && stmt.declaration - ? stmt.declaration - : stmt - - if (t.isVariableDeclaration(decl)) { - // Keep declarators where at least one binding is in keepBindings - decl.declarations = decl.declarations.filter((declarator) => { - const names = collectIdentifiersFromPattern(declarator.id) - return names.some((n) => keepBindings.has(n)) - }) - if (decl.declarations.length === 0) return false - - // Strip the `export` wrapper — shared module controls its own exports - if (t.isExportNamedDeclaration(stmt) && stmt.declaration) { - return true // keep for now, we'll convert below - } - return true - } else if (t.isFunctionDeclaration(decl) && decl.id) { - return keepBindings.has(decl.id.name) - } else if (t.isClassDeclaration(decl) && decl.id) { - return keepBindings.has(decl.id.name) - } - - // Remove everything else (expression statements, other exports, etc.) - return false - }) - - // Convert `export const/function/class` to plain declarations - // (we'll add our own export statement at the end) - ast.program.body = ast.program.body.map((stmt) => { - if (t.isExportNamedDeclaration(stmt) && stmt.declaration) { - return stmt.declaration - } - return stmt - }) + retainModuleLevelDeclarations(ast, keepBindings) + unwrapExportedDeclarations(ast) // Export all shared bindings (sorted for deterministic output) const exportNames = [...opts.sharedBindings].sort((a, b) => @@ -1837,50 +1521,6 @@ function getImportSpecifierAndPathFromLocalName( return { specifier, path } } -/** - * Recursively collects all identifier names from a destructuring pattern - * (ObjectPattern, ArrayPattern, AssignmentPattern, RestElement). - */ -function collectIdentifiersFromPattern( - node: t.LVal | t.Node | null | undefined, -): Array { - if (!node) { - return [] - } - - if (t.isIdentifier(node)) { - return [node.name] - } - - if (t.isAssignmentPattern(node)) { - return collectIdentifiersFromPattern(node.left) - } - - if (t.isRestElement(node)) { - return collectIdentifiersFromPattern(node.argument) - } - - if (t.isObjectPattern(node)) { - return node.properties.flatMap((prop) => { - if (t.isObjectProperty(prop)) { - return collectIdentifiersFromPattern(prop.value as t.LVal) - } - if (t.isRestElement(prop)) { - return collectIdentifiersFromPattern(prop.argument) - } - return [] - }) - } - - if (t.isArrayPattern(node)) { - return node.elements.flatMap((element) => - collectIdentifiersFromPattern(element), - ) - } - - return [] -} - // Reusable function to get literal value or resolve variable to literal function resolveIdentifier(path: any, node: any): t.Node | undefined { if (t.isIdentifier(node)) { diff --git a/packages/router-plugin/src/core/code-splitter/plugins.ts b/packages/router-plugin/src/core/code-splitter/plugins.ts index 4b2363e361..ebf1f4aa30 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins.ts @@ -43,6 +43,9 @@ export type ReferenceRouteCompilerPluginResult = { export type ReferenceRouteCompilerPlugin = { name: string getStableRouteOptionKeys?: () => Array + onRouteOptions?: ( + ctx: ReferenceRouteCompilerPluginContext, + ) => void | ReferenceRouteCompilerPluginResult onAddHmr?: ( ctx: ReferenceRouteCompilerPluginContext, ) => void | ReferenceRouteCompilerPluginResult diff --git a/packages/router-plugin/src/core/config.ts b/packages/router-plugin/src/core/config.ts index f764bfe8bb..d1d36bbe37 100644 --- a/packages/router-plugin/src/core/config.ts +++ b/packages/router-plugin/src/core/config.ts @@ -9,6 +9,7 @@ import type { RouteIds, } from '@tanstack/router-core' import type { CodeSplitGroupings } from './constants' +import type { ReferenceRouteCompilerPlugin } from './code-splitter/plugins' export const splitGroupingsSchema = z .array( @@ -70,6 +71,12 @@ export type CodeSplittingOptions = { * @default true */ addHmr?: boolean + + /** + * Internal compiler plugins used by framework integrations. + * @internal + */ + compilerPlugins?: Array } export type HmrStyle = 'vite' | 'webpack' 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 8f6324bae1..96d3d1251f 100644 --- a/packages/router-plugin/src/core/router-code-splitter-plugin.ts +++ b/packages/router-plugin/src/core/router-code-splitter-plugin.ts @@ -4,7 +4,7 @@ */ import { fileURLToPath, pathToFileURL } from 'node:url' -import { logDiff } from '@tanstack/router-utils' +import { decodeIdentifier, logDiff } from '@tanstack/router-utils' import { getConfig, splitGroupingsSchema } from './config' import { compileCodeSplitReferenceRoute, @@ -20,7 +20,6 @@ import { tsrShared, tsrSplit, } from './constants' -import { decodeIdentifier } from './code-splitter/path-ids' import { debug, normalizePath, routeFactoryCallCodeFilter } from './utils' import { createRouterPluginContext } from './router-plugin-context' import type { CodeSplitGroupings, SplitRouteIdentNodes } from './constants' @@ -177,11 +176,14 @@ export function createRouterCodeSplitterPlugin( hmrStyle, hmrRouteId: generatorNodeInfo.routeId, sharedBindings: sharedBindings.size > 0 ? sharedBindings : undefined, - compilerPlugins: getReferenceRouteCompilerPlugins({ - targetFramework: userConfig.target, - addHmr, - hmrStyle, - }), + compilerPlugins: [ + ...(getReferenceRouteCompilerPlugins({ + targetFramework: userConfig.target, + addHmr, + hmrStyle, + }) ?? []), + ...(userConfig.codeSplittingOptions?.compilerPlugins ?? []), + ], }) if (compiledReferenceRoute === null) { diff --git a/packages/router-plugin/src/index.ts b/packages/router-plugin/src/index.ts index a56e097d3a..e390c046a2 100644 --- a/packages/router-plugin/src/index.ts +++ b/packages/router-plugin/src/index.ts @@ -11,6 +11,11 @@ export type { HmrOptions, } from './core/config' export type { RouterPluginContext } from './core/router-plugin-context' +export { getObjectPropertyKeyName } from './core/utils' +export type { + ReferenceRouteCompilerPlugin, + ReferenceRouteCompilerPluginContext, +} from './core/code-splitter/plugins' export { tsrSplit, splitRouteIdentNodes, diff --git a/packages/router-plugin/tests/code-splitter.test.ts b/packages/router-plugin/tests/code-splitter.test.ts index 5a68f9453f..ae64e2778b 100644 --- a/packages/router-plugin/tests/code-splitter.test.ts +++ b/packages/router-plugin/tests/code-splitter.test.ts @@ -18,7 +18,7 @@ import { expandTransitively, removeBindingsDependingOnRoute, } from '../src/core/code-splitter/compilers' -import { createIdentifier } from '../src/core/code-splitter/path-ids' +import { createIdentifier } from '@tanstack/router-utils' import { defaultCodeSplitGroupings } from '../src/core/constants' import { frameworks } from './constants' import type { CodeSplitGroupings } from '../src/core/constants' diff --git a/packages/router-utils/src/compiler-helpers.ts b/packages/router-utils/src/compiler-helpers.ts new file mode 100644 index 0000000000..78d6cd9b86 --- /dev/null +++ b/packages/router-utils/src/compiler-helpers.ts @@ -0,0 +1,843 @@ +import * as t from '@babel/types' + +type IdentifierScopeFrame = { + kind: 'program' | 'function' | 'block' + bindings: Set +} +type IdentifierScopeStack = Array + +export type ModuleInfoBinding = + | { + type: 'import' + source: string + importedName: string + } + | { + type: 'var' + init: t.Expression | null + } + +export interface ExtractedModuleInfo { + bindings: Map + exports: Map + reExportAllSources: Array +} + +function getModuleExportName(node: t.Identifier | t.StringLiteral) { + return t.isIdentifier(node) ? node.name : node.value +} + +function addVariableDeclarationModuleInfo( + declaration: t.VariableDeclaration, + bindings: Map, + exportMap?: Map, +) { + for (const declarator of declaration.declarations) { + for (const name of collectIdentifiersFromPattern(declarator.id)) { + bindings.set(name, { + type: 'var', + init: declarator.init ?? null, + }) + exportMap?.set(name, name) + } + } +} + +function addDeclarationModuleInfo( + declaration: t.Declaration, + bindings: Map, + exportMap?: Map, +) { + if (t.isVariableDeclaration(declaration)) { + addVariableDeclarationModuleInfo(declaration, bindings, exportMap) + return + } + + if ( + (t.isFunctionDeclaration(declaration) || + t.isClassDeclaration(declaration)) && + declaration.id + ) { + bindings.set(declaration.id.name, { + type: 'var', + init: null, + }) + exportMap?.set(declaration.id.name, declaration.id.name) + } +} + +function hasIdentifierBinding(scopes: IdentifierScopeStack, name: string) { + for (let i = scopes.length - 1; i >= 0; i--) { + if (scopes[i]!.bindings.has(name)) { + return true + } + } + return false +} + +function currentIdentifierScope(scopes: IdentifierScopeStack) { + return scopes[scopes.length - 1]! +} + +function nearestFunctionIdentifierScope(scopes: IdentifierScopeStack) { + for (let i = scopes.length - 1; i >= 0; i--) { + const scope = scopes[i]! + if (scope.kind === 'function' || scope.kind === 'program') { + return scope + } + } + return currentIdentifierScope(scopes) +} + +function addIdentifierPatternBindings( + pattern: t.LVal | t.Node | null | undefined, + scope: IdentifierScopeFrame, +) { + for (const name of collectIdentifiersFromPattern(pattern)) { + scope.bindings.add(name) + } +} + +function addIdentifierDeclarationBindings( + declaration: t.Node, + scopes: IdentifierScopeStack, +) { + if (t.isVariableDeclaration(declaration)) { + const scope = + declaration.kind === 'var' + ? nearestFunctionIdentifierScope(scopes) + : currentIdentifierScope(scopes) + for (const declarator of declaration.declarations) { + addIdentifierPatternBindings(declarator.id, scope) + } + return + } + + if ( + (t.isFunctionDeclaration(declaration) || + t.isClassDeclaration(declaration) || + t.isTSTypeAliasDeclaration(declaration) || + t.isTSInterfaceDeclaration(declaration) || + t.isTSEnumDeclaration(declaration)) && + declaration.id + ) { + currentIdentifierScope(scopes).bindings.add(declaration.id.name) + } +} + +function addIdentifierImportBindings( + node: t.ImportDeclaration, + scope: IdentifierScopeFrame, +) { + for (const specifier of node.specifiers) { + scope.bindings.add(specifier.local.name) + } +} + +function createNestedIdentifierScope( + kind: IdentifierScopeFrame['kind'], + scopes: IdentifierScopeStack, +): IdentifierScopeStack { + return [...scopes, { kind, bindings: new Set() }] +} + +function addIdentifierBlockBindings( + body: Array, + scopes: IdentifierScopeStack, +) { + for (const statement of body) { + if (t.isImportDeclaration(statement)) { + addIdentifierImportBindings(statement, currentIdentifierScope(scopes)) + } else if (t.isExportNamedDeclaration(statement) && statement.declaration) { + addIdentifierDeclarationBindings(statement.declaration, scopes) + } else { + addIdentifierDeclarationBindings(statement, scopes) + } + } +} + +function walkIdentifierChildren( + current: t.Node, + parent: t.Node | undefined, + scopes: IdentifierScopeStack, + ids: Set, +) { + for (const key of t.VISITOR_KEYS[current.type] ?? []) { + const child = (current as any)[key] + if (Array.isArray(child)) { + for (const item of child) { + if (item && typeof item.type === 'string') { + walkIdentifierNode(item, current, parent, key, scopes, ids) + } + } + } else if (child && typeof child.type === 'string') { + walkIdentifierNode(child, current, parent, key, scopes, ids) + } + } +} + +function walkIdentifierNode( + current: t.Node | null | undefined, + parent: t.Node | undefined, + grandparent: t.Node | undefined, + parentKey: string | undefined, + scopes: IdentifierScopeStack, + ids: Set, +) { + if (!current) return + + if (t.isIdentifier(current)) { + if ( + (!parent || t.isReferenced(current, parent, grandparent)) && + !hasIdentifierBinding(scopes, current.name) + ) { + ids.add(current.name) + } + return + } + + if (t.isJSXIdentifier(current)) { + if (parent && t.isJSXAttribute(parent) && parentKey === 'name') { + return + } + + if (parent && t.isJSXMemberExpression(parent) && parentKey === 'property') { + return + } + + const first = current.name[0] + if (first && first === first.toLowerCase()) { + return + } + + if (!hasIdentifierBinding(scopes, current.name)) { + ids.add(current.name) + } + return + } + + if (t.isProgram(current)) { + const nestedScopes = createNestedIdentifierScope('program', scopes) + addIdentifierBlockBindings(current.body, nestedScopes) + for (const child of current.body) { + walkIdentifierNode(child, current, parent, 'body', nestedScopes, ids) + } + return + } + + if (t.isBlockStatement(current)) { + const nestedScopes = createNestedIdentifierScope('block', scopes) + addIdentifierBlockBindings(current.body, nestedScopes) + for (const child of current.body) { + walkIdentifierNode(child, current, parent, 'body', nestedScopes, ids) + } + return + } + + if ( + t.isFunctionDeclaration(current) || + t.isFunctionExpression(current) || + t.isArrowFunctionExpression(current) || + t.isObjectMethod(current) || + t.isClassMethod(current) || + t.isClassPrivateMethod(current) + ) { + if (t.isFunctionDeclaration(current) && current.id) { + currentIdentifierScope(scopes).bindings.add(current.id.name) + } + + const nestedScopes = createNestedIdentifierScope('function', scopes) + if ( + (t.isFunctionDeclaration(current) || t.isFunctionExpression(current)) && + current.id + ) { + currentIdentifierScope(nestedScopes).bindings.add(current.id.name) + } + for (const param of current.params) { + addIdentifierPatternBindings(param, currentIdentifierScope(nestedScopes)) + } + + walkIdentifierChildren(current, parent, nestedScopes, ids) + return + } + + if (t.isCatchClause(current)) { + const nestedScopes = createNestedIdentifierScope('block', scopes) + addIdentifierPatternBindings( + current.param, + currentIdentifierScope(nestedScopes), + ) + walkIdentifierNode( + current.param, + current, + parent, + 'param', + nestedScopes, + ids, + ) + walkIdentifierNode(current.body, current, parent, 'body', nestedScopes, ids) + return + } + + if (t.isImportDeclaration(current)) { + addIdentifierImportBindings(current, currentIdentifierScope(scopes)) + return + } + + if (t.isClassDeclaration(current) || t.isClassExpression(current)) { + if (t.isClassDeclaration(current) && current.id) { + currentIdentifierScope(scopes).bindings.add(current.id.name) + } + + const nestedScopes = current.id + ? createNestedIdentifierScope('block', scopes) + : scopes + if (current.id) { + currentIdentifierScope(nestedScopes).bindings.add(current.id.name) + } + + walkIdentifierChildren(current, parent, nestedScopes, ids) + return + } + + if (t.isVariableDeclaration(current)) { + addIdentifierDeclarationBindings(current, scopes) + } else if (t.isVariableDeclarator(current)) { + const scope = + parent && t.isVariableDeclaration(parent) && parent.kind === 'var' + ? nearestFunctionIdentifierScope(scopes) + : currentIdentifierScope(scopes) + addIdentifierPatternBindings(current.id, scope) + } else if ( + t.isTSTypeAliasDeclaration(current) || + t.isTSInterfaceDeclaration(current) || + t.isTSEnumDeclaration(current) + ) { + currentIdentifierScope(scopes).bindings.add(current.id.name) + } + + walkIdentifierChildren(current, parent, scopes, ids) +} + +/** + * Recursively walk an AST node and collect referenced identifier-like names. + * This avoids Babel path/scope allocation for module-level dependency scans. + */ +export function collectIdentifiersFromNode(node: t.Node): Set { + const ids = new Set() + walkIdentifierNode( + node, + undefined, + undefined, + undefined, + [{ kind: 'program', bindings: new Set() }], + ids, + ) + return ids +} + +export function collectIdentifiersFromPattern( + node: t.LVal | t.Node | null | undefined, +): Array { + if (!node) { + return [] + } + + if (t.isIdentifier(node)) { + return [node.name] + } + + if (t.isAssignmentPattern(node)) { + return collectIdentifiersFromPattern(node.left) + } + + if (t.isRestElement(node)) { + return collectIdentifiersFromPattern(node.argument) + } + + if (t.isObjectPattern(node)) { + return node.properties.flatMap((prop) => { + if (t.isObjectProperty(prop)) { + return collectIdentifiersFromPattern(prop.value as t.LVal) + } + if (t.isRestElement(prop)) { + return collectIdentifiersFromPattern(prop.argument) + } + return [] + }) + } + + if (t.isArrayPattern(node)) { + return node.elements.flatMap((element) => + collectIdentifiersFromPattern(element), + ) + } + + return [] +} + +export function collectLocalBindingsFromStatement( + node: t.Statement | t.ModuleDeclaration, + bindings: Set, +) { + const declaration = + t.isExportNamedDeclaration(node) && node.declaration + ? node.declaration + : t.isExportDefaultDeclaration(node) + ? node.declaration + : node + + if (t.isVariableDeclaration(declaration)) { + for (const declarator of declaration.declarations) { + for (const name of collectIdentifiersFromPattern(declarator.id)) { + bindings.add(name) + } + } + } else if (t.isFunctionDeclaration(declaration) && declaration.id) { + bindings.add(declaration.id.name) + } else if (t.isClassDeclaration(declaration) && declaration.id) { + bindings.add(declaration.id.name) + } +} + +export function extractModuleInfoFromAst(ast: t.File): ExtractedModuleInfo { + const bindings = new Map() + const exportMap = new Map() + const reExportAllSources: Array = [] + + for (const node of ast.program.body) { + if (t.isImportDeclaration(node)) { + const source = node.source.value + for (const specifier of node.specifiers) { + if (t.isImportSpecifier(specifier)) { + bindings.set(specifier.local.name, { + type: 'import', + source, + importedName: getModuleExportName(specifier.imported), + }) + } else if (t.isImportDefaultSpecifier(specifier)) { + bindings.set(specifier.local.name, { + type: 'import', + source, + importedName: 'default', + }) + } else if (t.isImportNamespaceSpecifier(specifier)) { + bindings.set(specifier.local.name, { + type: 'import', + source, + importedName: '*', + }) + } + } + continue + } + + if (t.isVariableDeclaration(node)) { + addVariableDeclarationModuleInfo(node, bindings) + continue + } + + if (t.isFunctionDeclaration(node) || t.isClassDeclaration(node)) { + addDeclarationModuleInfo(node, bindings) + continue + } + + if (t.isExportNamedDeclaration(node)) { + if (node.declaration) { + addDeclarationModuleInfo(node.declaration, bindings, exportMap) + } + + for (const specifier of node.specifiers) { + if (t.isExportNamespaceSpecifier(specifier)) { + const exported = getModuleExportName(specifier.exported) + exportMap.set(exported, exported) + if (node.source) { + bindings.set(exported, { + type: 'import', + source: node.source.value, + importedName: '*', + }) + } + } else if (t.isExportSpecifier(specifier)) { + const local = getModuleExportName(specifier.local) + const exported = getModuleExportName(specifier.exported) + exportMap.set(exported, local) + + if (node.source) { + bindings.set(local, { + type: 'import', + source: node.source.value, + importedName: local, + }) + } + } + } + continue + } + + if (t.isExportDefaultDeclaration(node)) { + const declaration = node.declaration + if (t.isIdentifier(declaration)) { + exportMap.set('default', declaration.name) + } else if ( + (t.isFunctionDeclaration(declaration) || + t.isClassDeclaration(declaration)) && + declaration.id + ) { + bindings.set(declaration.id.name, { + type: 'var', + init: null, + }) + exportMap.set('default', declaration.id.name) + } else { + const synth = '__default_export__' + bindings.set(synth, { + type: 'var', + init: t.isExpression(declaration) ? declaration : null, + }) + exportMap.set('default', synth) + } + continue + } + + if (t.isExportAllDeclaration(node)) { + reExportAllSources.push(node.source.value) + } + } + + return { + bindings, + exports: exportMap, + reExportAllSources, + } +} + +export function buildDeclarationMap(ast: t.File): Map { + const map = new Map() + + for (const statement of ast.program.body) { + const declaration = + t.isExportNamedDeclaration(statement) && statement.declaration + ? statement.declaration + : t.isExportDefaultDeclaration(statement) + ? statement.declaration + : statement + + if (t.isVariableDeclaration(declaration)) { + for (const declarator of declaration.declarations) { + for (const name of collectIdentifiersFromPattern(declarator.id)) { + map.set(name, declarator) + } + } + } else if (t.isFunctionDeclaration(declaration) && declaration.id) { + map.set(declaration.id.name, declaration) + } else if (t.isClassDeclaration(declaration) && declaration.id) { + map.set(declaration.id.name, declaration) + } + } + + return map +} + +export function buildDependencyGraph( + declarationMap: Map, + localBindings: Set, +): Map> { + const graph = new Map>() + + for (const [name, declarationNode] of declarationMap) { + if (!localBindings.has(name)) continue + + const dependencies = new Set() + for (const id of collectIdentifiersFromNode(declarationNode)) { + if (id !== name && localBindings.has(id)) { + dependencies.add(id) + } + } + graph.set(name, dependencies) + } + + return graph +} + +export function collectModuleLevelRefsFromNode( + node: t.Node, + localModuleLevelBindings: Set, +): Set { + const refs = new Set() + + for (const name of collectIdentifiersFromNode(node)) { + if (localModuleLevelBindings.has(name)) { + refs.add(name) + } + } + + return refs +} + +export function expandTransitively( + bindings: Set, + dependencyGraph: Map>, +) { + const queue = [...bindings] + const visited = new Set() + + while (queue.length > 0) { + const name = queue.pop()! + if (visited.has(name)) continue + visited.add(name) + + const dependencies = dependencyGraph.get(name) + if (!dependencies) continue + + for (const dependency of dependencies) { + if (!bindings.has(dependency)) { + bindings.add(dependency) + queue.push(dependency) + } + } + } +} + +export function expandSharedDestructuredDeclarators( + ast: t.File, + refsByGroup: Map>, + sharedBindings: Set, +) { + for (const statement of ast.program.body) { + const declaration = + t.isExportNamedDeclaration(statement) && statement.declaration + ? statement.declaration + : statement + + if (!t.isVariableDeclaration(declaration)) continue + + for (const declarator of declaration.declarations) { + if ( + !t.isObjectPattern(declarator.id) && + !t.isArrayPattern(declarator.id) + ) { + continue + } + + const names = collectIdentifiersFromPattern(declarator.id) + const usedGroups = new Set() + + for (const name of names) { + const groups = refsByGroup.get(name) + if (!groups) continue + for (const group of groups) { + usedGroups.add(group) + } + } + + if (usedGroups.size >= 2) { + for (const name of names) { + sharedBindings.add(name) + } + } + } + } +} + +export function expandDestructuredDeclarations( + ast: t.File, + bindings: Set, +) { + for (const statement of ast.program.body) { + const declaration = + t.isExportNamedDeclaration(statement) && statement.declaration + ? statement.declaration + : statement + + if (!t.isVariableDeclaration(declaration)) continue + + for (const declarator of declaration.declarations) { + if ( + !t.isObjectPattern(declarator.id) && + !t.isArrayPattern(declarator.id) + ) { + continue + } + + const names = collectIdentifiersFromPattern(declarator.id) + if (names.some((name) => bindings.has(name))) { + for (const name of names) { + bindings.add(name) + } + } + } + } +} + +export function removeBindingsTransitivelyDependingOn( + bindings: Set, + dependencyGraph: Map>, + roots: Iterable, +) { + const reverseGraph = new Map>() + + for (const [name, dependencies] of dependencyGraph) { + for (const dependency of dependencies) { + let parents = reverseGraph.get(dependency) + if (!parents) { + parents = new Set() + reverseGraph.set(dependency, parents) + } + parents.add(name) + } + } + + const visited = new Set() + const queue = [...roots] + + while (queue.length > 0) { + const current = queue.pop()! + if (visited.has(current)) continue + visited.add(current) + + const parents = reverseGraph.get(current) + if (!parents) continue + + for (const parent of parents) { + if (!visited.has(parent)) { + queue.push(parent) + } + } + } + + for (const name of [...bindings]) { + if (visited.has(name)) { + bindings.delete(name) + } + } +} + +export function removeModuleLevelBindings( + ast: t.File, + namesToRemove: Set, +) { + ast.program.body = ast.program.body.filter((statement) => { + const declaration = + t.isExportNamedDeclaration(statement) && statement.declaration + ? statement.declaration + : statement + + if (t.isVariableDeclaration(declaration)) { + declaration.declarations = declaration.declarations.filter( + (declarator) => + !collectIdentifiersFromPattern(declarator.id).some((name) => + namesToRemove.has(name), + ), + ) + return declaration.declarations.length > 0 + } + + if (t.isFunctionDeclaration(declaration) && declaration.id) { + return !namesToRemove.has(declaration.id.name) + } + + if (t.isClassDeclaration(declaration) && declaration.id) { + return !namesToRemove.has(declaration.id.name) + } + + if (t.isExportDefaultDeclaration(statement)) { + const defaultDeclaration = statement.declaration + if ( + (t.isFunctionDeclaration(defaultDeclaration) || + t.isClassDeclaration(defaultDeclaration)) && + defaultDeclaration.id + ) { + return !namesToRemove.has(defaultDeclaration.id.name) + } + } + + return true + }) +} + +export function retainModuleLevelDeclarations( + ast: t.File, + bindingsToKeep: Set, +) { + ast.program.body = ast.program.body.filter((statement) => { + if (t.isImportDeclaration(statement)) return true + + const declaration = + t.isExportNamedDeclaration(statement) && statement.declaration + ? statement.declaration + : statement + + if (t.isVariableDeclaration(declaration)) { + declaration.declarations = declaration.declarations.filter((declarator) => + collectIdentifiersFromPattern(declarator.id).some((name) => + bindingsToKeep.has(name), + ), + ) + return declaration.declarations.length > 0 + } + + if (t.isFunctionDeclaration(declaration) && declaration.id) { + return bindingsToKeep.has(declaration.id.name) + } + + if (t.isClassDeclaration(declaration) && declaration.id) { + return bindingsToKeep.has(declaration.id.name) + } + + return false + }) +} + +export function unwrapExportedDeclarations(ast: t.File) { + const body: Array = [] + + for (const statement of ast.program.body) { + if (t.isExportNamedDeclaration(statement)) { + if (statement.declaration) { + body.push(statement.declaration) + } + continue + } + + if (t.isExportDefaultDeclaration(statement)) { + const declaration = statement.declaration + if ( + (t.isFunctionDeclaration(declaration) || + t.isClassDeclaration(declaration)) && + declaration.id + ) { + body.push(declaration) + } + continue + } + + if (t.isExportAllDeclaration(statement)) { + continue + } + + body.push(statement) + } + + ast.program.body = body +} + +export function stripUnreferencedTopLevelExpressionStatements(ast: t.File) { + const locallyBound = new Set() + + for (const statement of ast.program.body) { + collectLocalBindingsFromStatement(statement, locallyBound) + } + + ast.program.body = ast.program.body.filter((statement) => { + if (!t.isExpressionStatement(statement)) return true + + for (const name of collectIdentifiersFromNode(statement)) { + if (locallyBound.has(name)) { + return true + } + } + + return false + }) +} diff --git a/packages/router-utils/src/index.ts b/packages/router-utils/src/index.ts index 3b072ae419..ce0de90824 100644 --- a/packages/router-utils/src/index.ts +++ b/packages/router-utils/src/index.ts @@ -9,3 +9,24 @@ export type { ParseAstOptions, ParseAstResult, GeneratorResult } from './ast' export { logDiff } from './logger' export { copyFilesPlugin } from './copy-files-plugin' + +export { createIdentifier, decodeIdentifier } from './path-ids' + +export { + buildDeclarationMap, + buildDependencyGraph, + collectIdentifiersFromNode, + collectIdentifiersFromPattern, + collectLocalBindingsFromStatement, + collectModuleLevelRefsFromNode, + expandDestructuredDeclarations, + expandSharedDestructuredDeclarators, + expandTransitively, + extractModuleInfoFromAst, + removeBindingsTransitivelyDependingOn, + removeModuleLevelBindings, + retainModuleLevelDeclarations, + stripUnreferencedTopLevelExpressionStatements, + unwrapExportedDeclarations, +} from './compiler-helpers' +export type { ExtractedModuleInfo, ModuleInfoBinding } from './compiler-helpers' diff --git a/packages/router-plugin/src/core/code-splitter/path-ids.ts b/packages/router-utils/src/path-ids.ts similarity index 100% rename from packages/router-plugin/src/core/code-splitter/path-ids.ts rename to packages/router-utils/src/path-ids.ts diff --git a/packages/router-utils/tests/compiler-helpers.test.ts b/packages/router-utils/tests/compiler-helpers.test.ts new file mode 100644 index 0000000000..00b75d67e5 --- /dev/null +++ b/packages/router-utils/tests/compiler-helpers.test.ts @@ -0,0 +1,249 @@ +import * as t from '@babel/types' +import { describe, expect, test } from 'vitest' +import { + buildDeclarationMap, + collectIdentifiersFromNode, + collectLocalBindingsFromStatement, + extractModuleInfoFromAst, +} from '../src/compiler-helpers' +import { parseAst } from '../src/ast' + +function getVariableInit(code: string) { + const ast = parseAst({ code, filename: 'test.tsx' }) + const declaration = ast.program.body.find((node) => + t.isVariableDeclaration(node), + ) as t.VariableDeclaration + return declaration.declarations[0]!.init! +} + +function collectSortedIdentifiers(node: t.Node) { + return [...collectIdentifiersFromNode(node)].sort() +} + +function collectSortedStatementBindings(code: string) { + const ast = parseAst({ code, filename: 'test.tsx' }) + const bindings = new Set() + for (const statement of ast.program.body) { + collectLocalBindingsFromStatement(statement, bindings) + } + return [...bindings].sort() +} + +function collectSortedDeclarationMapEntries(code: string) { + const ast = parseAst({ code, filename: 'test.tsx' }) + return [...buildDeclarationMap(ast)] + .map(([name, node]): [string, string] => [name, node.type]) + .sort((left, right) => (left[0] < right[0] ? -1 : 1)) +} + +function collectModuleInfoSnapshot(code: string) { + const ast = parseAst({ code, filename: 'test.tsx' }) + const info = extractModuleInfoFromAst(ast) + return { + bindings: [...info.bindings] + .map(([name, binding]) => [ + name, + binding.type === 'import' + ? `${binding.source}:${binding.importedName}` + : (binding.init?.type ?? null), + ]) + .sort((left, right) => (left[0]! < right[0]! ? -1 : 1)), + exports: [...info.exports].sort((left, right) => + left[0] < right[0] ? -1 : 1, + ), + reExportAllSources: info.reExportAllSources, + } +} + +describe('collectIdentifiersFromNode', () => { + test('collects free identifiers without reporting nested local bindings', () => { + const init = getVariableInit(` +const value = outer + (() => { + const local = dep + + function nested(param = fallback) { + const Inner = () => + const LocalExpr = class NamedLocal { + method() { + return NamedLocal + local + param + } + } + + class LocalComponent {} + + return local + param + imported + Inner + LocalExpr + } + + return nested() +})() +`) + + expect(collectSortedIdentifiers(init)).toMatchInlineSnapshot(` + [ + "dep", + "fallback", + "imported", + "outer", + ] + `) + }) + + test('respects nested variable, parameter, catch, and import shadowing', () => { + const ast = parseAst({ + code: ` +import { external as localImport } from 'pkg' + +const value = (localParam = defaultValue) => { + const localShadow = factory(localImport) + + try { + throw thrown + } catch (thrown) { + const factory = () => localShadow + localParam + thrown + return factory() + } +} +`, + filename: 'test.ts', + }) + + expect(collectSortedIdentifiers(ast.program)).toMatchInlineSnapshot(` + [ + "defaultValue", + "factory", + "thrown", + ] + `) + }) +}) + +describe('collectLocalBindingsFromStatement', () => { + test('collects ids from named default function and class declarations', () => { + expect({ + class: collectSortedStatementBindings( + `export default class DefaultComponent {}`, + ), + function: collectSortedStatementBindings( + `export default function DefaultRoute() {}`, + ), + anonymous: collectSortedStatementBindings( + `export default function () {}`, + ), + }).toMatchInlineSnapshot(` + { + "anonymous": [], + "class": [ + "DefaultComponent", + ], + "function": [ + "DefaultRoute", + ], + } + `) + }) +}) + +describe('buildDeclarationMap', () => { + test('maps named default function and class declarations', () => { + expect({ + class: collectSortedDeclarationMapEntries( + `export default class DefaultComponent {}`, + ), + function: collectSortedDeclarationMapEntries( + `export default function DefaultRoute() {}`, + ), + anonymous: collectSortedDeclarationMapEntries(`export default class {}`), + }).toMatchInlineSnapshot(` + { + "anonymous": [], + "class": [ + [ + "DefaultComponent", + "ClassDeclaration", + ], + ], + "function": [ + [ + "DefaultRoute", + "FunctionDeclaration", + ], + ], + } + `) + }) +}) + +describe('extractModuleInfoFromAst', () => { + test('extracts imports, local exports, default exports, and re-export sources', () => { + expect( + collectModuleInfoSnapshot(` + import defaultImport, { named as localNamed } from 'pkg' + import * as ns from 'pkg-ns' + const local = localNamed + export const exported = local + export function loader() {} + export default class DefaultRoute {} + export { remote as renamed } from './remote' + export * from './all' + `), + ).toMatchInlineSnapshot(` + { + "bindings": [ + [ + "DefaultRoute", + null, + ], + [ + "defaultImport", + "pkg:default", + ], + [ + "exported", + "Identifier", + ], + [ + "loader", + null, + ], + [ + "local", + "Identifier", + ], + [ + "localNamed", + "pkg:named", + ], + [ + "ns", + "pkg-ns:*", + ], + [ + "remote", + "./remote:remote", + ], + ], + "exports": [ + [ + "default", + "DefaultRoute", + ], + [ + "exported", + "exported", + ], + [ + "loader", + "loader", + ], + [ + "renamed", + "remote", + ], + ], + "reExportAllSources": [ + "./all", + ], + } + `) + }) +}) diff --git a/packages/router-utils/tests/stripTypeExports.test.ts b/packages/router-utils/tests/stripTypeExports.test.ts index d0c6af3ad7..32d25f1cbe 100644 --- a/packages/router-utils/tests/stripTypeExports.test.ts +++ b/packages/router-utils/tests/stripTypeExports.test.ts @@ -123,7 +123,7 @@ type TypeOnly = string; export { value, type TypeOnly };` const result = transform(code) expect(result).toContain('export { value }') - expect(result).not.toContain('TypeOnly') + expect(result).toContain('type TypeOnly = string') }) test('removes entire export if all specifiers are type-only', () => { @@ -133,8 +133,8 @@ export { type Foo, type Bar }; export const value = 1;` const result = transform(code) expect(result).not.toContain('export { type Foo') - expect(result).not.toContain('Foo') - expect(result).not.toContain('Bar') + expect(result).toContain('type Foo = string') + expect(result).toContain('type Bar = number') expect(result).toContain('export const value = 1') }) }) @@ -233,9 +233,11 @@ export { helper, type HelperType };` expect(result).not.toContain('./types') expect(result).not.toContain('HelperType') - // Should remove type declarations - expect(result).not.toContain('type LocalType') - expect(result).not.toContain('interface LocalInterface') + // Should preserve local type declarations + expect(result).toContain('type LocalType = string') + expect(result).toContain('interface LocalInterface') + + // Should remove exported type declarations expect(result).not.toContain('type ExportedType') expect(result).not.toContain('interface ExportedInterface') diff --git a/packages/solid-router/src/ClientOnly.tsx b/packages/solid-router/src/ClientOnly.tsx index 6ed10d267b..a7c4b71819 100644 --- a/packages/solid-router/src/ClientOnly.tsx +++ b/packages/solid-router/src/ClientOnly.tsx @@ -56,10 +56,15 @@ export function ClientOnly(props: ClientOnlyProps) { * ``` * @returns True if the JS has been hydrated already, false otherwise. */ +let globalHydrated = false + export function useHydrated(): Solid.Accessor { - const [hydrated, setHydrated] = Solid.createSignal(false) + const [hydrated, setHydrated] = Solid.createSignal(globalHydrated) + Solid.onMount(() => { + globalHydrated = true setHydrated(true) }) + return hydrated } diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 7bcb2876cd..b01b0a28af 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -48,6 +48,12 @@ "default": "./dist/esm/index.js" } }, + "./hydration": { + "import": { + "types": "./dist/esm/hydration.d.ts", + "default": "./dist/esm/hydration.js" + } + }, "./package.json": "./package.json" }, "sideEffects": false, diff --git a/packages/solid-start-client/src/GenericHydrate.tsx b/packages/solid-start-client/src/GenericHydrate.tsx new file mode 100644 index 0000000000..e23c057f34 --- /dev/null +++ b/packages/solid-start-client/src/GenericHydrate.tsx @@ -0,0 +1,376 @@ +import * as Solid from 'solid-js' +import { Dynamic } from 'solid-js/web' + +import { useHydrated } from '@tanstack/solid-router' +import { isServer } from '@tanstack/router-core/isServer' +import { + hydrateIdAttribute, + hydrateWhenAttribute, +} from '@tanstack/start-client-core/hydration/constants' +import { + createResolvedGate, + getFallbackHtml, + getOrCreateGate, + onGateResolve, + releaseGate, + runHydrationStrategyCleanup, + saveFallbackHtml, + waitForHydrationPrefetchStrategy, +} from '@tanstack/start-client-core/hydration/runtime' +import { listenForDelegatedHydrationIntent } from '@tanstack/start-client-core/hydration' +import type { + HydrationRuntimeContext, + HydrationStrategy, + HydrationWhen, +} from '@tanstack/start-client-core/hydration' +import type { HydrationGateRecord } from '@tanstack/start-client-core/hydration/runtime' +import type { InternalHydrateProps } from './Hydrate' +import type { DynamicProps } from 'solid-js/web' + +type HydrationFallbackDynamicProps = DynamicProps<'div'> +type HydrationMarkerDynamicProps = DynamicProps<'div'> & { + [hydrateIdAttribute]: string + [hydrateWhenAttribute]: HydrationWhen + [key: `data-${string}`]: string | undefined +} +type PrefetchController = { + abortController: AbortController + hydrationRequested: boolean + hydrationListeners: Set<() => void> + hydrationResolvePending: boolean + started: boolean + promise?: Promise +} + +const hydrateIdSelector = `[${hydrateIdAttribute}]` +const dynamicType = 'dynamic' +const dynamicHydrateStrategy = { + _t: dynamicType, + _d: () => true, +} satisfies HydrationStrategy + +function shouldDeferHydration(strategy: HydrationStrategy) { + return strategy._d ? strategy._d() : strategy._t !== 'load' +} + +/* @__NO_SIDE_EFFECTS__ */ +function HydratedBoundary(props: { + id: string + onHydrated?: () => void + onStrategyHydrated?: (id: string) => void + children: Solid.JSX.Element +}) { + let didHydrate = false + + Solid.onMount(() => { + if (didHydrate) return + didHydrate = true + props.onHydrated?.() + props.onStrategyHydrated?.(props.id) + }) + + return props.children +} + +/* @__NO_SIDE_EFFECTS__ */ +export function GenericHydrate(props: InternalHydrateProps) { + const when = props.when + const dynamicHydrate = typeof when === 'function' + const initialHydrateStrategy: HydrationStrategy = dynamicHydrate + ? // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') + ? dynamicHydrateStrategy + : when() + : when + const markerHydrateType: HydrationWhen = dynamicHydrate + ? dynamicType + : initialHydrateStrategy._t! + const prefetchStrategy = () => props.prefetch + const hydrated = useHydrated() + const uniqueId = Solid.createUniqueId() + const id = props.h ? `${props.h}${uniqueId}` : uniqueId + const initialHydrateType = initialHydrateStrategy._t! + const shouldPreserveServerHTML = + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') || !hydrated() + const shouldDeferInitialHydration = + !hydrated() && shouldDeferHydration(initialHydrateStrategy) + const gate: HydrationGateRecord = + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') + ? createResolvedGate(id, initialHydrateType) + : getOrCreateGate(id, initialHydrateType) + const [ready, setReady] = Solid.createSignal( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') || + (!shouldDeferInitialHydration && initialHydrateType !== 'never'), + ) + const [prefetchError, setPrefetchError] = Solid.createSignal() + const controller: PrefetchController = { + abortController: new AbortController(), + hydrationRequested: false, + hydrationListeners: new Set<() => void>(), + hydrationResolvePending: false, + started: false, + } + let didPrefetch = false + let markerElement: HTMLDivElement | undefined + + if ( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + !(isServer ?? typeof window === 'undefined') && + initialHydrateType !== 'never' && + (!shouldDeferInitialHydration || + !shouldDeferHydration(initialHydrateStrategy)) + ) { + gate.resolve() + } + + const onHydrate = (listener: () => void) => { + if (controller.hydrationRequested) { + listener() + return () => {} + } + + controller.hydrationListeners.add(listener) + return () => { + controller.hydrationListeners.delete(listener) + } + } + + const requestHydration = () => { + if (!controller.hydrationRequested) { + controller.hydrationRequested = true + controller.hydrationListeners.forEach((listener) => listener()) + controller.hydrationListeners.clear() + } + + if (!controller.promise) { + resolveGate() + return + } + if (controller.hydrationResolvePending) return + controller.hydrationResolvePending = true + + controller.promise.then( + () => resolveGate(), + (error) => { + if (!controller.abortController.signal.aborted) { + setPrefetchError(() => error) + } + }, + ) + } + const resolveGate = gate.resolve + + Solid.onMount(() => { + const currentHydrateStrategy = initialHydrateStrategy + const currentPrefetchStrategy = prefetchStrategy() + const currentHydrateType = currentHydrateStrategy._t! + gate.when = currentHydrateType + for (const element of document.querySelectorAll( + hydrateIdSelector, + )) { + if (element.getAttribute(hydrateIdAttribute) === id) { + markerElement = element + saveFallbackHtml(id, element) + break + } + } + + if ( + currentHydrateType === 'never' && + !shouldPreserveServerHTML && + markerElement + ) { + markerElement.replaceChildren() + } + + if (currentPrefetchStrategy && !controller.started) { + controller.started = true + const preload = () => props.p?.() ?? Promise.resolve() + + if (typeof currentPrefetchStrategy === 'function') { + const promise = Promise.resolve() + .then(() => + currentPrefetchStrategy({ + element: markerElement ?? null, + signal: controller.abortController.signal, + preload, + waitFor: (strategy) => + waitForHydrationPrefetchStrategy(strategy, { + element: markerElement ?? null, + signal: controller.abortController.signal, + onHydrate, + }), + }), + ) + .then(() => undefined) + + controller.promise = promise + promise.catch((error) => { + if (!controller.abortController.signal.aborted) { + setPrefetchError(() => error) + } + }) + } else if (props.p) { + const currentStrategy = currentPrefetchStrategy + const prefetch = () => { + if (didPrefetch) return + didPrefetch = true + void preload() + } + const cleanupPrefetch = runHydrationStrategyCleanup( + currentStrategy._s?.({ + element: markerElement ?? null, + prefetch, + }), + ) + if (cleanupPrefetch) Solid.onCleanup(cleanupPrefetch) + } + } + + if ( + currentHydrateType !== 'never' && + (!shouldDeferInitialHydration || + !shouldDeferHydration(currentHydrateStrategy)) + ) { + gate.resolve() + setReady(true) + } + + const cleanups: Array<() => void> = [] + let removeResolveListener = () => {} + let disposed = false + + const resolveBoundary = () => { + setReady(true) + } + + const cleanup = () => { + if (disposed) return + disposed = true + if (gate.resolve === requestHydration) { + gate.resolve = resolveGate + } + removeResolveListener() + cleanups.forEach((fn) => fn()) + } + + const addCleanup = (fn: void | (() => void)) => { + if (!fn) return + if (disposed || gate.resolved) { + fn() + return + } + cleanups.push(fn) + } + + Solid.onCleanup(() => { + controller.abortController.abort() + controller.hydrationListeners.clear() + cleanup() + releaseGate(gate) + }) + + removeResolveListener = onGateResolve(gate, () => { + cleanup() + resolveBoundary() + }) + + if ( + gate.resolved || + !shouldDeferInitialHydration || + currentHydrateType === 'never' + ) { + if (gate.resolved) resolveBoundary() + return + } + + gate.resolve = requestHydration + const context: HydrationRuntimeContext = { + element: markerElement ?? null, + gate, + } + addCleanup( + runHydrationStrategyCleanup(currentHydrateStrategy._s?.(context)), + ) + + if (currentHydrateStrategy._t !== 'interaction') { + addCleanup( + runHydrationStrategyCleanup( + markerElement + ? listenForDelegatedHydrationIntent(markerElement, context) + : undefined, + ), + ) + } + }) + + Solid.createRenderEffect(() => { + if ( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + (isServer ?? typeof window === 'undefined') || + gate.resolved || + initialHydrateStrategy._t === 'never' || + shouldDeferHydration(initialHydrateStrategy) + ) { + return + } + + gate.resolve() + }) + + const markerAttributes = + markerHydrateType === dynamicType + ? undefined + : initialHydrateStrategy._a?.() + const markerProps: HydrationMarkerDynamicProps = { + component: 'div', + [hydrateIdAttribute]: id, + [hydrateWhenAttribute]: markerHydrateType, + ...markerAttributes, + } + const fallback = () => { + if (!shouldPreserveServerHTML) return props.fallback ?? null + + const html = getFallbackHtml(id) + if (!html) return null + + const fallbackProps: HydrationFallbackDynamicProps = { + component: 'div', + style: { display: 'contents' }, + innerHTML: html, + } + + return + } + + return ( + + {(() => { + const error = prefetchError() + if (error) throw error + return null + })()} + {initialHydrateType === 'never' && !shouldPreserveServerHTML ? ( + (props.fallback ?? null) + ) : ( + + + { + markerElement?.removeAttribute(hydrateWhenAttribute) + initialHydrateStrategy._o?.(id) + }} + > + {props.children} + + + + )} + + ) +} diff --git a/packages/solid-start-client/src/Hydrate.tsx b/packages/solid-start-client/src/Hydrate.tsx new file mode 100644 index 0000000000..1b52e643f2 --- /dev/null +++ b/packages/solid-start-client/src/Hydrate.tsx @@ -0,0 +1,75 @@ +import { GenericHydrate } from './GenericHydrate' +import type { + HydrationStrategy as CoreHydrationStrategy, + HydrationPrefetchFunction, + HydrationPrefetchStrategy, + HydrationWhen, +} from '@tanstack/start-client-core/hydration' +import type * as Solid from 'solid-js' + +export type { + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationPrefetchContext, + HydrationPrefetchFunction, + HydrationPrefetchStrategy, + HydrationPrefetchWaitReason, + HydrationWhen, +} from '@tanstack/start-client-core/hydration' + +export type SolidHydrationStrategy< + TWhen extends HydrationWhen = HydrationWhen, + TCanPrefetch extends boolean = boolean, +> = CoreHydrationStrategy & { + _h: (props: HydrateProps) => Solid.JSX.Element +} + +export type HydrationStrategy< + TWhen extends HydrationWhen = HydrationWhen, + TCanPrefetch extends boolean = boolean, +> = SolidHydrationStrategy + +export type HydrateWhen = + | SolidHydrationStrategy + | (() => SolidHydrationStrategy) + +type HydrateCommonOptions = { + when: HydrateWhen + fallback?: Solid.JSX.Element + onHydrated?: () => void +} + +export type HydrateOptions = + | (HydrateCommonOptions & { + prefetch?: never + split?: boolean + }) + | (HydrateCommonOptions & { + prefetch: HydrationPrefetchStrategy + split?: true + }) + | (HydrateCommonOptions & { + prefetch: HydrationPrefetchFunction + split?: boolean + }) + +export type HydrateProps = HydrateOptions & { + children: Solid.JSX.Element +} + +export type InternalHydrateProps = HydrateProps & { + h?: string + p?: () => Promise +} + +/* @__NO_SIDE_EFFECTS__ */ +export function Hydrate(props: HydrateProps) { + if ( + typeof props.when === 'function' || + typeof props.prefetch === 'function' + ) { + return + } + + return props.when._h(props) +} diff --git a/packages/solid-start-client/src/hydration.ts b/packages/solid-start-client/src/hydration.ts new file mode 100644 index 0000000000..bd875dcb0a --- /dev/null +++ b/packages/solid-start-client/src/hydration.ts @@ -0,0 +1,20 @@ +export { condition, interaction, media } from './hydration/generic' +export { idle } from './hydration/idle' +export { load } from './hydration/load' +export { never } from './hydration/never' +export { visible } from './hydration/visible' +export type { + HydrationCondition, + HydrationInteractionEvent, + HydrationInteractionEvents, + IdleHydrationOptions, + HydrationPrefetchContext, + HydrationPrefetchFunction, + HydrationPrefetchWhen, + HydrationPrefetchStrategy, + HydrationPrefetchWaitReason, + HydrationStrategyTypes, + HydrationWhen, + VisibleHydrationOptions, +} from '@tanstack/start-client-core/hydration' +export type { HydrationStrategy, SolidHydrationStrategy } from './Hydrate' diff --git a/packages/solid-start-client/src/hydration/generic.ts b/packages/solid-start-client/src/hydration/generic.ts new file mode 100644 index 0000000000..bfc1e8db9f --- /dev/null +++ b/packages/solid-start-client/src/hydration/generic.ts @@ -0,0 +1,41 @@ +import { + condition as coreCondition, + interaction as coreInteraction, + media as coreMedia, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import { GenericHydrate } from '../GenericHydrate' +import type { + HydrationCondition, + HydrationInteractionEvents, + HydrationPrefetchStrategy, +} from '@tanstack/start-client-core/hydration' +import type { SolidHydrationStrategy } from '../Hydrate' + +/* @__NO_SIDE_EFFECTS__ */ +export function media( + query: string, +): SolidHydrationStrategy<'media', true> & HydrationPrefetchStrategy<'media'> { + return /* @__PURE__ */ withHydrationRenderer(coreMedia(query), GenericHydrate) +} + +/* @__NO_SIDE_EFFECTS__ */ +export function condition( + condition: HydrationCondition, +): SolidHydrationStrategy<'condition', false> { + return /* @__PURE__ */ withHydrationRenderer( + coreCondition(condition), + GenericHydrate, + ) +} + +/* @__NO_SIDE_EFFECTS__ */ +export function interaction(options?: { + events?: HydrationInteractionEvents +}): SolidHydrationStrategy<'interaction', true> & + HydrationPrefetchStrategy<'interaction'> { + return /* @__PURE__ */ withHydrationRenderer( + coreInteraction(options), + GenericHydrate, + ) +} diff --git a/packages/solid-start-client/src/hydration/idle.ts b/packages/solid-start-client/src/hydration/idle.ts new file mode 100644 index 0000000000..89282b0a95 --- /dev/null +++ b/packages/solid-start-client/src/hydration/idle.ts @@ -0,0 +1,20 @@ +import { + idle as coreIdle, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import { GenericHydrate } from '../GenericHydrate' +import type { + HydrationPrefetchStrategy, + IdleHydrationOptions, +} from '@tanstack/start-client-core/hydration' +import type { SolidHydrationStrategy } from '../Hydrate' + +/* @__NO_SIDE_EFFECTS__ */ +export function idle( + options: IdleHydrationOptions = {}, +): SolidHydrationStrategy<'idle', true> & HydrationPrefetchStrategy<'idle'> { + return /* @__PURE__ */ withHydrationRenderer( + coreIdle(options), + GenericHydrate, + ) +} diff --git a/packages/solid-start-client/src/hydration/load.tsx b/packages/solid-start-client/src/hydration/load.tsx new file mode 100644 index 0000000000..a2836231e8 --- /dev/null +++ b/packages/solid-start-client/src/hydration/load.tsx @@ -0,0 +1,13 @@ +import { + load as coreLoad, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import { GenericHydrate } from '../GenericHydrate' +import type { HydrationPrefetchStrategy } from '@tanstack/start-client-core/hydration' +import type { SolidHydrationStrategy } from '../Hydrate' + +/* @__NO_SIDE_EFFECTS__ */ +export function load(): SolidHydrationStrategy<'load', true> & + HydrationPrefetchStrategy<'load'> { + return /* @__PURE__ */ withHydrationRenderer(coreLoad(), GenericHydrate) +} diff --git a/packages/solid-start-client/src/hydration/never.ts b/packages/solid-start-client/src/hydration/never.ts new file mode 100644 index 0000000000..36513b95d4 --- /dev/null +++ b/packages/solid-start-client/src/hydration/never.ts @@ -0,0 +1,11 @@ +import { + never as coreNever, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import { GenericHydrate } from '../GenericHydrate' +import type { SolidHydrationStrategy } from '../Hydrate' + +/* @__NO_SIDE_EFFECTS__ */ +export function never(): SolidHydrationStrategy<'never', false> { + return /* @__PURE__ */ withHydrationRenderer(coreNever(), GenericHydrate) +} diff --git a/packages/solid-start-client/src/hydration/visible.tsx b/packages/solid-start-client/src/hydration/visible.tsx new file mode 100644 index 0000000000..c747c236ec --- /dev/null +++ b/packages/solid-start-client/src/hydration/visible.tsx @@ -0,0 +1,21 @@ +import { + visible as coreVisible, + withHydrationRenderer, +} from '@tanstack/start-client-core/hydration' +import { GenericHydrate } from '../GenericHydrate' +import type { + HydrationPrefetchStrategy, + VisibleHydrationOptions, +} from '@tanstack/start-client-core/hydration' +import type { SolidHydrationStrategy } from '../Hydrate' + +/* @__NO_SIDE_EFFECTS__ */ +export function visible( + options?: VisibleHydrationOptions, +): SolidHydrationStrategy<'visible', true> & + HydrationPrefetchStrategy<'visible'> { + return /* @__PURE__ */ withHydrationRenderer( + coreVisible(options), + GenericHydrate, + ) +} diff --git a/packages/solid-start-client/src/index.tsx b/packages/solid-start-client/src/index.tsx index aa73990a57..2128ebcb01 100644 --- a/packages/solid-start-client/src/index.tsx +++ b/packages/solid-start-client/src/index.tsx @@ -1,2 +1,16 @@ export { StartClient } from './StartClient' export { hydrateStart } from './hydrateStart' +export { Hydrate } from './Hydrate' +export type { + HydrateOptions, + HydrateProps, + HydrateWhen, + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationPrefetchContext, + HydrationPrefetchFunction, + HydrationPrefetchStrategy, + HydrationPrefetchWaitReason, + HydrationStrategy, + HydrationWhen, +} from './Hydrate' diff --git a/packages/solid-start-client/src/tests/Hydrate.test-d.tsx b/packages/solid-start-client/src/tests/Hydrate.test-d.tsx new file mode 100644 index 0000000000..e5e13334f3 --- /dev/null +++ b/packages/solid-start-client/src/tests/Hydrate.test-d.tsx @@ -0,0 +1,147 @@ +import { expectTypeOf, test } from 'vitest' +import { visible } from '../hydration' +import { Hydrate } from '../Hydrate' +import type { + HydrateOptions, + HydrateProps, + HydrationPrefetchFunction, + HydrationPrefetchStrategy, + HydrationStrategy, +} from '../Hydrate' +import type { HydrationStrategy as CoreHydrationStrategy } from '@tanstack/start-client-core/hydration' +import type { JSX } from 'solid-js' + +type CommonHydrateProps = { + fallback?: JSX.Element + onHydrated?: () => void + children: JSX.Element +} + +type SplitHydrateProps = CommonHydrateProps & { + when: HydrationStrategy | (() => HydrationStrategy) + prefetch?: never + split?: boolean +} + +type PrefetchHydrateProps = CommonHydrateProps & { + when: HydrationStrategy | (() => HydrationStrategy) + prefetch: HydrationPrefetchStrategy + split?: true +} + +type FunctionPrefetchHydrateProps = CommonHydrateProps & { + when: HydrationStrategy | (() => HydrationStrategy) + prefetch: HydrationPrefetchFunction + split?: boolean +} + +test('Hydrate component accepts the public HydrateProps type', () => { + expectTypeOf(Hydrate).toBeFunction() + expectTypeOf(Hydrate).parameter(0).branded.toEqualTypeOf() +}) + +test('HydrateOptions supports reusable spread props', () => { + const belowFoldProps = { + when: () => visible({ rootMargin: '800px' }), + } satisfies HydrateOptions + + expectTypeOf(belowFoldProps).toMatchTypeOf() + + const withFunctionPrefetch = { + when: visible(), + split: false, + prefetch: (ctx) => { + expectTypeOf(ctx.element).toEqualTypeOf() + expectTypeOf(ctx.signal).toEqualTypeOf() + expectTypeOf(ctx.preload).returns.toEqualTypeOf>() + expectTypeOf(ctx.waitFor).returns.toEqualTypeOf< + Promise<'prefetch' | 'hydrate' | 'abort'> + >() + }, + } satisfies HydrateOptions + + expectTypeOf(withFunctionPrefetch).toMatchTypeOf() +}) + +test('Hydrate props are exact for strategy and prefetch forms', () => { + expectTypeOf< + Extract + >().branded.toEqualTypeOf() + expectTypeOf< + Extract + >().branded.toEqualTypeOf() + expectTypeOf< + Extract + >().branded.toEqualTypeOf() +}) + +test('Hydrate requires a strategy', () => { + expectTypeOf<{ + when: HydrationStrategy + children: JSX.Element + }>().toMatchTypeOf() + + expectTypeOf<{ + when: () => HydrationStrategy + children: JSX.Element + }>().toMatchTypeOf() + + expectTypeOf<{ + children: JSX.Element + }>().not.toMatchTypeOf() + + expectTypeOf<{ + when: () => true + children: JSX.Element + }>().not.toMatchTypeOf() + + expectTypeOf<{ + when: false + children: JSX.Element + }>().not.toMatchTypeOf() +}) + +test('Hydrate requires a framework-renderable strategy', () => { + expectTypeOf().not.toMatchTypeOf() + expectTypeOf>().toMatchTypeOf() + + expectTypeOf<{ + when: CoreHydrationStrategy + children: JSX.Element + }>().not.toMatchTypeOf() +}) + +test('Hydrate enforces prefetch only with split boundaries', () => { + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchStrategy + children: JSX.Element + }>().toMatchTypeOf() + + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchStrategy + split: true + children: JSX.Element + }>().toMatchTypeOf() + + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchStrategy + split: false + children: JSX.Element + }>().not.toMatchTypeOf() + + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchFunction + split: false + children: JSX.Element + }>().toMatchTypeOf() + + expectTypeOf<{ + when: HydrationStrategy + prefetch: HydrationPrefetchFunction + children: JSX.Element + }>().toMatchTypeOf() +}) diff --git a/packages/solid-start-client/vite.config.ts b/packages/solid-start-client/vite.config.ts index be71bab518..dbfb60ea03 100644 --- a/packages/solid-start-client/vite.config.ts +++ b/packages/solid-start-client/vite.config.ts @@ -20,7 +20,7 @@ export default mergeConfig( tanstackViteConfig({ tsconfigPath: './tsconfig.build.json', srcDir: './src', - entry: './src/index.tsx', + entry: ['./src/index.tsx', './src/Hydrate.tsx', './src/hydration.ts'], cjs: false, }), ) diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index de2ecd1c22..e902fe7abb 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -44,6 +44,12 @@ "default": "./dist/esm/client.js" } }, + "./hydration": { + "import": { + "types": "./dist/esm/hydration.d.ts", + "default": "./dist/esm/hydration.js" + } + }, "./client-rpc": { "import": { "types": "./dist/esm/client-rpc.d.ts", diff --git a/packages/solid-start/src/hydration.ts b/packages/solid-start/src/hydration.ts new file mode 100644 index 0000000000..fc660e9dc5 --- /dev/null +++ b/packages/solid-start/src/hydration.ts @@ -0,0 +1,18 @@ +export { + condition, + idle, + interaction, + load, + media, + never, + visible, +} from '@tanstack/solid-start-client/hydration' +export type { + HydrationCondition, + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationPrefetchStrategy, + HydrationStrategy, + HydrationWhen, + VisibleHydrationOptions, +} from '@tanstack/solid-start-client/hydration' diff --git a/packages/solid-start/src/index.ts b/packages/solid-start/src/index.ts index 8b51b6c783..0cdac87c81 100644 --- a/packages/solid-start/src/index.ts +++ b/packages/solid-start/src/index.ts @@ -1,2 +1,12 @@ export { useServerFn } from './useServerFn' export * from '@tanstack/start-client-core' +export { Hydrate } from '@tanstack/solid-start-client' +export type { + HydrateOptions, + HydrateProps, + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationPrefetchStrategy, + HydrationStrategy, + HydrationWhen, +} from '@tanstack/solid-start-client' diff --git a/packages/solid-start/vite.config.ts b/packages/solid-start/vite.config.ts index 262208de09..2c1a42d0e4 100644 --- a/packages/solid-start/vite.config.ts +++ b/packages/solid-start/vite.config.ts @@ -27,6 +27,7 @@ export default mergeConfig( entry: [ './src/index.ts', './src/client.tsx', + './src/hydration.ts', './src/client-rpc.ts', './src/ssr-rpc.ts', './src/server-rpc.ts', diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 811c106ee2..ca7e9bd076 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -60,16 +60,37 @@ "default": "./dist/esm/client-rpc/index.js" } }, + "./hydration": { + "import": { + "types": "./dist/esm/hydration.d.ts", + "default": "./dist/esm/hydration.js" + } + }, + "./hydration/constants": { + "import": { + "types": "./dist/esm/hydration/constants.d.ts", + "default": "./dist/esm/hydration/constants.js" + } + }, + "./hydration/runtime": { + "import": { + "types": "./dist/esm/hydration/runtime.d.ts", + "default": "./dist/esm/hydration/runtime.js" + } + }, "./package.json": "./package.json" }, "imports": { "#tanstack-start-entry": { + "types": "./src/start-entry.d.ts", "default": "./dist/esm/fake-entries/start.js" }, "#tanstack-router-entry": { + "types": "./src/start-entry.d.ts", "default": "./dist/esm/fake-entries/router.js" }, "#tanstack-start-plugin-adapters": { + "types": "./src/start-entry.d.ts", "default": "./dist/esm/fake-entries/plugin-adapters.js" } }, diff --git a/packages/start-client-core/src/client/hydrateStart.ts b/packages/start-client-core/src/client/hydrateStart.ts index 206b70505c..83b9c468af 100644 --- a/packages/start-client-core/src/client/hydrateStart.ts +++ b/packages/start-client-core/src/client/hydrateStart.ts @@ -1,5 +1,4 @@ import { hydrate } from '@tanstack/router-core/ssr/client' - import { startInstance } from '#tanstack-start-entry' import { hasPluginAdapters, @@ -10,7 +9,19 @@ import { ServerFunctionSerializationAdapter } from './ServerFunctionSerializatio import type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core' import type { AnyStartInstanceOptions } from '../createStart' -export async function hydrateStart(): Promise { +type HotContext = { + data?: Record + dispose?: (cb: (data: Record) => void) => void +} + +declare global { + interface ImportMeta { + hot?: HotContext + webpackHot?: HotContext + } +} + +async function hydrateStart(): Promise { const router = await getRouter() let serializationAdapters: Array @@ -47,3 +58,38 @@ export async function hydrateStart(): Promise { return router } + +function hydrateStartWithHmr(): Promise { + const hot = import.meta.hot ?? import.meta.webpackHot + + if (!hot) { + return hydrateStart() + } + + const key = 'tss-hydrate-start-promise' + const hotData = (hot.data ??= {}) + let hydrationPromise = hotData[key] as Promise | undefined + + if (!hydrationPromise) { + hydrationPromise = hydrateStart().catch((error) => { + if (hotData[key] === hydrationPromise) { + hotData[key] = undefined + } + + throw error + }) + + hotData[key] = hydrationPromise + } + + hot.dispose?.((data) => { + data[key] = hotData[key] + }) + + return hydrationPromise +} + +const exportedHydrateStart = + process.env.NODE_ENV !== 'production' ? hydrateStartWithHmr : hydrateStart + +export { exportedHydrateStart as hydrateStart } diff --git a/packages/start-client-core/src/hydration.ts b/packages/start-client-core/src/hydration.ts new file mode 100644 index 0000000000..934b73116f --- /dev/null +++ b/packages/start-client-core/src/hydration.ts @@ -0,0 +1,50 @@ +import { hydrateIdAttribute } from './hydration/constants' + +export { condition } from './hydration/condition' +export type { HydrationCondition } from './hydration/condition' +export { + hydrateIdAttribute, + hydrateInteractionEventsAttribute, + hydrateWhenAttribute, +} from './hydration/constants' +export const hydrateIdSelector = `[${hydrateIdAttribute}]` +export { idle } from './hydration/idle' +export type { IdleHydrationOptions } from './hydration/idle' +export { interaction } from './hydration/interaction' +export { load } from './hydration/load' +export { media } from './hydration/media' +export { never } from './hydration/never' +export { + clearResolvedGateIdsInMarker, + createResolvedGate, + getFallbackHtml, + getMarkerGate, + getOrCreateGate, + onGateResolve, + releaseGate, + resolveHydrationMarker, + runHydrationStrategyCleanup, + saveFallbackHtml, + waitForHydrationPrefetchStrategy, +} from './hydration/runtime' +export { withHydrationRenderer } from './hydration/renderer' +export { visible } from './hydration/visible' +export { listenForDelegatedHydrationIntent } from './hydration/interaction' +export type { VisibleHydrationOptions } from './hydration/visible' +export type { HydrationGateRecord } from './hydration/runtime' +export type { HydrationStrategyWithRenderer } from './hydration/renderer' +export type { + HydrationInteractionEvent, + HydrationInteractionEvents, + HydrationMarkerAttributes, + HydrationPrefetchContext, + HydrationPrefetchFunction, + HydrationPrefetchWhen, + HydrationPrefetchStrategy, + HydrationPrefetchWaitReason, + HydrationRuntimeContext, + HydrationRuntimeGate, + HydrationStrategy, + HydrationStrategyTypes, + HydrationWhen, +} from './hydration/types' diff --git a/packages/start-client-core/src/hydration/condition.ts b/packages/start-client-core/src/hydration/condition.ts new file mode 100644 index 0000000000..6e640cc3ae --- /dev/null +++ b/packages/start-client-core/src/hydration/condition.ts @@ -0,0 +1,20 @@ +import type { HydrationStrategy } from './types' + +const conditionType = 'condition' + +export type HydrationCondition = boolean | (() => boolean) + +/* @__NO_SIDE_EFFECTS__ */ +export function condition( + condition: HydrationCondition, +): HydrationStrategy { + return { + _t: conditionType, + _d: () => !(typeof condition === 'function' ? condition() : condition), + _s: ({ gate }) => { + if (typeof condition === 'function' ? condition() : condition) { + gate!.resolve() + } + }, + } +} diff --git a/packages/start-client-core/src/hydration/constants.ts b/packages/start-client-core/src/hydration/constants.ts new file mode 100644 index 0000000000..4b7a29313d --- /dev/null +++ b/packages/start-client-core/src/hydration/constants.ts @@ -0,0 +1,4 @@ +export const hydrateIdAttribute = 'data-ts-hydrate-id' +export const hydrateWhenAttribute = 'data-ts-hydrate-when' +export const hydrateInteractionEventsAttribute = + 'data-ts-hydrate-interaction-events' diff --git a/packages/start-client-core/src/hydration/idle.ts b/packages/start-client-core/src/hydration/idle.ts new file mode 100644 index 0000000000..bf0dc71131 --- /dev/null +++ b/packages/start-client-core/src/hydration/idle.ts @@ -0,0 +1,35 @@ +import type { HydrationPrefetchStrategy } from './types' + +const idleType = 'idle' + +export type IdleHydrationOptions = { + timeout?: number +} + +export function idle( + options: IdleHydrationOptions = {}, +): HydrationPrefetchStrategy { + const timeout = options.timeout ?? 2000 + + return { + _t: idleType, + _s: ({ gate, prefetch }) => { + const schedule = globalThis as unknown as { + requestIdleCallback?: ( + callback: IdleRequestCallback, + options?: IdleRequestOptions, + ) => number + cancelIdleCallback?: (handle: number) => void + } + const callback = prefetch ?? gate!.resolve + + if (schedule.requestIdleCallback) { + const handle = schedule.requestIdleCallback(callback, { timeout }) + return () => schedule.cancelIdleCallback?.(handle) + } + + const timeoutId = globalThis.setTimeout(callback, timeout) + return () => globalThis.clearTimeout(timeoutId) + }, + } +} diff --git a/packages/start-client-core/src/hydration/interaction.ts b/packages/start-client-core/src/hydration/interaction.ts new file mode 100644 index 0000000000..d5d6886d36 --- /dev/null +++ b/packages/start-client-core/src/hydration/interaction.ts @@ -0,0 +1,342 @@ +import { + hydrateIdAttribute, + hydrateInteractionEventsAttribute, + hydrateWhenAttribute, +} from './constants' +import { + clearResolvedGateIdsInMarker, + getMarkerGate, + resolveHydrationMarker, +} from './runtime' +import type { + HydrationInteractionEvents, + HydrationPrefetchStrategy, + HydrationRuntimeContext, +} from './types' + +export type InteractionHydrationOptions = { + events?: HydrationInteractionEvents +} + +const hydrateIdSelector = `[${hydrateIdAttribute}]` + +type PendingReplayEvent = { + marker: Element + targetPath: Array + type: string + event: Event +} + +const defaultInteractionEvents = [ + 'pointerenter', + 'focusin', + 'pointerdown', + 'click', +] as const +const supportedInteractionEvents = [ + 'auxclick', + 'click', + 'contextmenu', + 'dblclick', + 'focusin', + 'keydown', + 'keyup', + 'mousedown', + 'mouseenter', + 'mouseover', + 'mouseup', + 'pointerdown', + 'pointerenter', + 'pointerover', + 'pointerup', +] as const +const interactionType = 'interaction' +const dynamicType = 'dynamic' +const interactionHydrateSelector = `[${hydrateWhenAttribute}="${interactionType}"]` +const delegatedHydrateSelector = `${interactionHydrateSelector},[${hydrateWhenAttribute}="${dynamicType}"]` +const replayEventsByGateId = /* @__PURE__ */ new Map< + string, + Array +>() + +function getIntentListenerEvents( + marker: Element, + events: ReadonlyArray, +) { + const listenerEvents = new Set(events) + + marker.querySelectorAll(delegatedHydrateSelector).forEach((childMarker) => { + if (childMarker.getAttribute(hydrateWhenAttribute) === dynamicType) { + supportedInteractionEvents.forEach((eventName) => { + listenerEvents.add(eventName) + }) + return + } + + const attr = childMarker.getAttribute(hydrateInteractionEventsAttribute) + for (const eventName of attr === null + ? defaultInteractionEvents + : attr.split(/\s+/).filter(Boolean)) { + listenerEvents.add(eventName) + } + }) + + return [...listenerEvents] +} + +function queueHydrationReplayEvent(marker: Element, event: Event) { + if (!event.bubbles) return + + const id = marker.getAttribute(hydrateIdAttribute) + const when = marker.getAttribute(hydrateWhenAttribute) + if (!id || !when || when === 'never') return + + const target = event.target + if (!target) return + + const gate = getMarkerGate(marker) + if (gate?.resolved) return + + event.preventDefault() + event.stopPropagation() + event.stopImmediatePropagation() + + let targetPath: Array = [] + if (target instanceof Node && marker.contains(target)) { + let node: Element | null = + target instanceof Element ? target : target.parentElement + + while (node && node !== marker) { + const parent = node.parentElement + if (!parent) { + targetPath = [] + break + } + targetPath.push(Array.prototype.indexOf.call(parent.children, node)) + node = parent + } + targetPath.reverse() + } + + const pendingEvents = replayEventsByGateId.get(id) ?? [] + pendingEvents.push({ + marker, + targetPath, + type: event.type, + event, + }) + replayEventsByGateId.set(id, pendingEvents) +} + +if (typeof document !== 'undefined') { + const onIntent = (event: Event) => { + const target = event.target + if (!(target instanceof Element)) return + + let marker: Element | null = target.closest(hydrateIdSelector) + const markers: Array = [] + let shouldHandle = false + + while (marker) { + markers.push(marker) + + const when = marker.getAttribute(hydrateWhenAttribute) + if (when === dynamicType) { + shouldHandle ||= event.type === 'click' + } else if (when === interactionType) { + const attr = marker.getAttribute(hydrateInteractionEventsAttribute) + const events: ReadonlyArray = + attr === null + ? defaultInteractionEvents + : attr.split(/\s+/).filter(Boolean) + shouldHandle ||= events.includes(event.type) + } + + marker = marker.parentElement?.closest(hydrateIdSelector) ?? null + } + + if (!shouldHandle) return + + markers.reverse() + if (markers.every((marker) => getMarkerGate(marker))) return + + markers.forEach((marker) => { + queueHydrationReplayEvent(marker, event) + resolveHydrationMarker(marker) + }) + } + + supportedInteractionEvents.forEach((eventName) => { + document.addEventListener(eventName, onIntent, true) + }) +} + +function listenForIntent( + element: Element, + events: ReadonlyArray, + context: HydrationRuntimeContext, +) { + const onIntent = (event: Event) => { + const target = event.target + let marker: Element | null + if (target instanceof Element) { + const closestMarker = target.closest(hydrateIdSelector) + marker = + closestMarker && element.contains(closestMarker) + ? closestMarker + : element + } else { + marker = element + } + + const markers: Array = [] + while (marker) { + if (marker.hasAttribute(hydrateIdAttribute)) { + markers.push(marker) + } + if (marker === element) break + marker = marker.parentElement + } + + if (!markers.includes(element)) { + markers.push(element) + } + + markers.reverse() + + if ( + context.delegated && + !markers.some( + (marker) => + marker.getAttribute(hydrateWhenAttribute) === interactionType || + marker.getAttribute(hydrateWhenAttribute) === dynamicType, + ) + ) { + return + } + + markers.forEach((marker) => { + queueHydrationReplayEvent(marker, event) + resolveHydrationMarker(marker) + }) + } + let disposed = false + + events.forEach((eventName) => { + element.addEventListener(eventName, onIntent, true) + }) + + return () => { + if (disposed) return + disposed = true + events.forEach((eventName) => { + element.removeEventListener(eventName, onIntent, true) + }) + } +} + +export function listenForDelegatedHydrationIntent( + element: Element, + context: HydrationRuntimeContext, +) { + const listenerEvents = getIntentListenerEvents(element, []) + if (!listenerEvents.length) return + + const cleanupIntent = listenForIntent(element, listenerEvents, { + ...context, + delegated: true, + }) + return () => { + cleanupIntent() + clearResolvedGateIdsInMarker(element) + } +} + +/* @__NO_SIDE_EFFECTS__ */ +export function interaction( + options: InteractionHydrationOptions = {}, +): HydrationPrefetchStrategy { + let events: ReadonlyArray = defaultInteractionEvents + if (options.events !== undefined) { + const eventList: ReadonlyArray = + typeof options.events === 'string' ? [options.events] : options.events + const normalizedEvents: Array = [] + const seen = new Set() + + for (const eventName of eventList) { + if (!eventName || seen.has(eventName)) continue + seen.add(eventName) + normalizedEvents.push(eventName) + } + + events = normalizedEvents + } + + const eventKey = events.join(' ') + + return { + _t: interactionType, + _s: (context) => { + const element = context.element + if (!element) return + const prefetch = context.prefetch + if (prefetch) { + if (!events.length) return + let disposed = false + + events.forEach((eventName) => { + element.addEventListener(eventName, prefetch, true) + }) + + return () => { + if (disposed) return + disposed = true + events.forEach((eventName) => { + element.removeEventListener(eventName, prefetch, true) + }) + } + } + + const listenerEvents = getIntentListenerEvents(element, events) + const cleanupIntent = listenerEvents.length + ? listenForIntent(element, listenerEvents, context) + : undefined + return () => { + cleanupIntent?.() + clearResolvedGateIdsInMarker(element) + } + }, + _o: (id) => { + globalThis.requestAnimationFrame(() => { + const pendingEvents = replayEventsByGateId.get(id) + if (!pendingEvents?.length) return + + replayEventsByGateId.delete(id) + + for (const pendingEvent of pendingEvents) { + let replayTarget: Element | null = pendingEvent.marker + for (const index of pendingEvent.targetPath) { + replayTarget = replayTarget.children[index] ?? null + if (!replayTarget) break + } + + const event = pendingEvent.event + replayTarget ??= pendingEvent.marker + replayTarget.dispatchEvent( + event instanceof MouseEvent + ? new MouseEvent(event.type, event) + : event instanceof FocusEvent + ? new FocusEvent(event.type, event) + : new Event(event.type, event), + ) + } + }) + }, + _a: () => + options.events === undefined + ? undefined + : { + [hydrateInteractionEventsAttribute]: eventKey, + }, + } +} diff --git a/packages/start-client-core/src/hydration/load.ts b/packages/start-client-core/src/hydration/load.ts new file mode 100644 index 0000000000..b78d6d6a42 --- /dev/null +++ b/packages/start-client-core/src/hydration/load.ts @@ -0,0 +1,16 @@ +import type { HydrationPrefetchStrategy } from './types' + +const loadType = 'load' + +const loadStrategy: HydrationPrefetchStrategy = { + _t: loadType, + _d: () => false, + _s: ({ gate, prefetch }) => { + ;(prefetch ?? gate!.resolve)() + }, +} + +/* @__NO_SIDE_EFFECTS__ */ +export function load(): HydrationPrefetchStrategy { + return loadStrategy +} diff --git a/packages/start-client-core/src/hydration/media.ts b/packages/start-client-core/src/hydration/media.ts new file mode 100644 index 0000000000..c2335b7e2f --- /dev/null +++ b/packages/start-client-core/src/hydration/media.ts @@ -0,0 +1,25 @@ +import type { HydrationPrefetchStrategy } from './types' + +const mediaType = 'media' + +/* @__NO_SIDE_EFFECTS__ */ +export function media( + query: string, +): HydrationPrefetchStrategy { + return { + _t: mediaType, + _s: ({ gate, prefetch }) => { + if (!query) return + + const callback = prefetch ?? gate!.resolve + const mediaQuery = window.matchMedia(query) + const onChange = () => { + if (mediaQuery.matches) callback() + } + mediaQuery.addEventListener('change', onChange) + onChange() + + return () => mediaQuery.removeEventListener('change', onChange) + }, + } +} diff --git a/packages/start-client-core/src/hydration/never.ts b/packages/start-client-core/src/hydration/never.ts new file mode 100644 index 0000000000..8ace129b5e --- /dev/null +++ b/packages/start-client-core/src/hydration/never.ts @@ -0,0 +1,13 @@ +import type { HydrationStrategy } from './types' + +const neverType = 'never' + +const neverStrategy: HydrationStrategy = { + _t: neverType, + _d: () => true, +} + +/* @__NO_SIDE_EFFECTS__ */ +export function never(): HydrationStrategy { + return neverStrategy +} diff --git a/packages/start-client-core/src/hydration/renderer.ts b/packages/start-client-core/src/hydration/renderer.ts new file mode 100644 index 0000000000..1a14ef9b46 --- /dev/null +++ b/packages/start-client-core/src/hydration/renderer.ts @@ -0,0 +1,21 @@ +import type { HydrationStrategy } from './types' + +export type HydrationStrategyWithRenderer< + TStrategy extends HydrationStrategy, + TRenderer, +> = TStrategy & { + _h: TRenderer +} + +/* @__NO_SIDE_EFFECTS__ */ +export function withHydrationRenderer< + TStrategy extends HydrationStrategy, + TRenderer, +>( + strategy: TStrategy, + renderer: TRenderer, +): HydrationStrategyWithRenderer { + return /* @__PURE__ */ Object.assign(strategy, { + _h: renderer, + }) +} diff --git a/packages/start-client-core/src/hydration/runtime.ts b/packages/start-client-core/src/hydration/runtime.ts new file mode 100644 index 0000000000..b1da55195d --- /dev/null +++ b/packages/start-client-core/src/hydration/runtime.ts @@ -0,0 +1,191 @@ +import { hydrateIdAttribute, hydrateWhenAttribute } from './constants' +import type { + HydrationPrefetchStrategy, + HydrationPrefetchWaitReason, + HydrationRuntimeGate, + HydrationWhen, +} from './types' + +const hydrateIdSelector = `[${hydrateIdAttribute}]` + +export type HydrationGateRecord = HydrationRuntimeGate & { + id: string + when: HydrationWhen + promise: Promise + consumers: number + resolveListeners: Set<() => void> +} + +const gateRegistry = /* @__PURE__ */ new Map() +const resolvedGateIds = /* @__PURE__ */ new Set() +const fallbackHtmlByGateId = /* @__PURE__ */ new Map() + +export function createResolvedGate( + id: string, + when: HydrationWhen, +): HydrationGateRecord { + return { + id, + when, + promise: Promise.resolve(), + resolve: () => {}, + resolved: true, + consumers: 0, + resolveListeners: new Set<() => void>(), + } +} + +export function getOrCreateGate( + id: string, + when: HydrationWhen, +): HydrationGateRecord { + const existing = gateRegistry.get(id) + if (existing?.when === when) { + existing.consumers++ + return existing + } + + let resolvePromise!: () => void + const promise = new Promise((resolve) => { + resolvePromise = resolve + }) + + const gate: HydrationGateRecord = { + id, + promise, + resolved: false, + consumers: 1, + when, + resolveListeners: new Set(), + resolve: () => { + if (gate.resolved) return + gate.resolved = true + resolvePromise() + gate.resolveListeners.forEach((listener) => listener()) + gate.resolveListeners.clear() + }, + } + + gateRegistry.set(id, gate) + if (when !== 'never' && resolvedGateIds.has(id)) { + resolvedGateIds.delete(id) + gate.resolve() + } + return gate +} + +export function releaseGate(gate: HydrationGateRecord) { + resolvedGateIds.delete(gate.id) + gate.consumers-- + if (gate.consumers > 0) return + if (gateRegistry.get(gate.id) === gate) { + gateRegistry.delete(gate.id) + fallbackHtmlByGateId.delete(gate.id) + gate.resolveListeners.clear() + } +} + +export function onGateResolve(gate: HydrationGateRecord, listener: () => void) { + if (gate.resolved) { + listener() + return () => {} + } + + gate.resolveListeners.add(listener) + return () => { + gate.resolveListeners.delete(listener) + } +} + +export function runHydrationStrategyCleanup(cleanup: void | (() => void)) { + if (typeof cleanup === 'function') return cleanup + return undefined +} + +export function waitForHydrationPrefetchStrategy( + strategy: HydrationPrefetchStrategy, + options: { + element: Element | null + signal: AbortSignal + onHydrate: (listener: () => void) => () => void + }, +): Promise { + if (options.signal.aborted) { + return Promise.resolve('abort') + } + + return new Promise((resolve) => { + const state = { disposed: false } + const cleanupStrategyRef: { current: void | (() => void) } = { + current: undefined, + } + let cleanupHydrate = () => {} + + const finish = (reason: HydrationPrefetchWaitReason) => { + if (state.disposed) return + state.disposed = true + options.signal.removeEventListener('abort', onAbort) + cleanupHydrate() + runHydrationStrategyCleanup(cleanupStrategyRef.current)?.() + resolve(reason) + } + + const onAbort = () => finish('abort') + + options.signal.addEventListener('abort', onAbort, { once: true }) + cleanupHydrate = options.onHydrate(() => finish('hydrate')) + const cleanupStrategy = strategy._s?.({ + element: options.element, + prefetch: () => finish('prefetch'), + }) + cleanupStrategyRef.current = cleanupStrategy + if (state.disposed) { + runHydrationStrategyCleanup(cleanupStrategy)?.() + } + }) +} + +export function getMarkerGate(marker: Element) { + const id = marker.getAttribute(hydrateIdAttribute) + return id ? gateRegistry.get(id) : undefined +} + +export function resolveHydrationMarker(marker: Element) { + const id = marker.getAttribute(hydrateIdAttribute) + const when = marker.getAttribute(hydrateWhenAttribute) + if (!id || !when || when === 'never') { + return + } + + const gate = gateRegistry.get(id) + if (gate) { + if (gate.when !== 'never') gate.resolve() + return + } + + resolvedGateIds.add(id) +} + +export function clearResolvedGateIdsInMarker(marker: Element) { + const ownId = marker.getAttribute(hydrateIdAttribute) + if (ownId) { + resolvedGateIds.delete(ownId) + } + + marker.querySelectorAll(hydrateIdSelector).forEach((childMarker) => { + const childId = childMarker.getAttribute(hydrateIdAttribute) + if (childId) { + resolvedGateIds.delete(childId) + } + }) +} + +export function saveFallbackHtml(id: string, element: Element) { + if (!fallbackHtmlByGateId.has(id)) { + fallbackHtmlByGateId.set(id, element.innerHTML) + } +} + +export function getFallbackHtml(id: string) { + return fallbackHtmlByGateId.get(id) +} diff --git a/packages/start-client-core/src/hydration/types.ts b/packages/start-client-core/src/hydration/types.ts new file mode 100644 index 0000000000..f4250067d6 --- /dev/null +++ b/packages/start-client-core/src/hydration/types.ts @@ -0,0 +1,90 @@ +export type HydrationWhen = + | 'load' + | 'idle' + | 'visible' + | 'media' + | 'interaction' + | 'condition' + | 'never' + | 'dynamic' + +export type HydrationInteractionEvent = + | 'auxclick' + | 'click' + | 'contextmenu' + | 'dblclick' + | 'focusin' + | 'keydown' + | 'keyup' + | 'mousedown' + | 'mouseenter' + | 'mouseover' + | 'mouseup' + | 'pointerdown' + | 'pointerenter' + | 'pointerover' + | 'pointerup' + +export type HydrationInteractionEvents = + | HydrationInteractionEvent + | ReadonlyArray + +export type HydrationMarkerAttributes = Record + +export type HydrationRuntimeGate = { + id?: string + when?: HydrationWhen + resolved: boolean + resolve: () => void +} + +export type HydrationRuntimeContext = { + element: Element | null + gate?: HydrationRuntimeGate + prefetch?: () => void + delegated?: boolean +} + +export type HydrationStrategyTypes< + TWhen extends HydrationWhen = HydrationWhen, + TCanPrefetch extends boolean = boolean, +> = { + when: TWhen + canPrefetch: TCanPrefetch +} + +export type HydrationStrategy< + TWhen extends HydrationWhen = HydrationWhen, + TCanPrefetch extends boolean = boolean, +> = { + _t?: TWhen + readonly '~types'?: HydrationStrategyTypes + _d?: () => boolean + _s?: (context: HydrationRuntimeContext) => void | (() => void) + _o?: (id: string) => void + _a?: () => HydrationMarkerAttributes | undefined +} + +export type HydrationPrefetchWhen = Exclude< + HydrationWhen, + 'condition' | 'never' | 'dynamic' +> + +export type HydrationPrefetchStrategy< + TWhen extends HydrationPrefetchWhen = HydrationPrefetchWhen, +> = HydrationStrategy + +export type HydrationPrefetchWaitReason = 'prefetch' | 'hydrate' | 'abort' + +export type HydrationPrefetchContext = { + element: Element | null + signal: AbortSignal + preload: () => Promise + waitFor: ( + strategy: HydrationPrefetchStrategy, + ) => Promise +} + +export type HydrationPrefetchFunction = ( + context: HydrationPrefetchContext, +) => void | Promise diff --git a/packages/start-client-core/src/hydration/visible.ts b/packages/start-client-core/src/hydration/visible.ts new file mode 100644 index 0000000000..3c3391b1de --- /dev/null +++ b/packages/start-client-core/src/hydration/visible.ts @@ -0,0 +1,90 @@ +import type { HydrationPrefetchStrategy } from './types' + +const visibleType = 'visible' + +export type VisibleHydrationOptions = { + rootMargin?: string + threshold?: number | Array +} + +type VisibleObserverEntry = { + key: string + observer: IntersectionObserver + elements: Map void>> +} + +const observerRegistry = /* @__PURE__ */ new Map() + +function cleanupVisibleObserverEntry(observerEntry: VisibleObserverEntry) { + if (observerEntry.elements.size > 0) return + observerEntry.observer.disconnect() + observerRegistry.delete(observerEntry.key) +} + +/* @__NO_SIDE_EFFECTS__ */ +export function visible( + options: VisibleHydrationOptions = {}, +): HydrationPrefetchStrategy { + const rootMargin = options.rootMargin ?? '600px' + const threshold = options.threshold ?? 0 + + return { + _t: visibleType, + _s: ({ element, gate, prefetch }) => { + const callback = prefetch ?? gate!.resolve + + if (!element) { + callback() + return + } + + const key = `${rootMargin}|${ + Array.isArray(threshold) ? threshold.join(',') : String(threshold) + }` + let observerEntry = observerRegistry.get(key) + + if (!observerEntry) { + const entry: VisibleObserverEntry = { + key, + elements: new Map void>>(), + observer: new IntersectionObserver( + (entries) => { + for (const intersectingEntry of entries) { + if (!intersectingEntry.isIntersecting) continue + + const callbacks = entry.elements.get(intersectingEntry.target) + if (!callbacks) continue + + callbacks.forEach((callback) => callback()) + entry.elements.delete(intersectingEntry.target) + entry.observer.unobserve(intersectingEntry.target) + cleanupVisibleObserverEntry(entry) + } + }, + { rootMargin, threshold }, + ), + } + observerRegistry.set(key, entry) + observerEntry = entry + } + + let callbacks = observerEntry.elements.get(element) + if (!callbacks) { + callbacks = new Set() + observerEntry.elements.set(element, callbacks) + observerEntry.observer.observe(element) + } + callbacks.add(callback) + + return () => { + const currentCallbacks = observerEntry.elements.get(element) + currentCallbacks?.delete(callback) + if (currentCallbacks?.size === 0) { + observerEntry.elements.delete(element) + observerEntry.observer.unobserve(element) + } + cleanupVisibleObserverEntry(observerEntry) + } + }, + } +} diff --git a/packages/start-client-core/vite.config.ts b/packages/start-client-core/vite.config.ts index e893ba2c8d..c17997fc31 100644 --- a/packages/start-client-core/vite.config.ts +++ b/packages/start-client-core/vite.config.ts @@ -2,33 +2,42 @@ import { defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/vite-config' import packageJson from './package.json' -const config = defineConfig({ - test: { - typecheck: { enabled: true }, - name: packageJson.name, - watch: false, - environment: 'jsdom', - }, -}) - -export default mergeConfig( - config, - tanstackViteConfig({ - tsconfigPath: './tsconfig.build.json', - srcDir: './src', - entry: [ - './src/index.tsx', - './src/client/index.ts', - './src/client-rpc/index.ts', - './src/fake-entries/start.ts', - './src/fake-entries/router.ts', - './src/fake-entries/plugin-adapters.ts', - ], - cjs: false, - externalDeps: [ - '#tanstack-start-entry', - '#tanstack-router-entry', - '#tanstack-start-plugin-adapters', - ], - }), +export default defineConfig(({ command }) => + mergeConfig( + { + define: + command === 'build' + ? { + 'import.meta.hot': 'import.meta.hot', + } + : undefined, + test: { + typecheck: { enabled: true }, + name: packageJson.name, + watch: false, + environment: 'jsdom', + }, + }, + tanstackViteConfig({ + tsconfigPath: './tsconfig.build.json', + srcDir: './src', + entry: [ + './src/index.tsx', + './src/client/index.ts', + './src/client-rpc/index.ts', + './src/hydration/constants.ts', + './src/hydration.ts', + './src/hydration/runtime.ts', + './src/fake-entries/start.ts', + './src/fake-entries/router.ts', + './src/fake-entries/plugin-adapters.ts', + ], + cjs: false, + externalDeps: [ + '#tanstack-start-entry', + '#tanstack-router-entry', + '#tanstack-start-plugin-adapters', + ], + }), + ), ) diff --git a/packages/start-plugin-core/src/hydrate-when-transform.ts b/packages/start-plugin-core/src/hydrate-when-transform.ts new file mode 100644 index 0000000000..d88ddb60d0 --- /dev/null +++ b/packages/start-plugin-core/src/hydrate-when-transform.ts @@ -0,0 +1,1004 @@ +import { relative } from 'node:path' +import crypto from 'node:crypto' +import babel from '@babel/core' +import * as t from '@babel/types' +import { + buildDeclarationMap, + buildDependencyGraph, + collectIdentifiersFromNode, + collectIdentifiersFromPattern, + collectLocalBindingsFromStatement, + deadCodeElimination, + expandTransitively, + findReferencedIdentifiers, + generateFromAst, + parseAst, + removeModuleLevelBindings, + retainModuleLevelDeclarations, + stripUnreferencedTopLevelExpressionStatements, + unwrapExportedDeclarations, +} from '@tanstack/router-utils' +import { tssHydrate } from './hydration-constants' +import { cleanId, codeFrameError } from './start-compiler/utils' +import type { + CompileStartFrameworkOptions, + StartCompilerPlugin, + StartCompilerTransformResult, +} from './types' + +export class MissingHydrateSourceError extends Error { + constructor(id: string) { + super( + `Missing Hydrate source for virtual module ${id}. The parent module must be transformed before its Hydrate child chunk is loaded.`, + ) + } +} + +/** + * Detection pattern used by the transform code filter to pre-scan files for + * `` JSX before any AST parsing happens. + */ +const HYDRATE_DETECTION_PATTERN = /\bHydrate\b/ + +function createBoundaryId(root: string, sourceId: string) { + const normalized = relative(root, sourceId).replaceAll('\\', '/') + const sourceHash = crypto + .createHash('sha1') + .update(normalized) + .digest('hex') + .slice(0, 10) + + return (index: number) => { + return `${index.toString(36)}_${sourceHash}` + } +} + +function getJSXElementName(node: t.JSXElement) { + const name = node.openingElement.name + return t.isJSXIdentifier(name) ? name.name : undefined +} + +function getJSXAttribute(node: t.JSXOpeningElement, name: string) { + for (const item of node.attributes) { + if (t.isJSXAttribute(item) && t.isJSXIdentifier(item.name, { name })) { + return item + } + } + + return undefined +} + +function getBooleanProp(node: t.JSXOpeningElement, name: string) { + const attr = getJSXAttribute(node, name) + if (!attr) return undefined + if (!attr.value) return true + if (t.isStringLiteral(attr.value)) return attr.value.value !== 'false' + if (t.isJSXExpressionContainer(attr.value)) { + if (t.isBooleanLiteral(attr.value.expression)) { + return attr.value.expression.value + } + } + return undefined +} + +function parseHydrateVirtualId(id: string) { + const queryIndex = id.indexOf('?') + const sourceId = cleanId(queryIndex === -1 ? id : id.slice(0, queryIndex)) + if (queryIndex === -1) { + return { sourceId, splitId: null, boundaryIndex: -1 } + } + + const rawQuery = id.slice(queryIndex + 1) + const params = new URLSearchParams(rawQuery) + const splitId = params.get(tssHydrate) + let boundaryIndex = -1 + if (splitId) { + const separatorIndex = splitId.indexOf('_') + if (separatorIndex > 0) { + const parsedIndex = Number.parseInt(splitId.slice(0, separatorIndex), 36) + if (Number.isInteger(parsedIndex)) { + boundaryIndex = parsedIndex + } + } + } + + return { + sourceId, + splitId, + boundaryIndex, + } +} + +function isObjectPropertyName( + property: t.ObjectMethod | t.ObjectProperty, + name: string, +) { + if (t.isIdentifier(property.key) && !property.computed) { + return property.key.name === name + } + + return t.isStringLiteral(property.key) && property.key.value === name +} + +function isReferenceInsideAnyNode( + referencePath: babel.NodePath, + nodes: ReadonlySet, +) { + if (nodes.has(referencePath.node)) return true + return Boolean(referencePath.findParent((parent) => nodes.has(parent.node))) +} + +function stripBindingsOnlyReferencedBy( + path: babel.NodePath, + node: t.Node, + seen = new Set(), + preserve = new Set(), +) { + stripBindingsOnlyReferencedByNodes(path.scope, [node], seen, preserve) +} + +function stripBindingsOnlyReferencedByNodes( + scope: babel.NodePath['scope'], + nodes: ReadonlyArray, + seen = new Set(), + preserve = new Set(), +) { + const nodeSet = new Set(nodes) + const names = new Set() + nodes.forEach((node) => { + collectIdentifiersFromNode(node).forEach((name) => names.add(name)) + }) + + for (const name of names) { + if (seen.has(name)) continue + if (preserve.has(name)) continue + const binding = scope.getBinding(name) + if (!binding?.constant) continue + if ( + binding.path.findParent( + (parentPath) => + parentPath.isExportNamedDeclaration() || + parentPath.isExportDefaultDeclaration(), + ) + ) { + continue + } + if (binding.referencePaths.length === 0) continue + if ( + !binding.referencePaths.every((referencePath) => + isReferenceInsideAnyNode(referencePath, nodeSet), + ) + ) { + continue + } + + seen.add(name) + + const declarationPath = binding.path.isVariableDeclarator() + ? binding.path + : binding.path.findParent((parentPath) => + parentPath.isVariableDeclarator(), + ) + const patternHasExternalReferences = + declarationPath?.isVariableDeclarator() && + !t.isIdentifier(declarationPath.node.id) && + collectIdentifiersFromPattern(declarationPath.node.id).some( + (bindingName) => { + if (bindingName === binding.identifier.name) return false + + const siblingBinding = binding.scope.getBinding(bindingName) + return siblingBinding?.referencePaths.some( + (referencePath) => + !isReferenceInsideAnyNode(referencePath, nodeSet), + ) + }, + ) + + if (patternHasExternalReferences) { + continue + } + + const bindingNode = binding.path.node + if (t.isVariableDeclarator(bindingNode) && bindingNode.init) { + stripBindingsOnlyReferencedByNodes( + binding.scope, + [bindingNode.init], + seen, + preserve, + ) + } else if ( + t.isFunctionDeclaration(bindingNode) || + t.isClassDeclaration(bindingNode) + ) { + stripBindingsOnlyReferencedByNodes( + binding.scope, + [bindingNode], + seen, + preserve, + ) + } + + if (binding.path.isVariableDeclarator()) { + const declarationPath = binding.path.parentPath + if ( + declarationPath.isVariableDeclaration() && + declarationPath.node.declarations.length === 1 + ) { + declarationPath.remove() + continue + } + + binding.path.remove() + continue + } + + if ( + binding.path.isImportSpecifier() || + binding.path.isImportDefaultSpecifier() || + binding.path.isImportNamespaceSpecifier() + ) { + const importPath = binding.path.parentPath + if ( + importPath.isImportDeclaration() && + importPath.node.specifiers.length === 1 + ) { + importPath.remove() + continue + } + + binding.path.remove() + continue + } + + binding.path.remove() + } +} + +function getSingleUseObjectExpressionBinding( + path: babel.NodePath, + identifier: t.Identifier, +) { + const binding = path.scope.getBinding(identifier.name) + if (!binding?.constant) return undefined + if (binding.referencePaths.length !== 1) return undefined + if (binding.referencePaths[0]?.node !== identifier) return undefined + if (!binding.path.isVariableDeclarator()) return undefined + const init = binding.path.node.init + return t.isObjectExpression(init) ? init : undefined +} + +function objectExpressionMayHaveProperty( + node: t.ObjectExpression, + name: string, +) { + return node.properties.some((property) => { + if (t.isSpreadElement(property)) return true + if (!t.isObjectMethod(property) && !t.isObjectProperty(property)) { + return true + } + if (property.computed) return true + return isObjectPropertyName(property, name) + }) +} + +function stripObjectExpressionProperty( + path: babel.NodePath, + node: t.ObjectExpression, + name: string, +) { + let modified = false + + node.properties = node.properties.filter((property) => { + if ( + (t.isObjectMethod(property) || t.isObjectProperty(property)) && + isObjectPropertyName(property, name) + ) { + stripBindingsOnlyReferencedBy( + path, + t.isObjectProperty(property) ? property.value : property.body, + ) + modified = true + return false + } + + return true + }) + + return modified +} + +function throwBoundaryError( + code: string, + path: babel.NodePath, + message: string, +): never { + if (path.node.loc) { + throw codeFrameError(code, path.node.loc, message) + } + throw new Error(message) +} + +function inspectSplitBoundary(options: { + code: string + path: babel.NodePath + validate?: boolean + collectCaptured?: boolean + nestedHydrate?: { + localName: string + } +}) { + const { path } = options + const capturedNames = options.collectCaptured ? new Set() : undefined + const nestedHydrate = options.nestedHydrate + let nestedBoundaryCount = 0 + + if (options.validate) { + for (const child of path.node.children) { + if ( + t.isJSXExpressionContainer(child) && + (t.isFunctionExpression(child.expression) || + t.isArrowFunctionExpression(child.expression)) + ) { + throwBoundaryError( + options.code, + path, + 'Hydrate cannot code-split function-as-children. Use split={false} for this boundary.', + ) + } + } + } + + const rootVisitors = { + JSXOpeningElement(openingPath: babel.NodePath) { + if (openingPath.node === path.node.openingElement) { + openingPath.skip() + } + }, + JSXClosingElement(closingPath: babel.NodePath) { + closingPath.skip() + }, + } + + const validateVisitors = options.validate + ? { + CallExpression(callPath: babel.NodePath) { + if (!t.isIdentifier(callPath.node.callee)) return + if (!/^use[A-Z0-9]/.test(callPath.node.callee.name)) return + + throwBoundaryError( + options.code, + path, + 'Hydrate cannot code-split JSX that calls hooks during render. Move the hook call into a child component or use split={false}.', + ) + }, + ThisExpression(thisPath: babel.NodePath) { + void thisPath + throwBoundaryError( + options.code, + path, + 'Hydrate cannot code-split JSX that captures this.', + ) + }, + Super(superPath: babel.NodePath) { + void superPath + throwBoundaryError( + options.code, + path, + 'Hydrate cannot code-split JSX that captures super.', + ) + }, + } + : {} + + const nestedHydrateVisitors = nestedHydrate + ? { + JSXElement(nestedPath: babel.NodePath) { + if (getJSXElementName(nestedPath.node) !== nestedHydrate.localName) { + return + } + + const split = getBooleanProp(nestedPath.node.openingElement, 'split') + if (split === false) return + + nestedBoundaryCount++ + }, + } + : {} + + const captureVisitors = capturedNames + ? { + Identifier(identifierPath: babel.NodePath) { + const parent = identifierPath.parent + if ( + t.isJSXOpeningElement(parent) || + t.isJSXClosingElement(parent) || + (t.isObjectProperty(parent, { key: identifierPath.node }) && + !parent.computed && + !parent.shorthand) || + (t.isMemberExpression(parent, { + property: identifierPath.node, + }) && + !parent.computed) + ) { + return + } + + const binding = identifierPath.scope.getBinding( + identifierPath.node.name, + ) + if (!binding) return + if (t.isProgram(binding.scope.block)) return + if ( + path.node === binding.scope.block || + path.isAncestor(binding.path) + ) + return + + capturedNames.add(identifierPath.node.name) + }, + JSXIdentifier(identifierPath: babel.NodePath) { + if (identifierPath.parentKey !== 'name') return + const name = identifierPath.node.name + if (!/^[A-Z]/.test(name)) return + const binding = identifierPath.scope.getBinding(name) + if (!binding) return + if (t.isProgram(binding.scope.block)) return + + capturedNames.add(name) + }, + } + : {} + + path.traverse({ + ...rootVisitors, + ...validateVisitors, + ...nestedHydrateVisitors, + ...captureVisitors, + }) + + return { + captured: capturedNames ? [...capturedNames].sort() : [], + nestedBoundaryCount, + } +} + +function getHydrateImport( + ast: t.File, + framework: CompileStartFrameworkOptions, +) { + const hydrateImportSource = `@tanstack/${framework}-start` + + for (const node of ast.program.body) { + if (!t.isImportDeclaration(node)) continue + if (node.source.value !== hydrateImportSource) continue + + for (const specifier of node.specifiers) { + if ( + t.isImportSpecifier(specifier) && + t.isIdentifier(specifier.imported, { name: 'Hydrate' }) + ) { + return { + hydrateLocalName: specifier.local.name, + } + } + } + } + + return undefined +} + +function getMeaningfulChildren( + children: Array, +) { + return children.filter( + (child) => !(t.isJSXText(child) && child.value.trim() === ''), + ) +} + +function transformHydrateAst(options: { + ast: t.File + code: string + id: string + root: string + env: 'client' | 'server' + framework: CompileStartFrameworkOptions + indexOffset?: number +}) { + if (!options.code.includes('Hydrate')) return null + + const hydrateImport = getHydrateImport(options.ast, options.framework) + if (!hydrateImport) return null + const { hydrateLocalName: localName } = hydrateImport + const sourceId = cleanId(options.id) + const getBoundaryId = createBoundaryId(options.root, sourceId) + + let nextBoundaryIndex = options.indexOffset ?? 0 + const state = { + modified: false, + extractedChildNodes: [] as Array, + capturedNames: new Set(), + } + let lazyIdent: t.Identifier | undefined + + babel.traverse(options.ast, { + Program(programPath) { + programPath.traverse({ + JSXElement(path) { + if (getJSXElementName(path.node) !== localName) return + + if (options.env === 'server') { + path.node.openingElement.attributes = + path.node.openingElement.attributes.filter((item) => { + if ( + t.isJSXAttribute(item) && + t.isJSXIdentifier(item.name, { name: 'fallback' }) + ) { + if (item.value) { + stripBindingsOnlyReferencedBy(path, item.value) + } + state.modified = true + return false + } + + if ( + t.isJSXSpreadAttribute(item) && + t.isObjectExpression(item.argument) + ) { + if ( + stripObjectExpressionProperty( + path, + item.argument, + 'fallback', + ) + ) { + state.modified = true + } + return item.argument.properties.length > 0 + } + + if ( + t.isJSXSpreadAttribute(item) && + t.isIdentifier(item.argument) + ) { + const init = getSingleUseObjectExpressionBinding( + path, + item.argument, + ) + if ( + init && + stripObjectExpressionProperty(path, init, 'fallback') + ) { + state.modified = true + } + } + + return true + }) + } + + const split = getBooleanProp(path.node.openingElement, 'split') + if (split === false) return + + const boundaryInspection = inspectSplitBoundary({ + code: options.code, + path, + validate: true, + collectCaptured: options.env === 'client', + ...(options.env === 'client' + ? { + nestedHydrate: { + localName, + }, + } + : {}), + }) + + const index = nextBoundaryIndex + nextBoundaryIndex += 1 + boundaryInspection.nestedBoundaryCount + const id = getBoundaryId(index) + const exportName = `H${index}` + + const existingHydrateId = getJSXAttribute( + path.node.openingElement, + 'h', + ) + if (existingHydrateId) { + existingHydrateId.value = t.stringLiteral(id) + } else { + path.node.openingElement.attributes.push( + t.jsxAttribute(t.jsxIdentifier('h'), t.stringLiteral(id)), + ) + } + state.modified = true + + if (options.env === 'server') return + + const needsPreloadProp = path.node.openingElement.attributes.some( + (attribute) => { + if (t.isJSXAttribute(attribute)) { + return t.isJSXIdentifier(attribute.name, { name: 'prefetch' }) + } + + if (t.isJSXSpreadAttribute(attribute)) { + if (t.isObjectExpression(attribute.argument)) { + return objectExpressionMayHaveProperty( + attribute.argument, + 'prefetch', + ) + } + + if (t.isIdentifier(attribute.argument)) { + const init = getSingleUseObjectExpressionBinding( + path, + attribute.argument, + ) + return init + ? objectExpressionMayHaveProperty(init, 'prefetch') + : true + } + + return true + } + + return false + }, + ) + const childReferenceNodes = getMeaningfulChildren(path.node.children) + + state.extractedChildNodes.push(...childReferenceNodes) + boundaryInspection.captured.forEach((name) => { + state.capturedNames.add(name) + }) + + if (!lazyIdent) { + lazyIdent = + programPath.scope.generateUidIdentifier('lazyRouteComponent') + programPath.unshiftContainer('body', [ + t.importDeclaration( + [ + t.importSpecifier( + lazyIdent, + t.identifier('lazyRouteComponent'), + ), + ], + t.stringLiteral(`@tanstack/${options.framework}-router`), + ), + ]) + } + + const importIdParams = new URLSearchParams() + importIdParams.set(tssHydrate, id) + const componentIdent = + programPath.scope.generateUidIdentifier(exportName) + const declarations = [ + t.variableDeclarator( + componentIdent, + t.callExpression(lazyIdent, [ + t.arrowFunctionExpression( + [], + t.callExpression(t.import(), [ + t.stringLiteral(`${sourceId}?${importIdParams.toString()}`), + ]), + ), + t.stringLiteral(exportName), + ]), + ), + ] + + let preloadIdent: t.Identifier | undefined + if (needsPreloadProp) { + preloadIdent = programPath.scope.generateUidIdentifier( + `${exportName}_preload`, + ) + declarations.push( + t.variableDeclarator( + preloadIdent, + t.memberExpression(componentIdent, t.identifier('preload')), + ), + ) + } + + programPath.unshiftContainer('body', [ + t.variableDeclaration('const', declarations), + ]) + if (preloadIdent) { + path.node.openingElement.attributes.push( + t.jsxAttribute( + t.jsxIdentifier('p'), + t.jsxExpressionContainer(preloadIdent), + ), + ) + } + + path.node.children = [ + t.jsxText('\n'), + t.jsxExpressionContainer( + t.jsxElement( + t.jsxOpeningElement( + t.jsxIdentifier(componentIdent.name), + boundaryInspection.captured.map((name) => + t.jsxAttribute( + t.jsxIdentifier(name), + t.jsxExpressionContainer(t.identifier(name)), + ), + ), + true, + ), + null, + [], + true, + ), + ), + t.jsxText('\n'), + ] + path.skip() + }, + }) + + if (state.extractedChildNodes.length > 0) { + stripBindingsOnlyReferencedByNodes( + programPath.scope, + state.extractedChildNodes, + new Set(), + state.capturedNames, + ) + } + + programPath.skip() + }, + }) + + if (!state.modified) return null + + return true +} + +function loadHydrateVirtualModule(options: { + id: string + root: string + code: string + framework: CompileStartFrameworkOptions +}) { + const { sourceId, splitId, boundaryIndex } = parseHydrateVirtualId(options.id) + if (!splitId || boundaryIndex < 0) return null + const getBoundaryId = createBoundaryId(options.root, sourceId) + + const ast = parseAst({ code: options.code, sourceFilename: sourceId }) + const hydrateImport = getHydrateImport(ast, options.framework) + if (!hydrateImport) return null + const { hydrateLocalName: localName } = hydrateImport + + let target: t.JSXElement | undefined + let targetIndex = -1 + let targetCaptured: Array = [] + let index = 0 + + babel.traverse(ast, { + JSXElement(path) { + if (getJSXElementName(path.node) !== localName) return + const split = getBooleanProp(path.node.openingElement, 'split') + if (split === false) return + + if (index === boundaryIndex) { + const id = getBoundaryId(index) + if (id !== splitId) { + path.stop() + return + } + targetCaptured = inspectSplitBoundary({ + code: options.code, + path, + collectCaptured: true, + }).captured + target = t.cloneNode(path.node, true) + targetIndex = index + path.stop() + return + } + index++ + }, + }) + + if (!target || targetIndex < 0) return null + + const children = target.children + const exportName = `H${targetIndex}` + const refIdents = findReferencedIdentifiers(ast) + + removeModuleLevelBindings(ast, new Set(['Route'])) + const localBindings = new Set() + for (const node of ast.program.body) { + collectLocalBindingsFromStatement(node, localBindings) + } + + const keepBindings = new Set() + const meaningfulChildren = getMeaningfulChildren(children) + let returnExpression: t.Expression | t.JSXElement | t.JSXFragment = + t.nullLiteral() + + if (meaningfulChildren.length === 1) { + const child = meaningfulChildren[0]! + if (t.isJSXExpressionContainer(child)) { + returnExpression = t.isJSXEmptyExpression(child.expression) + ? t.nullLiteral() + : child.expression + } else if (t.isJSXElement(child) || t.isJSXFragment(child)) { + returnExpression = child + } else if (t.isJSXText(child)) { + returnExpression = t.stringLiteral(child.value) + } + } else if (meaningfulChildren.length > 1) { + returnExpression = t.jsxFragment( + t.jsxOpeningFragment(), + t.jsxClosingFragment(), + children, + ) + } + for (const name of collectIdentifiersFromNode(returnExpression)) { + if (localBindings.has(name)) { + keepBindings.add(name) + } + } + + if (keepBindings.size > 0) { + expandTransitively( + keepBindings, + buildDependencyGraph(buildDeclarationMap(ast), localBindings), + ) + } + + retainModuleLevelDeclarations(ast, keepBindings) + unwrapExportedDeclarations(ast) + + ast.program.body.push( + t.exportNamedDeclaration( + t.functionDeclaration( + t.identifier(exportName), + targetCaptured.length > 0 + ? [ + t.objectPattern( + targetCaptured.map((name) => + t.objectProperty( + t.identifier(name), + t.identifier(name), + false, + true, + ), + ), + ), + ] + : [], + t.blockStatement([t.returnStatement(returnExpression)]), + ), + ), + ) + + deadCodeElimination(ast, refIdents) + stripUnreferencedTopLevelExpressionStatements(ast) + + const result = generateFromAst(ast, { + sourceMaps: true, + sourceFileName: options.id, + filename: options.id, + }) + return result +} + +export function createHydrateCompilerPlugin(): StartCompilerPlugin { + type SourceEntry = { + code: string + framework: CompileStartFrameworkOptions + virtualModules: Map + } + + const sourcesByEnvironment = new Map>() + + const getEnvironmentSources = (envName: string) => { + let sources = sourcesByEnvironment.get(envName) + if (!sources) { + sources = new Map() + sourcesByEnvironment.set(envName, sources) + } + return sources + } + + const setSource = ( + envName: string, + id: string, + code: string, + framework: CompileStartFrameworkOptions, + ) => { + const sourceId = cleanId(id) + const sources = getEnvironmentSources(envName) + const existing = sources.get(sourceId) + if (existing?.code === code && existing.framework === framework) { + return existing + } + + const entry = { + code, + framework, + virtualModules: new Map(), + } + sources.set(sourceId, entry) + return entry + } + + const getSourceEntry = (envName: string, id: string) => + sourcesByEnvironment.get(envName)?.get(cleanId(id)) + + const deleteSource = (envName: string, id: string) => { + sourcesByEnvironment.get(envName)?.delete(cleanId(id)) + } + + return { + name: 'tanstack-start-core:hydrate', + detect: HYDRATE_DETECTION_PATTERN, + virtualModuleIdPattern: new RegExp(`[?&]${tssHydrate}=`), + transformAst(context) { + const virtualModule = parseHydrateVirtualId(context.id) + const indexOffset = + virtualModule.boundaryIndex < 0 + ? undefined + : virtualModule.boundaryIndex + 1 + const result = transformHydrateAst({ + ast: context.ast, + code: context.code, + id: context.id, + root: context.root, + env: context.env, + framework: context.framework, + indexOffset, + }) + + if (result && virtualModule.boundaryIndex < 0) { + setSource(context.envName, context.id, context.code, context.framework) + } + + return !!result + }, + loadVirtualModule(context) { + const virtualModule = parseHydrateVirtualId(context.id) + if (!virtualModule.splitId || virtualModule.boundaryIndex < 0) { + return null + } + + const existingSourceEntry = getSourceEntry( + context.envName, + virtualModule.sourceId, + ) + const sourceEntry = + context.code === undefined + ? existingSourceEntry + : setSource( + context.envName, + virtualModule.sourceId, + context.code, + existingSourceEntry?.framework ?? + (context.code.includes('@tanstack/solid-start') + ? 'solid' + : 'react'), + ) + + if (!sourceEntry) { + throw new MissingHydrateSourceError(context.id) + } + + if (sourceEntry.virtualModules.has(context.id)) { + return sourceEntry.virtualModules.get(context.id)! + } + + const result = loadHydrateVirtualModule({ + code: sourceEntry.code, + id: context.id, + root: context.root, + framework: sourceEntry.framework, + }) + sourceEntry.virtualModules.set(context.id, result) + return result + }, + invalidateModule(context) { + deleteSource(context.envName, context.id) + }, + } +} diff --git a/packages/start-plugin-core/src/hydration-constants.ts b/packages/start-plugin-core/src/hydration-constants.ts new file mode 100644 index 0000000000..b79c20ffd3 --- /dev/null +++ b/packages/start-plugin-core/src/hydration-constants.ts @@ -0,0 +1 @@ +export const tssHydrate = 'tss-hydrate' 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 b349b68040..60244fdca9 100644 --- a/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts +++ b/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts @@ -1,4 +1,5 @@ import { tsrSplit } from '@tanstack/router-plugin' +import { tssHydrate } from '../hydration-constants' import { getCssAssetSource } from '../start-manifest-plugin/inlineCss' import { RSBUILD_ENVIRONMENT_NAMES } from './planning' import type { RsbuildPluginAPI, Rspack } from '@rsbuild/core' @@ -57,6 +58,39 @@ function getRouteFilePathsFromModules( return routeFilePaths ?? [] } +function getHydrationIdsFromModules( + modules: Array, +): Array { + let hydrationIds: Array | undefined + let seen: Set | undefined + + for (const mod of modules) { + const identifier = mod.identifier() + const lastBangIndex = identifier.lastIndexOf('!') + const resourcePart = + lastBangIndex >= 0 ? identifier.slice(lastBangIndex + 1) : identifier + + const queryIndex = resourcePart.indexOf('?') + if (queryIndex < 0) continue + + const query = resourcePart.slice(queryIndex + 1) + if (!query.includes(tssHydrate)) continue + + const hydrationId = new URLSearchParams(query).get(tssHydrate) + if (!hydrationId || seen?.has(hydrationId)) continue + + if (!hydrationIds || !seen) { + hydrationIds = [] + seen = new Set() + } + + hydrationIds.push(hydrationId) + seen.add(hydrationId) + } + + return hydrationIds ?? [] +} + /** * Returns true for Rspack/webpack HMR runtime chunks that should never be * surfaced to the Start manifest. These files are emitted on every rebuild @@ -186,6 +220,7 @@ export function normalizeRspackClientBuild( for (const chunk of compilation.chunks) { const modules = compilation.chunkGraph.getChunkModules(chunk) const routeFilePaths = getRouteFilePathsFromModules(modules) + const hydrationIds = getHydrationIdsFromModules(modules) const cssFiles: Array = [] const seenCssFiles = new Set() @@ -242,6 +277,7 @@ export function normalizeRspackClientBuild( dynamicImports, css: [], routeFilePaths, + hydrationIds, } chunksByFileName.set(file, normalizedChunk) diff --git a/packages/start-plugin-core/src/rsbuild/start-compiler-host.ts b/packages/start-plugin-core/src/rsbuild/start-compiler-host.ts index 066d5b2867..d0ef77e34b 100644 --- a/packages/start-plugin-core/src/rsbuild/start-compiler-host.ts +++ b/packages/start-plugin-core/src/rsbuild/start-compiler-host.ts @@ -5,15 +5,19 @@ import { detectKindsInCode } from '../start-compiler/compiler' import { getTransformCodeFilterForEnv } from '../start-compiler/config' import { createStartCompiler, + loadCompilerVirtualModule, matchesCodeFilters, mergeServerFnsById, } from '../start-compiler/host' import { cleanId } from '../start-compiler/utils' +import { createHydrateCompilerPlugin } from '../hydrate-when-transform' import { RSBUILD_ENVIRONMENT_NAMES } from './planning' import type { RsbuildPluginAPI, Rspack } from '@rsbuild/core' import type { CompileStartFrameworkOptions, StartCompilerImportTransform, + StartCompilerPlugin, + StartCompilerTransformResult, } from '../types' import type { DevServerFnModuleSpecifierEncoder, @@ -27,7 +31,7 @@ type RsbuildTransformContext = Parameters< type RsbuildInputFileSystem = NonNullable /** - * Rsbuild dev server fn ref strategy: uses file:// URLs for absolute paths. + * Rsbuild dev server fn ref when: uses file:// URLs for absolute paths. * These are directly importable by Node's ESM VM runner without any bundler * path conventions (unlike Vite's /@id/ prefix). */ @@ -40,6 +44,7 @@ export interface StartCompilerHostOptions { providerEnvName: string generateFunctionId?: GenerateFunctionIdFnOptional compilerTransforms?: Array | undefined + compilerPlugins?: Array | undefined serverFnProviderModuleDirectives?: ReadonlyArray | undefined serverFnsById?: Record onServerFnsByIdChange?: () => void @@ -69,6 +74,10 @@ export function registerStartCompilerTransforms( mergeServerFnsById(serverFnsById, d) opts.onServerFnsByIdChange?.() } + const compilerPlugins = [ + createHydrateCompilerPlugin(), + ...(opts.compilerPlugins ?? []), + ] const isDev = api.context.action === 'dev' const mode = isDev ? 'dev' : 'build' @@ -83,9 +92,12 @@ export function registerStartCompilerTransforms( // Pre-compute code filter patterns per environment type const codeFilters: Record<'client' | 'server', Array> = { - client: getTransformCodeFilterForEnv('client'), + client: getTransformCodeFilterForEnv('client', { + compilerPlugins, + }), server: getTransformCodeFilterForEnv('server', { compilerTransforms: opts.compilerTransforms, + compilerPlugins, }), } @@ -109,17 +121,36 @@ export function registerStartCompilerTransforms( async (ctx: RsbuildTransformContext) => { return transformContextStorage.run(ctx, async () => { const code = ctx.code + let nextCode = code + let previousResult: { + code: string + map: StartCompilerTransformResult['map'] + } | null = null const id = ctx.resourcePath + (ctx.resourceQuery || '') + const root = getRoot() + + const virtualResult = loadCompilerVirtualModule(compilerPlugins, { + code, + id, + root, + env: env.type, + envName: env.name, + }) + if (virtualResult) { + nextCode = virtualResult.code + previousResult = { + code: virtualResult.code, + map: virtualResult.map ?? null, + } + } // Quick string-level check: does this file contain any patterns for this env? - if (!matchesCodeFilters(code, envCodeFilters)) { - return code + if (!matchesCodeFilters(nextCode, envCodeFilters)) { + return previousResult ?? nextCode } let compiler = compilers.get(env.name) if (!compiler) { - const root = getRoot() - compiler = createStartCompiler({ env: env.type, envName: env.name, @@ -129,6 +160,7 @@ export function registerStartCompilerTransforms( providerEnvName: opts.providerEnvName, generateFunctionId: opts.generateFunctionId, compilerTransforms, + compilerPlugins, serverFnProviderModuleDirectives, onServerFnsById, getKnownServerFns: () => serverFnsById, @@ -197,19 +229,23 @@ export function registerStartCompilerTransforms( compilers.set(env.name, compiler) } - const detectedKinds = detectKindsInCode(code, env.type, { + const detectedKinds = detectKindsInCode(nextCode, env.type, { compilerTransforms, }) - const result = await compiler.compile({ id, code, detectedKinds }) + const result = await compiler.compile({ + id, + code: nextCode, + detectedKinds, + }) - if (!result) { - return code + if (result) { + return { + code: result.code, + map: result.map ?? null, + } } - return { - code: result.code, - map: result.map ?? null, - } + return previousResult ?? nextCode }) }, ) diff --git a/packages/start-plugin-core/src/start-compiler/compiler.ts b/packages/start-plugin-core/src/start-compiler/compiler.ts index e742a75d41..458c467e4d 100644 --- a/packages/start-plugin-core/src/start-compiler/compiler.ts +++ b/packages/start-plugin-core/src/start-compiler/compiler.ts @@ -1,8 +1,8 @@ -/* eslint-disable import/no-commonjs */ import crypto from 'node:crypto' import * as t from '@babel/types' import { deadCodeElimination, + extractModuleInfoFromAst, findReferencedIdentifiers, generateFromAst, parseAst, @@ -21,28 +21,26 @@ import type { RewriteCandidate, ServerFn, } from './types' +import type { ModuleInfoBinding } from '@tanstack/router-utils' import type { CompileStartFrameworkOptions, StartCompilerEnvironment, StartCompilerImportTransform, + StartCompilerPlugin, + StartCompilerTransformResult, } from '../types' -type Binding = - | { - type: 'import' - source: string - importedName: string - resolvedKind?: Kind - } - | { - type: 'var' - init: t.Expression | null - resolvedKind?: Kind - } +type Binding = ModuleInfoBinding & { + resolvedKind?: Kind +} type ImportBinding = Extract type Kind = 'None' | `Root` | `Builder` | LookupKind +type ParsedAst = ReturnType +type StartCompilerAstPlugin = StartCompilerPlugin & { + transformAst: NonNullable +} export type BuiltInLookupKind = | 'ServerFn' @@ -86,11 +84,28 @@ export function isCompilerTransformEnabledForEnv( transform: StartCompilerImportTransform, env: StartCompilerEnvironment, ): boolean { - if (!transform.environment) return true - if (Array.isArray(transform.environment)) { - return transform.environment.includes(env) + return isStartCompilerEnvironmentEnabled(transform.environment, env) +} + +export function isStartCompilerPluginEnabledForEnv( + plugin: StartCompilerPlugin, + env: StartCompilerEnvironment, +): boolean { + return isStartCompilerEnvironmentEnabled(plugin.environment, env) +} + +function isStartCompilerEnvironmentEnabled( + environment: + | StartCompilerEnvironment + | Array + | undefined, + env: StartCompilerEnvironment, +): boolean { + if (!environment) return true + if (Array.isArray(environment)) { + return environment.includes(env) } - return transform.environment === env + return environment === env } const BuiltInLookupSetup: Record< @@ -219,13 +234,16 @@ export function detectKindsInCode( const validForEnv = getLookupKindsForEnv(env, opts) for (const kind of AllBuiltInLookupKinds) { - if (validForEnv.has(kind) && KindDetectionPatterns[kind].test(code)) { + const pattern = KindDetectionPatterns[kind] + pattern.lastIndex = 0 + if (validForEnv.has(kind) && pattern.test(code)) { detected.add(kind) } } for (const transform of opts?.compilerTransforms ?? []) { if (!isCompilerTransformEnabledForEnv(transform, env)) continue + transform.detect.lastIndex = 0 if (transform.detect.test(code)) { detected.add(getExternalLookupKind(transform)) } @@ -464,6 +482,7 @@ export class StartCompiler { StartCompilerImportTransform >() private externalLookupSetup = new Map() + private compilerPlugins: Array private externalDirectCallKindsBySource = new Map< string, Map @@ -517,6 +536,7 @@ export class StartCompiler { */ onServerFnsById?: (d: Record) => void compilerTransforms?: Array | undefined + compilerPlugins?: Array | undefined serverFnProviderModuleDirectives?: ReadonlyArray | undefined /** * Returns the currently known server functions from previous builds. @@ -527,6 +547,10 @@ export class StartCompiler { }, ) { this.validLookupKinds = options.lookupKinds + this.compilerPlugins = (options.compilerPlugins ?? []).filter((plugin) => + isStartCompilerPluginEnabledForEnv(plugin, options.env), + ) + for (const transform of options.compilerTransforms ?? []) { const kind = getExternalLookupKind(transform) if (!this.validLookupKinds.has(kind)) continue @@ -775,100 +799,13 @@ export class StartCompiler { ast: ReturnType, id: string, ): ModuleInfo { - const bindings = new Map() - const exports = new Map() - const reExportAllSources: Array = [] - - // we are only interested in top-level bindings, hence we don't traverse the AST - // instead we only iterate over the program body - for (const node of ast.program.body) { - if (t.isImportDeclaration(node)) { - const source = node.source.value - for (const s of node.specifiers) { - if (t.isImportSpecifier(s)) { - const importedName = t.isIdentifier(s.imported) - ? s.imported.name - : s.imported.value - bindings.set(s.local.name, { type: 'import', source, importedName }) - } else if (t.isImportDefaultSpecifier(s)) { - bindings.set(s.local.name, { - type: 'import', - source, - importedName: 'default', - }) - } else if (t.isImportNamespaceSpecifier(s)) { - bindings.set(s.local.name, { - type: 'import', - source, - importedName: '*', - }) - } - } - } else if (t.isVariableDeclaration(node)) { - for (const decl of node.declarations) { - if (t.isIdentifier(decl.id)) { - bindings.set(decl.id.name, { - type: 'var', - init: decl.init ?? null, - }) - } - } - } else if (t.isExportNamedDeclaration(node)) { - // export const foo = ... - if (node.declaration) { - if (t.isVariableDeclaration(node.declaration)) { - for (const d of node.declaration.declarations) { - if (t.isIdentifier(d.id)) { - exports.set(d.id.name, d.id.name) - bindings.set(d.id.name, { type: 'var', init: d.init ?? null }) - } - } - } - } - for (const sp of node.specifiers) { - if (t.isExportNamespaceSpecifier(sp)) { - exports.set(sp.exported.name, sp.exported.name) - } - // export { local as exported } - else if (t.isExportSpecifier(sp)) { - const local = sp.local.name - const exported = t.isIdentifier(sp.exported) - ? sp.exported.name - : sp.exported.value - exports.set(exported, local) - - // When re-exporting from another module (export { foo } from './module'), - // create an import binding so the server function can be resolved - if (node.source) { - bindings.set(local, { - type: 'import', - source: node.source.value, - importedName: local, - }) - } - } - } - } else if (t.isExportDefaultDeclaration(node)) { - const d = node.declaration - if (t.isIdentifier(d)) { - exports.set('default', d.name) - } else { - const synth = '__default_export__' - bindings.set(synth, { type: 'var', init: d as t.Expression }) - exports.set('default', synth) - } - } else if (t.isExportAllDeclaration(node)) { - // Handle `export * from './module'` syntax - // Track the source so we can look up exports from it when needed - reExportAllSources.push(node.source.value) - } - } + const extracted = extractModuleInfoFromAst(ast) const info: ModuleInfo = { id, - bindings, - exports, - reExportAllSources, + bindings: new Map(extracted.bindings), + exports: extracted.exports, + reExportAllSources: extracted.reExportAllSources, } this.moduleCache.set(id, info) return info @@ -889,13 +826,30 @@ export class StartCompiler { } public invalidateModule(id: string) { - const normalizedId = cleanId(id) - let hasCachedModule = false + return this.invalidateModules([id]).size > 0 + } + + public invalidateModules(ids: Iterable): Set { + const normalizedIds = new Set() + + for (const id of ids) { + normalizedIds.add(cleanId(id)) + + for (const plugin of this.compilerPlugins) { + plugin.invalidateModule?.({ id, envName: this.options.envName }) + } + } + + const deletedModuleIds = new Set() + if (normalizedIds.size === 0) { + return deletedModuleIds + } for (const moduleId of Array.from(this.moduleCache.keys())) { - if (cleanId(moduleId) === normalizedId) { + const normalizedModuleId = cleanId(moduleId) + if (normalizedIds.has(normalizedModuleId)) { this.moduleCache.delete(moduleId) - hasCachedModule = true + deletedModuleIds.add(normalizedModuleId) } } @@ -915,14 +869,20 @@ export class StartCompiler { this.resolveIdCache.clear() this.exportResolutionCache.clear() - return hasCachedModule + return deletedModuleIds } - public async getTransitiveImporters(id: string): Promise> { + public async getTransitiveImporters( + ids: string | Iterable, + ): Promise> { const discoveredImporters = new Set() - const pendingTargets = [cleanId(id)] + const pendingTargets = + typeof ids === 'string' + ? [cleanId(ids)] + : Array.from(ids, (id) => cleanId(id)) const visitedTargets = new Set() const resolveCache = new Map>() + const importersByTarget = new Map>() const resolveSource = (source: string, importer: string) => { const cacheKey = `${importer}::${source}` @@ -936,6 +896,40 @@ export class StartCompiler { return resolved } + await Promise.all( + Array.from(this.moduleCache.values()).map(async (moduleInfo) => { + if (this.knownRootImports.has(moduleInfo.id)) { + return + } + + const moduleId = cleanId(moduleInfo.id) + const importSources = new Set(moduleInfo.reExportAllSources) + + for (const binding of moduleInfo.bindings.values()) { + if (binding.type === 'import') { + importSources.add(binding.source) + } + } + + await Promise.all( + Array.from(importSources, async (source) => { + const resolved = await resolveSource(source, moduleInfo.id) + if (!resolved) return + + const targetId = cleanId(resolved) + if (targetId === moduleId) return + + let importers = importersByTarget.get(targetId) + if (!importers) { + importers = new Set() + importersByTarget.set(targetId, importers) + } + importers.add(moduleId) + }), + ) + }), + ) + while (pendingTargets.length > 0) { const targetId = pendingTargets.pop()! @@ -945,40 +939,8 @@ export class StartCompiler { visitedTargets.add(targetId) - const importerIds = await Promise.all( - Array.from(this.moduleCache.values()).map(async (moduleInfo) => { - if (this.knownRootImports.has(moduleInfo.id)) { - return null - } - - const moduleId = cleanId(moduleInfo.id) - - if (moduleId === targetId) { - return null - } - - const importSources = new Set(moduleInfo.reExportAllSources) - - for (const binding of moduleInfo.bindings.values()) { - if (binding.type === 'import') { - importSources.add(binding.source) - } - } - - for (const source of importSources) { - const resolved = await resolveSource(source, moduleInfo.id) - - if (resolved && cleanId(resolved) === targetId) { - return moduleId - } - } - - return null - }), - ) - - for (const importerId of importerIds) { - if (!importerId || discoveredImporters.has(importerId)) { + for (const importerId of importersByTarget.get(targetId) ?? []) { + if (discoveredImporters.has(importerId)) { continue } @@ -1011,408 +973,435 @@ export class StartCompiler { ? new Set([...detectedKinds].filter((k) => this.validLookupKinds.has(k))) : this.validLookupKinds - // Early exit if no kinds to process - if (fileKinds.size === 0) { - return null - } - - const hasExternalKinds = hasExternalLookupKinds(fileKinds) - const checkDirectCalls = - hasBuiltInDirectCallKinds(fileKinds) || - (fileKinds.has('ServerFn') && - !hasExternalKinds && - hasBuiltInDirectCallKinds(this.validLookupKinds)) - // Optimization: ServerFn is always a top-level declaration (must be assigned to a variable). - // If the file only has ServerFn, we can skip full AST traversal and only visit - // the specific top-level declarations that have candidates. - const canUseFastPath = areAllKindsTopLevelOnly(fileKinds) - + const astTransformPlugins = this.getAstTransformPluginsForCode(code) // Always parse and extract module info upfront. // This ensures the module is cached for import resolution even if no candidates are found. - const { ast } = this.ingestModule({ code, id, parserFilename }) + const ast = this.ingestModule({ code, id, parserFilename }).ast + let astHasChanges = false - // Single-pass traversal to: - // 1. Collect candidate paths (only candidates, not all CallExpressions) - // 2. Build a map for looking up paths of nested calls in method chains - const candidatePaths: Array = [] - // Map for nested chain lookup - only populated for CallExpressions that are - // part of a method chain (callee.object is a CallExpression) - const chainCallPaths = new Map< - t.CallExpression, - babel.NodePath - >() + builtInTransforms: { + // Early exit if no built-in or import transforms need this file. + if (fileKinds.size === 0) { + break builtInTransforms + } - // JSX candidates (e.g., ) - const jsxCandidatePaths: Array> = [] - const checkJSX = needsJSXDetection(fileKinds, this.externalLookupSetup) - // Get module info that was just cached by ingestModule - const moduleInfo = this.moduleCache.get(id)! - const externalDirectCallCandidates = this.getExternalDirectCallCandidates( - fileKinds, - moduleInfo, - ) - const checkExternalDirectCalls = hasExternalDirectCallCandidates( - externalDirectCallCandidates, - ) + const hasExternalKinds = hasExternalLookupKinds(fileKinds) + const checkDirectCalls = + hasBuiltInDirectCallKinds(fileKinds) || + (fileKinds.has('ServerFn') && + !hasExternalKinds && + hasBuiltInDirectCallKinds(this.validLookupKinds)) + // Optimization: ServerFn is always a top-level declaration (must be assigned to a variable). + // If the file only has ServerFn, we can skip full AST traversal and only visit + // the specific top-level declarations that have candidates. + const canUseFastPath = areAllKindsTopLevelOnly(fileKinds) - if (canUseFastPath) { - // Fast path: only visit top-level statements that have potential candidates + // Single-pass traversal to: + // 1. Collect candidate paths (only candidates, not all CallExpressions) + // 2. Build a map for looking up paths of nested calls in method chains + const candidatePaths: Array = [] + // Map for nested chain lookup - only populated for CallExpressions that are + // part of a method chain (callee.object is a CallExpression) + const chainCallPaths = new Map< + t.CallExpression, + babel.NodePath + >() - // Collect indices of top-level statements that contain candidates - const candidateIndices: Array = [] - for (let i = 0; i < ast.program.body.length; i++) { - const node = ast.program.body[i]! - let declarations: Array | undefined + // JSX candidates (e.g., ) + const jsxCandidatePaths: Array> = [] + const checkJSX = needsJSXDetection(fileKinds, this.externalLookupSetup) + // Get module info that was just cached by ingestModule + const moduleInfo = this.moduleCache.get(id)! + const externalDirectCallCandidates = this.getExternalDirectCallCandidates( + fileKinds, + moduleInfo, + ) + const checkExternalDirectCalls = hasExternalDirectCallCandidates( + externalDirectCallCandidates, + ) - if (t.isVariableDeclaration(node)) { - declarations = node.declarations - } else if (t.isExportNamedDeclaration(node) && node.declaration) { - if (t.isVariableDeclaration(node.declaration)) { - declarations = node.declaration.declarations + if (canUseFastPath) { + // Fast path: only visit top-level statements that have potential candidates + + // Collect indices of top-level statements that contain candidates + const candidateIndices: Array = [] + for (let i = 0; i < ast.program.body.length; i++) { + const node = ast.program.body[i]! + let declarations: Array | undefined + + if (t.isVariableDeclaration(node)) { + declarations = node.declarations + } else if (t.isExportNamedDeclaration(node) && node.declaration) { + if (t.isVariableDeclaration(node.declaration)) { + declarations = node.declaration.declarations + } } - } - if (declarations) { - for (const decl of declarations) { - if (decl.init && t.isCallExpression(decl.init)) { - if ( - isMethodChainCandidate(decl.init, fileKinds) || - (checkDirectCalls && - isTopLevelDirectCallCandidateNode(decl.init)) - ) { - candidateIndices.push(i) - break // Only need to mark this statement once + if (declarations) { + for (const decl of declarations) { + if (decl.init && t.isCallExpression(decl.init)) { + if ( + isMethodChainCandidate(decl.init, fileKinds) || + (checkDirectCalls && + isTopLevelDirectCallCandidateNode(decl.init)) + ) { + candidateIndices.push(i) + break // Only need to mark this statement once + } } } } } - } - // Early exit: no potential candidates found at top level - if (candidateIndices.length === 0) { - return null - } + // Early exit: no potential candidates found at top level + if (candidateIndices.length === 0) { + break builtInTransforms + } - // Targeted traversal: only visit the specific statements that have candidates - // This is much faster than traversing the entire AST - babel.traverse(ast, { - Program(programPath) { - const bodyPaths = programPath.get('body') - for (const idx of candidateIndices) { - const stmtPath = bodyPaths[idx] - if (!stmtPath) continue + // Targeted traversal: only visit the specific statements that have candidates + // This is much faster than traversing the entire AST + babel.traverse(ast, { + Program(programPath) { + const bodyPaths = programPath.get('body') + for (const idx of candidateIndices) { + const stmtPath = bodyPaths[idx] + if (!stmtPath) continue - // Traverse only this statement's subtree - stmtPath.traverse({ - CallExpression(path) { - const node = path.node - const parent = path.parent + // Traverse only this statement's subtree + stmtPath.traverse({ + CallExpression(path) { + const node = path.node + const parent = path.parent - // Check if this call is part of a larger chain (inner call) - if ( - t.isMemberExpression(parent) && - t.isCallExpression(path.parentPath.parent) - ) { - chainCallPaths.set(node, path) - return - } - - // Method chain pattern - if (isMethodChainCandidate(node, fileKinds)) { - candidatePaths.push({ path }) - return - } - - if (checkExternalDirectCalls) { - const kind = getExternalDirectCallCandidateKind( - path, - externalDirectCallCandidates, - ) - if (kind) { - candidatePaths.push({ path, kind }) + // Check if this call is part of a larger chain (inner call) + if ( + t.isMemberExpression(parent) && + t.isCallExpression(path.parentPath.parent) + ) { + chainCallPaths.set(node, path) return } - } - if (isTopLevelDirectCallCandidate(path)) { - candidatePaths.push({ path }) - } - }, - }) - } - // Stop traversal after processing Program - programPath.stop() - }, - }) - } else { - // Normal path: full traversal for non-fast-path kinds - babel.traverse(ast, { - CallExpression: (path) => { - const node = path.node - const parent = path.parent + // Method chain pattern + if (isMethodChainCandidate(node, fileKinds)) { + candidatePaths.push({ path }) + return + } - // Check if this call is part of a larger chain (inner call) - // If so, store it for method chain lookup but don't treat as candidate - if ( - t.isMemberExpression(parent) && - t.isCallExpression(path.parentPath.parent) - ) { - // This is an inner call in a chain - store for later lookup - chainCallPaths.set(node, path) - return - } + if (checkExternalDirectCalls) { + const kind = getExternalDirectCallCandidateKind( + path, + externalDirectCallCandidates, + ) + if (kind) { + candidatePaths.push({ path, kind }) + return + } + } - // Pattern 1: Method chain pattern (.handler(), .server(), .client(), etc.) - if (isMethodChainCandidate(node, fileKinds)) { - candidatePaths.push({ path }) - return - } + if (isTopLevelDirectCallCandidate(path)) { + candidatePaths.push({ path }) + } + }, + }) + } + // Stop traversal after processing Program + programPath.stop() + }, + }) + } else { + // Normal path: full traversal for non-fast-path kinds + babel.traverse(ast, { + CallExpression: (path) => { + const node = path.node + const parent = path.parent - // External direct-call transforms are import-bound. Direct imports - // already identify the transform kind, so skip async import tracing. - if (checkExternalDirectCalls) { - const kind = getExternalDirectCallCandidateKind( - path, - externalDirectCallCandidates, - ) - if (kind) { - candidatePaths.push({ path, kind }) + // Check if this call is part of a larger chain (inner call) + // If so, store it for method chain lookup but don't treat as candidate + if ( + t.isMemberExpression(parent) && + t.isCallExpression(path.parentPath.parent) + ) { + // This is an inner call in a chain - store for later lookup + chainCallPaths.set(node, path) return } - } - if (checkDirectCalls && isTopLevelDirectCallCandidate(path)) { - candidatePaths.push({ path }) - return - } - - // Pattern 2: Direct call pattern - if (checkDirectCalls) { - if ( - isNestedDirectCallCandidate( - node, - fileKinds, - this.externalLookupSetup, - ) - ) { + // Pattern 1: Method chain pattern (.handler(), .server(), .client(), etc.) + if (isMethodChainCandidate(node, fileKinds)) { candidatePaths.push({ path }) return } - } - }, - // Pattern 3: JSX element pattern (e.g., ) - // Collect JSX elements where the component is imported from a known package - // and resolves to a JSX kind (e.g., ClientOnly from @tanstack/react-router) - JSXElement: (path) => { - if (!checkJSX) return - const openingElement = path.node.openingElement - const nameNode = openingElement.name + // External direct-call transforms are import-bound. Direct imports + // already identify the transform kind, so skip async import tracing. + if (checkExternalDirectCalls) { + const kind = getExternalDirectCallCandidateKind( + path, + externalDirectCallCandidates, + ) + if (kind) { + candidatePaths.push({ path, kind }) + return + } + } - // Only handle simple identifier names (not namespaced or member expressions) - if (!t.isJSXIdentifier(nameNode)) return + if (checkDirectCalls && isTopLevelDirectCallCandidate(path)) { + candidatePaths.push({ path }) + return + } - const componentName = nameNode.name - const binding = moduleInfo.bindings.get(componentName) + // Pattern 2: Direct call pattern + if (checkDirectCalls) { + if ( + isNestedDirectCallCandidate( + node, + fileKinds, + this.externalLookupSetup, + ) + ) { + candidatePaths.push({ path }) + return + } + } + }, + // Pattern 3: JSX element pattern (e.g., ) + // Collect JSX elements where the component is imported from a known package + // and resolves to a JSX kind (e.g., ClientOnly from @tanstack/react-router) + JSXElement: (path) => { + if (!checkJSX) return - // Must be an import binding from a known package - if (!binding || binding.type !== 'import') return + const openingElement = path.node.openingElement + const nameNode = openingElement.name - // Verify the import source is a known TanStack router package - const knownExports = this.knownRootImports.get(binding.source) - if (!knownExports) return + // Only handle simple identifier names (not namespaced or member expressions) + if (!t.isJSXIdentifier(nameNode)) return - // Verify the imported name resolves to a JSX kind (e.g., ClientOnlyJSX) - const kind = knownExports.get(binding.importedName) - if (kind !== 'ClientOnlyJSX') return + const componentName = nameNode.name + const binding = moduleInfo.bindings.get(componentName) - jsxCandidatePaths.push(path) - }, - }) - } + // Must be an import binding from a known package + if (!binding || binding.type !== 'import') return - if (candidatePaths.length === 0 && jsxCandidatePaths.length === 0) { - return null - } + // Verify the import source is a known TanStack router package + const knownExports = this.knownRootImports.get(binding.source) + if (!knownExports) return - // Resolve only candidates whose import scan did not already prove the kind. - const resolvedCandidates: Array<{ - path: babel.NodePath - kind: Kind - }> = [] - const unresolvedCandidates: Array = [] + // Verify the imported name resolves to a JSX kind (e.g., ClientOnlyJSX) + const kind = knownExports.get(binding.importedName) + if (kind !== 'ClientOnlyJSX') return - for (const candidate of candidatePaths) { - if (candidate.kind) { - resolvedCandidates.push({ - path: candidate.path, - kind: candidate.kind, + jsxCandidatePaths.push(path) + }, }) - } else { - unresolvedCandidates.push(candidate) } - } - if (unresolvedCandidates.length > 0) { - resolvedCandidates.push( - ...(await Promise.all( - unresolvedCandidates.map(async (candidate) => ({ + if (candidatePaths.length === 0 && jsxCandidatePaths.length === 0) { + break builtInTransforms + } + + // Resolve only candidates whose import scan did not already prove the kind. + const resolvedCandidates: Array<{ + path: babel.NodePath + kind: Kind + }> = [] + const unresolvedCandidates: Array = [] + + for (const candidate of candidatePaths) { + if (candidate.kind) { + resolvedCandidates.push({ path: candidate.path, - kind: await this.resolveExprKind(candidate.path.node, id), - })), - )), - ) - } - - // Filter to valid candidates - const validCandidates = resolvedCandidates.filter(({ path, kind }) => { - if ( - !this.validLookupKinds.has(kind as Exclude) - ) { - return false + kind: candidate.kind, + }) + } else { + unresolvedCandidates.push(candidate) + } } - if ( - isLookupKind(kind) && - kind !== 'ClientOnlyJSX' && - !isMethodChainCandidate(path.node, fileKinds) - ) { - return isDirectCallCandidateForKind(kind, this.externalLookupSetup) + if (unresolvedCandidates.length > 0) { + resolvedCandidates.push( + ...(await Promise.all( + unresolvedCandidates.map(async (candidate) => ({ + path: candidate.path, + kind: await this.resolveExprKind(candidate.path.node, id), + })), + )), + ) } - return true - }) as Array<{ - path: babel.NodePath - kind: Exclude - }> - - if (validCandidates.length === 0 && jsxCandidatePaths.length === 0) { - return null - } - - // Process valid candidates to collect method chains - const pathsToRewrite: Array<{ - path: babel.NodePath - kind: Exclude - methodChain: MethodChainPaths - }> = [] - - for (const { path, kind } of validCandidates) { - const node = path.node - - // Collect method chain paths by walking DOWN from root through the chain - const methodChain: MethodChainPaths = { - middleware: null, - inputValidator: null, - handler: null, - server: null, - client: null, - } - - // Walk down the call chain using nodes, look up paths from map - let currentNode: t.CallExpression = node - let currentPath: babel.NodePath = path - - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - while (true) { - const callee = currentNode.callee - if (!t.isMemberExpression(callee)) { - break + // Filter to valid candidates + const validCandidates = resolvedCandidates.filter(({ path, kind }) => { + if ( + !this.validLookupKinds.has( + kind as Exclude, + ) + ) { + return false } - // Record method chain path if it's a known method - if (t.isIdentifier(callee.property)) { - const name = callee.property.name as keyof MethodChainPaths - if (name in methodChain) { - // Get first argument path - const args = currentPath.get('arguments') - const firstArgPath = - Array.isArray(args) && args.length > 0 ? (args[0] ?? null) : null - methodChain[name] = { - callPath: currentPath, - firstArgPath, + if ( + isLookupKind(kind) && + kind !== 'ClientOnlyJSX' && + !isMethodChainCandidate(path.node, fileKinds) + ) { + return isDirectCallCandidateForKind(kind, this.externalLookupSetup) + } + + return true + }) as Array<{ + path: babel.NodePath + kind: Exclude + }> + + if (validCandidates.length === 0 && jsxCandidatePaths.length === 0) { + break builtInTransforms + } + + // Process valid candidates to collect method chains + const pathsToRewrite: Array<{ + path: babel.NodePath + kind: Exclude + methodChain: MethodChainPaths + }> = [] + + for (const { path, kind } of validCandidates) { + const node = path.node + + // Collect method chain paths by walking DOWN from root through the chain + const methodChain: MethodChainPaths = { + middleware: null, + inputValidator: null, + handler: null, + server: null, + client: null, + } + + // Walk down the call chain using nodes, look up paths from map + let currentNode: t.CallExpression = node + let currentPath: babel.NodePath = path + + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + while (true) { + const callee = currentNode.callee + if (!t.isMemberExpression(callee)) { + break + } + + // Record method chain path if it's a known method + if (t.isIdentifier(callee.property)) { + const name = callee.property.name as keyof MethodChainPaths + if (name in methodChain) { + // Get first argument path + const args = currentPath.get('arguments') + const firstArgPath = + Array.isArray(args) && args.length > 0 + ? (args[0] ?? null) + : null + methodChain[name] = { + callPath: currentPath, + firstArgPath, + } } } + + // Move to the inner call (the object of the member expression) + if (!t.isCallExpression(callee.object)) { + break + } + currentNode = callee.object + // Look up path from chain map, or use candidate path if not found + const nextPath = chainCallPaths.get(currentNode) + if (!nextPath) { + break + } + currentPath = nextPath } - // Move to the inner call (the object of the member expression) - if (!t.isCallExpression(callee.object)) { - break - } - currentNode = callee.object - // Look up path from chain map, or use candidate path if not found - const nextPath = chainCallPaths.get(currentNode) - if (!nextPath) { - break - } - currentPath = nextPath + pathsToRewrite.push({ path, kind, methodChain }) } - pathsToRewrite.push({ path, kind, methodChain }) - } + const refIdents = findReferencedIdentifiers(ast) - const refIdents = findReferencedIdentifiers(ast) + const context: CompilationContext = { + ast, + id, + code, + env: this.options.env, + envName: this.options.envName, + mode: this.mode, + root: this.options.root, + framework: this.options.framework, + providerEnvName: this.options.providerEnvName, + types: t, + parseExpression: (expressionCode) => + babel.template.expression(expressionCode, { + placeholderPattern: false, + })() as t.Expression, - const context: CompilationContext = { - ast, - id, - code, - env: this.options.env, - envName: this.options.envName, - mode: this.mode, - root: this.options.root, - framework: this.options.framework, - providerEnvName: this.options.providerEnvName, - types: t, - parseExpression: (expressionCode) => - babel.template.expression(expressionCode, { - placeholderPattern: false, - })() as t.Expression, - - generateFunctionId: (opts) => this.generateFunctionId(opts), - getKnownServerFns: this.options.getKnownServerFns, - serverFnProviderModuleDirectives: - this.options.serverFnProviderModuleDirectives, - onServerFnsById: this.options.onServerFnsById, - } - - // Group candidates by kind for batch processing - const candidatesByKind = new Map< - Exclude, - Array - >() - - for (const { path: candidatePath, kind, methodChain } of pathsToRewrite) { - const candidate: RewriteCandidate = { path: candidatePath, methodChain } - const existing = candidatesByKind.get(kind) - if (existing) { - existing.push(candidate) - } else { - candidatesByKind.set(kind, [candidate]) + generateFunctionId: (opts) => this.generateFunctionId(opts), + getKnownServerFns: this.options.getKnownServerFns, + serverFnProviderModuleDirectives: + this.options.serverFnProviderModuleDirectives, + onServerFnsById: this.options.onServerFnsById, } + + // Group candidates by kind for batch processing + const candidatesByKind = new Map< + Exclude, + Array + >() + + for (const { path: candidatePath, kind, methodChain } of pathsToRewrite) { + const candidate: RewriteCandidate = { path: candidatePath, methodChain } + const existing = candidatesByKind.get(kind) + if (existing) { + existing.push(candidate) + } else { + candidatesByKind.set(kind, [candidate]) + } + } + + // External transforms run before built-ins by default so they can augment + // user handlers before server function extraction clones provider bodies. + this.runExternalTransforms('pre', candidatesByKind, context) + + for (const kind of BuiltInKindHandlerOrder) { + const candidates = candidatesByKind.get(kind) + if (!candidates) continue + const handler = BuiltInKindHandlers[kind] + handler(candidates, context, kind) + } + + this.runExternalTransforms('post', candidatesByKind, context) + + // Handle JSX candidates (e.g., ) + // Validation was already done during traversal - just call the handler + for (const jsxPath of jsxCandidatePaths) { + handleClientOnlyJSX(jsxPath, { env: 'server' }) + } + + deadCodeElimination(ast, refIdents) + astHasChanges = true } - // External transforms run before built-ins by default so they can augment - // user handlers before server function extraction clones provider bodies. - this.runExternalTransforms('pre', candidatesByKind, context) - - for (const kind of BuiltInKindHandlerOrder) { - const candidates = candidatesByKind.get(kind) - if (!candidates) continue - const handler = BuiltInKindHandlers[kind] - handler(candidates, context, kind) + if (astTransformPlugins.length > 0) { + astHasChanges = + this.runAstTransforms({ + ast, + code, + id, + transforms: astTransformPlugins, + }) || astHasChanges } - this.runExternalTransforms('post', candidatesByKind, context) - - // Handle JSX candidates (e.g., ) - // Validation was already done during traversal - just call the handler - for (const jsxPath of jsxCandidatePaths) { - handleClientOnlyJSX(jsxPath, { env: 'server' }) - } - - deadCodeElimination(ast, refIdents) + return astHasChanges ? this.generateResultFromAst(ast, code, id) : null + } + private generateResultFromAst( + ast: ParsedAst, + sourceCode: string, + id: string, + ): StartCompilerTransformResult { const result = generateFromAst(ast, { sourceMaps: true, sourceFileName: id, @@ -1420,17 +1409,66 @@ export class StartCompiler { }) // @babel/generator does not populate sourcesContent because it only has - // the AST, not the original text. Without this, Vite's composed - // sourcemap omits the original source, causing downstream consumers - // (e.g. import-protection snippet display) to fall back to the shorter - // compiled output and fail to resolve original line numbers. + // the AST, not the original text. Without this, Vite's composed sourcemap + // omits the original source, causing downstream consumers to fall back to + // the compiled output and fail to resolve original line numbers. if (result.map) { - result.map.sourcesContent = [code] + result.map.sourcesContent = [sourceCode] } return result } + private getAstTransformPluginsForCode( + code: string, + ): Array { + return this.compilerPlugins.filter( + (plugin): plugin is StartCompilerAstPlugin => { + if (!plugin.transformAst) return false + if (!plugin.detect) return true + plugin.detect.lastIndex = 0 + return plugin.detect.test(code) + }, + ) + } + + private runAstTransforms({ + ast, + code, + id, + transforms, + }: { + ast: ParsedAst + code: string + id: string + transforms: Array + }): boolean { + let modified = false + + for (const plugin of transforms) { + const context = { + ast, + code, + id, + env: this.options.env, + envName: this.options.envName, + mode: this.mode, + root: this.options.root, + framework: this.options.framework, + providerEnvName: this.options.providerEnvName, + types: t, + parseExpression: (expressionCode: string) => + babel.template.expression(expressionCode, { + placeholderPattern: false, + })() as t.Expression, + } + + modified = plugin.transformAst(context) || modified + } + + return modified + } + private runExternalTransforms( order: 'pre' | 'post', candidatesByKind: Map< @@ -1608,8 +1646,8 @@ export class StartCompiler { return 'None' } - for (const [source, exports] of this.knownRootImports) { - const kind = exports.get(binding.importedName) + for (const [source, rootExports] of this.knownRootImports) { + const kind = rootExports.get(binding.importedName) if (!kind) { continue } diff --git a/packages/start-plugin-core/src/start-compiler/config.ts b/packages/start-plugin-core/src/start-compiler/config.ts index e9d7d95e5e..387343bad9 100644 --- a/packages/start-plugin-core/src/start-compiler/config.ts +++ b/packages/start-plugin-core/src/start-compiler/config.ts @@ -3,17 +3,20 @@ import { getExternalLookupKind, getLookupKindsForEnv, isCompilerTransformEnabledForEnv, + isStartCompilerPluginEnabledForEnv, } from './compiler' import type { BuiltInLookupKind, LookupConfig } from './compiler' import type { CompileStartFrameworkOptions, StartCompilerImportTransform, + StartCompilerPlugin, } from '../types' export function getTransformCodeFilterForEnv( env: 'client' | 'server', opts?: { compilerTransforms?: Array | undefined + compilerPlugins?: Array | undefined }, ): Array { const validKinds = getLookupKindsForEnv(env, opts) @@ -33,6 +36,12 @@ export function getTransformCodeFilterForEnv( } } + for (const plugin of opts?.compilerPlugins ?? []) { + if (plugin.detect && isStartCompilerPluginEnabledForEnv(plugin, env)) { + patterns.push(plugin.detect) + } + } + return patterns } diff --git a/packages/start-plugin-core/src/start-compiler/host.ts b/packages/start-plugin-core/src/start-compiler/host.ts index e1da89d7f2..c225347dea 100644 --- a/packages/start-plugin-core/src/start-compiler/host.ts +++ b/packages/start-plugin-core/src/start-compiler/host.ts @@ -3,6 +3,9 @@ import { getLookupConfigurationsForEnv } from './config' import type { CompileStartFrameworkOptions, StartCompilerImportTransform, + StartCompilerPlugin, + StartCompilerTransformResult, + StartCompilerVirtualModuleContext, } from '../types' import type { DevServerFnModuleSpecifierEncoder, @@ -19,6 +22,7 @@ export interface CreateStartCompilerOptions { mode: 'dev' | 'build' generateFunctionId?: GenerateFunctionIdFnOptional compilerTransforms?: Array | undefined + compilerPlugins?: Array | undefined serverFnProviderModuleDirectives?: ReadonlyArray | undefined onServerFnsById?: (d: Record) => void getKnownServerFns: () => Record @@ -48,6 +52,7 @@ export function createStartCompiler( generateFunctionId: options.generateFunctionId, onServerFnsById: options.onServerFnsById, compilerTransforms: options.compilerTransforms, + compilerPlugins: options.compilerPlugins, serverFnProviderModuleDirectives: options.serverFnProviderModuleDirectives, getKnownServerFns: options.getKnownServerFns, devServerFnModuleSpecifierEncoder: options.encodeModuleSpecifierInDev, @@ -81,6 +86,7 @@ export function matchesCodeFilters( filters: ReadonlyArray, ): boolean { for (const pattern of filters) { + pattern.lastIndex = 0 if (pattern.test(code)) { return true } @@ -88,3 +94,43 @@ export function matchesCodeFilters( return false } + +export function createCompilerVirtualModuleIdPattern( + compilerPlugins: ReadonlyArray, +) { + const patterns = compilerPlugins + .map((plugin) => plugin.virtualModuleIdPattern) + .filter((pattern): pattern is RegExp => !!pattern) + + if (patterns.length === 0) { + return undefined + } + + return new RegExp( + patterns.map((pattern) => `(?:${pattern.source})`).join('|'), + ) +} + +export function loadCompilerVirtualModule( + compilerPlugins: ReadonlyArray, + context: StartCompilerVirtualModuleContext, +): StartCompilerTransformResult | null { + for (const compilerPlugin of compilerPlugins) { + const pattern = compilerPlugin.virtualModuleIdPattern + if (!pattern) { + continue + } + + pattern.lastIndex = 0 + if (!pattern.test(context.id)) { + continue + } + + const result = compilerPlugin.loadVirtualModule?.(context) + if (result) { + return result + } + } + + return null +} 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 a3c991c4c7..6f27f37d4d 100644 --- a/packages/start-plugin-core/src/start-manifest-plugin/manifestBuilder.ts +++ b/packages/start-plugin-core/src/start-manifest-plugin/manifestBuilder.ts @@ -484,10 +484,35 @@ export function buildRouteManifestRoutes(options: { getChunkCssAssets, getChunkPreloads: options.assetResolvers.getChunkPreloads, }) + + if (routeId !== rootRouteId) { + mergeReachableHydrationChunkData({ + route: targetRoute, + chunk, + chunksByFileName: options.chunksByFileName, + getChunkCssAssets, + }) + } } } const rootRoute = (routes[rootRouteId] = routes[rootRouteId] || {}) + const rootRouteTreeRoute = options.routeTreeRoutes[rootRouteId] + const rootRouteChunks = rootRouteTreeRoute?.filePath + ? options.routeChunksByFilePath.get(rootRouteTreeRoute.filePath) + : undefined + + if (rootRouteChunks) { + for (const chunk of rootRouteChunks) { + mergeReachableHydrationChunkData({ + route: rootRoute, + chunk, + chunksByFileName: options.chunksByFileName, + getChunkCssAssets, + }) + } + } + mergeRouteChunkData({ route: rootRoute, chunk: options.entryChunk, @@ -517,6 +542,54 @@ export function buildRouteManifestRoutes(options: { return routes } +function mergeReachableHydrationChunkData(options: { + route: RouteTreeRoute + chunk: NormalizedClientChunk + chunksByFileName: ReadonlyMap + getChunkCssAssets: (chunk: NormalizedClientChunk) => Array +}) { + const visitedStaticChunks = new Set() + const mergedHydrationChunks = new Set() + + const mergeHydrationChunk = (chunk: NormalizedClientChunk) => { + if (mergedHydrationChunks.has(chunk.fileName)) return + mergedHydrationChunks.add(chunk.fileName) + + options.route.assets = appendUniqueAssets( + options.route.assets, + options.getChunkCssAssets(chunk), + ) + + for (const dynamicImport of chunk.dynamicImports) { + const dynamicChunk = options.chunksByFileName.get(dynamicImport) + if (dynamicChunk?.hydrationIds.length) { + mergeHydrationChunk(dynamicChunk) + } + } + } + + const visitStaticChunk = (chunk: NormalizedClientChunk) => { + if (visitedStaticChunks.has(chunk.fileName)) return + visitedStaticChunks.add(chunk.fileName) + + for (const importedFileName of chunk.imports) { + const importedChunk = options.chunksByFileName.get(importedFileName) + if (importedChunk) { + visitStaticChunk(importedChunk) + } + } + + for (const dynamicImport of chunk.dynamicImports) { + const dynamicChunk = options.chunksByFileName.get(dynamicImport) + if (dynamicChunk?.hydrationIds.length) { + mergeHydrationChunk(dynamicChunk) + } + } + } + + visitStaticChunk(options.chunk) +} + export { getRouteFilePathsFromModuleIds, normalizeViteClientBuild, diff --git a/packages/start-plugin-core/src/types.ts b/packages/start-plugin-core/src/types.ts index bc76726875..f0acdbfe35 100644 --- a/packages/start-plugin-core/src/types.ts +++ b/packages/start-plugin-core/src/types.ts @@ -1,5 +1,6 @@ import type * as babel from '@babel/core' import type * as t from '@babel/types' +import type { GeneratorResult } from '@tanstack/router-utils' import type { TanStackStartOutputConfig } from './schema' export type CompileStartFrameworkOptions = 'react' | 'solid' | 'vue' @@ -62,6 +63,36 @@ export interface StartCompilerImportTransform { ) => void } +export interface StartCompilerTransformResult { + code: string + map?: GeneratorResult['map'] | null +} + +export interface StartCompilerVirtualModuleContext { + readonly id: string + readonly root: string + readonly env: StartCompilerEnvironment + readonly envName: string + readonly code?: string +} + +export interface StartCompilerPlugin { + name: string + environment?: + | StartCompilerEnvironment + | Array + | undefined + detect?: RegExp | undefined + virtualModuleIdPattern?: RegExp | undefined + transformAst?: ( + context: StartCompilerTransformContext, + ) => boolean | null | undefined + loadVirtualModule?: ( + context: StartCompilerVirtualModuleContext, + ) => StartCompilerTransformResult | null + invalidateModule?: (context: { id: string; envName: string }) => void +} + export interface NormalizedBasePaths { publicBase: string assetBase: { @@ -82,6 +113,7 @@ export interface NormalizedClientChunk { dynamicImports: Array css: Array routeFilePaths: Array + hydrationIds: Array } export interface NormalizedClientBuild { diff --git a/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts b/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts index 698ab5ae1a..7a2ddd9ff6 100644 --- a/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts +++ b/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts @@ -8,12 +8,18 @@ import { import { detectKindsInCode } from '../../start-compiler/compiler' import { getTransformCodeFilterForEnv } from '../../start-compiler/config' import { + createCompilerVirtualModuleIdPattern, createStartCompiler, + loadCompilerVirtualModule, mergeServerFnsById, } from '../../start-compiler/host' import { generateServerFnResolverModule } from '../../start-compiler/server-fn-resolver-module' import { cleanId } from '../../start-compiler/utils' import { createVirtualModule } from '../createVirtualModule' +import { + MissingHydrateSourceError, + createHydrateCompilerPlugin, +} from '../../hydrate-when-transform' import { resolveViteId } from '../../utils' import { createViteDevServerFnModuleSpecifierEncoder, @@ -23,12 +29,13 @@ import { mergeHotUpdateModules } from './hot-update' import type { CompileStartFrameworkOptions, StartCompilerImportTransform, + StartCompilerPlugin, } from '../../types' import type { GenerateFunctionIdFnOptional, ServerFn, } from '../../start-compiler/types' -import type { EnvironmentModuleNode, PluginOption } from 'vite' +import type { Environment, EnvironmentModuleNode, PluginOption } from 'vite' // Re-export from shared constants for backwards compatibility export { SERVER_FN_LOOKUP } @@ -46,6 +53,32 @@ type ModuleInvalidationEnvironment = { } } +type ViteModuleLoadOptions = { + devId?: string + load: (options: { id: string }) => Promise<{ code?: string | null } | null> + error: (message: string) => never +} + +async function loadViteModuleFromEnvironment( + environment: Environment, + id: string, + opts: ViteModuleLoadOptions, +): Promise { + if (environment.mode === 'build') { + const loaded = await opts.load({ id }) + return loaded?.code ?? '' + } + + if (environment.mode === 'dev') { + await environment.transformRequest(opts.devId ?? id) + return undefined + } + + opts.error( + `could not load module ${id}: unknown environment mode ${environment.mode}`, + ) +} + function invalidateMatchingFileModules( environment: ModuleInvalidationEnvironment, ids: Iterable, @@ -104,6 +137,25 @@ function invalidateServerFnLookupModules( ) } +function invalidateCompilerVirtualModules( + environment: ModuleInvalidationEnvironment, + ids: Iterable, + pattern: RegExp | undefined, +) { + if (!pattern) { + return [] + } + + return invalidateMatchingFileModules(environment, ids, (fileModule) => { + if (!fileModule.id) { + return false + } + + pattern.lastIndex = 0 + return pattern.test(fileModule.id) + }) +} + function getServerFnProviderIds(ids: Iterable) { const providerIds = new Set() @@ -170,6 +222,7 @@ export interface StartCompilerPluginOptions { */ generateFunctionId?: GenerateFunctionIdFnOptional compilerTransforms?: Array | undefined + compilerPlugins?: Array | undefined serverFnProviderModuleDirectives?: ReadonlyArray | undefined /** * The Vite environment name for the server function provider. @@ -181,6 +234,15 @@ export function startCompilerPlugin( opts: StartCompilerPluginOptions, ): PluginOption { const compilers = new Map>() + const compilerPlugins = [ + createHydrateCompilerPlugin(), + ...(opts.compilerPlugins ?? []), + ] + const compilerVirtualModuleIdPattern = + createCompilerVirtualModuleIdPattern(compilerPlugins) + const environmentByName = new Map( + opts.environments.map((environment) => [environment.name, environment]), + ) // Shared registry of server functions across all environments const serverFnsById: Record = {} @@ -218,6 +280,7 @@ export function startCompilerPlugin( // Derive transform code filter from KindDetectionPatterns (single source of truth) const transformCodeFilter = getTransformCodeFilterForEnv(environment.type, { compilerTransforms, + compilerPlugins, }) return { name: `tanstack-start-core::server-fn:${environment.name}`, @@ -262,6 +325,7 @@ export function startCompilerPlugin( providerEnvName: opts.providerEnvName, generateFunctionId: opts.generateFunctionId, compilerTransforms, + compilerPlugins, serverFnProviderModuleDirectives, onServerFnsById, getKnownServerFns: () => serverFnsById, @@ -270,23 +334,18 @@ export function startCompilerPlugin( ? createViteDevServerFnModuleSpecifierEncoder(root) : undefined, loadModule: async (id: string) => { - if (mode === 'build') { - const loaded = await this.load({ id }) - const code = loaded.code ?? '' - - compiler!.ingestModule({ code, id }) - return - } - - if (this.environment.mode !== 'dev') { - this.error( - `could not load module ${id}: unknown environment mode ${this.environment.mode}`, - ) - } - - await this.environment.transformRequest( - `${id}?${SERVER_FN_LOOKUP}`, + const code = await loadViteModuleFromEnvironment( + this.environment, + id, + { + load: (options) => this.load(options), + error: (message) => this.error(message), + devId: `${id}?${SERVER_FN_LOOKUP}`, + }, ) + if (code !== undefined) { + compiler!.ingestModule({ code, id }) + } }, resolveId: async (source: string, importer?: string) => { @@ -315,6 +374,7 @@ export function startCompilerPlugin( code, detectedKinds, }) + return result }, }, @@ -324,17 +384,22 @@ export function startCompilerPlugin( const idsToInvalidate = new Set() const transitiveCompilerImportersToInvalidate = new Set() const importerModulesToInvalidate = new Set() + const changedIds: Array = [] ctx.modules.forEach((m) => { if (m.id) { idsToInvalidate.add(m.id) - const deleted = compiler?.invalidateModule(m.id) + changedIds.push(m.id) + } + }) - if (deleted) { + const deletedIds = compiler?.invalidateModules(changedIds) ?? new Set() + + ctx.modules.forEach((m) => { + if (m.id) { + if (deletedIds.has(cleanId(m.id))) { transitiveCompilerImportersToInvalidate.add(cleanId(m.id)) - } - if (deleted) { m.importers.forEach((importer) => { if (importer.id) { idsToInvalidate.add(importer.id) @@ -349,54 +414,54 @@ export function startCompilerPlugin( }) const finishHotUpdate = async () => { - if (environment.type === 'server' && compiler) { - const pendingImporters = [ - ...transitiveCompilerImportersToInvalidate, - ] - const seenImporters = new Set(pendingImporters) + if ( + environment.type === 'server' && + compiler && + transitiveCompilerImportersToInvalidate.size > 0 + ) { + const seenImporters = new Set( + transitiveCompilerImportersToInvalidate, + ) + const nestedImporters = + await compiler.getTransitiveImporters(seenImporters) - while (pendingImporters.length > 0) { - const importerId = pendingImporters.pop()! - const nestedImporters = - await compiler.getTransitiveImporters(importerId) - - for (const nestedImporterId of nestedImporters) { - if (seenImporters.has(nestedImporterId)) { - continue - } - - seenImporters.add(nestedImporterId) - pendingImporters.push(nestedImporterId) - } + for (const nestedImporterId of nestedImporters) { + seenImporters.add(nestedImporterId) } for (const importerId of seenImporters) { idsToInvalidate.add(importerId) - compiler.invalidateModule(importerId) } + compiler.invalidateModules(seenImporters) } invalidateModuleNodes(this.environment, importerModulesToInvalidate) invalidateServerFnLookupModules(this.environment, idsToInvalidate) + const compilerVirtualModules = invalidateCompilerVirtualModules( + this.environment, + idsToInvalidate, + compilerVirtualModuleIdPattern, + ) if (environment.type !== 'server') { - return + return mergeHotUpdateModules(ctx.modules, compilerVirtualModules) } invalidateModuleNodes(this.environment, ctx.modules) const providerIdsToInvalidate = getServerFnProviderIds(idsToInvalidate) - for (const providerId of providerIdsToInvalidate) { - compiler?.invalidateModule(providerId) - } + compiler?.invalidateModules(providerIdsToInvalidate) const providerModules = invalidateServerFnProviderModules( this.environment, [...idsToInvalidate, ...providerIdsToInvalidate], ) - return mergeHotUpdateModules(ctx.modules, providerModules) + return mergeHotUpdateModules(ctx.modules, [ + ...compilerVirtualModules, + ...providerModules, + ]) } return finishHotUpdate() @@ -423,6 +488,45 @@ export function startCompilerPlugin( }, }, }, + { + name: 'tanstack-start-core:compiler-virtual-module', + enforce: 'pre', + load: { + filter: { + id: compilerVirtualModuleIdPattern ?? /$^/, + }, + async handler(id) { + const environment = environmentByName.get(this.environment.name) + if (!environment || !compilerVirtualModuleIdPattern) { + return null + } + + const loadVirtualModule = () => + loadCompilerVirtualModule(compilerPlugins, { + id, + root, + env: environment.type, + envName: this.environment.name, + }) + + try { + return loadVirtualModule() + } catch (error) { + if (!(error instanceof MissingHydrateSourceError)) { + throw error + } + } + + const sourceId = cleanId(id) + await loadViteModuleFromEnvironment(this.environment, sourceId, { + load: (options) => this.load(options), + error: (message) => this.error(message), + }) + + return loadVirtualModule() + }, + }, + }, // Validate server function ID in dev mode { name: 'tanstack-start-core:validate-server-fn-id', @@ -451,7 +555,7 @@ export function startCompilerPlugin( typeof decoded.file === 'string' && typeof decoded.export === 'string' ) { - // Use the Vite strategy to decode the module specifier + // Use the Vite when to decode the module specifier // back to the original source file path. const sourceFile = decodeViteDevServerModuleSpecifier( decoded.file, diff --git a/packages/start-plugin-core/src/vite/start-manifest-plugin/normalized-client-build.ts b/packages/start-plugin-core/src/vite/start-manifest-plugin/normalized-client-build.ts index 8ac7915ff0..c14609bc6a 100644 --- a/packages/start-plugin-core/src/vite/start-manifest-plugin/normalized-client-build.ts +++ b/packages/start-plugin-core/src/vite/start-manifest-plugin/normalized-client-build.ts @@ -1,4 +1,5 @@ import { tsrSplit } from '@tanstack/router-plugin' +import { tssHydrate } from '../../hydration-constants' import { getCssAssetSource } from '../../start-manifest-plugin/inlineCss' import type { Rollup } from 'vite' import type { NormalizedClientBuild, NormalizedClientChunk } from '../../types' @@ -13,6 +14,7 @@ export function normalizeViteClientChunk( dynamicImports: chunk.dynamicImports, css: Array.from(chunk.viteMetadata?.importedCss ?? []), routeFilePaths: getRouteFilePathsFromModuleIds(chunk.moduleIds), + hydrationIds: getHydrationIdsFromModuleIds(chunk.moduleIds), } } @@ -147,3 +149,38 @@ export function getRouteFilePathsFromModuleIds(moduleIds: Array) { return routeFilePaths ?? [] } + +export function getHydrationIdsFromModuleIds(moduleIds: Array) { + let hydrationIds: Array | undefined + let seen: Set | undefined + + for (const moduleId of moduleIds) { + const queryIndex = moduleId.indexOf('?') + + if (queryIndex < 0) { + continue + } + + const query = moduleId.slice(queryIndex + 1) + + if (!query.includes(tssHydrate)) { + continue + } + + const hydrationId = new URLSearchParams(query).get(tssHydrate) + + if (!hydrationId || seen?.has(hydrationId)) { + continue + } + + if (hydrationIds === undefined || seen === undefined) { + hydrationIds = [] + seen = new Set() + } + + hydrationIds.push(hydrationId) + seen.add(hydrationId) + } + + return hydrationIds ?? [] +} diff --git a/packages/start-plugin-core/tests/compiler.test.ts b/packages/start-plugin-core/tests/compiler.test.ts index e5c99fd257..94780d140b 100644 --- a/packages/start-plugin-core/tests/compiler.test.ts +++ b/packages/start-plugin-core/tests/compiler.test.ts @@ -185,6 +185,29 @@ describe('detectKindsInCode', () => { new Set(['ClientOnlyFn']), ) }) + + test('resets external transform regex state between detections', () => { + const compilerTransforms: Array = [ + { + name: 'global-detect', + environment: 'server', + imports: [{ libName: '@example/runtime', rootExport: 'renderThing' }], + detect: /\brenderThing\b/g, + transform: () => {}, + }, + ] + const code = ` + import { renderThing } from '@example/runtime' + renderThing() + ` + + expect(detectKindsInCode(code, 'server', { compilerTransforms })).toEqual( + new Set(['External:global-detect']), + ) + expect(detectKindsInCode(code, 'server', { compilerTransforms })).toEqual( + new Set(['External:global-detect']), + ) + }) }) describe('detects multiple kinds in same file', () => { @@ -611,6 +634,53 @@ test('ingestModule handles empty code gracefully', () => { }).not.toThrow() }) +test('compile caches modules without detected candidates for transitive importer traversal', async () => { + const compiler = new StartCompiler({ + env: 'client', + ...getDefaultTestOptions('client'), + lookupKinds: new Set(['ServerFn']), + lookupConfigurations: [], + getKnownServerFns: () => ({}), + loadModule: async () => {}, + resolveId: async (source, importer) => { + if (source === './leaf' && importer === '/src/plain.ts') { + return '/src/leaf.ts' + } + + if (source === './plain' && importer === '/src/parent.ts') { + return '/src/plain.ts' + } + + return null + }, + }) + + await compiler.compile({ + id: '/src/plain.ts', + code: ` + import { value } from './leaf' + export const plain = value + `, + detectedKinds: new Set(), + }) + + await compiler.compile({ + id: '/src/parent.ts', + code: ` + import { plain } from './plain' + export const parent = plain + `, + detectedKinds: new Set(), + }) + + expect(await compiler.getTransitiveImporters('/src/leaf.ts')).toEqual( + new Set(['/src/plain.ts', '/src/parent.ts']), + ) + expect(await compiler.getTransitiveImporters(['/src/leaf.ts'])).toEqual( + new Set(['/src/plain.ts', '/src/parent.ts']), + ) +}) + describe('calling result of createServerOnlyFn/createClientOnlyFn', () => { // This tests the fix for https://github.com/TanStack/router/issues/6643 // When a file has both createServerFn and createServerOnlyFn, and the result diff --git a/packages/start-plugin-core/tests/hydrate-when-transform.test.ts b/packages/start-plugin-core/tests/hydrate-when-transform.test.ts new file mode 100644 index 0000000000..13e1d909bd --- /dev/null +++ b/packages/start-plugin-core/tests/hydrate-when-transform.test.ts @@ -0,0 +1,618 @@ +import { mkdtempSync } from 'node:fs' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import * as t from '@babel/types' +import { generateFromAst, parseAst } from '@tanstack/router-utils' +import { describe, expect, test } from 'vitest' +import { createHydrateCompilerPlugin } from '../src/hydrate-when-transform' +import type { CompileStartFrameworkOptions } from '../src/types' + +const root = '/repo' +const id = '/repo/src/routes/about.tsx' + +type HydrateBoundary = { + id: string + exportName: string + index: number +} + +function getHydrateBoundariesFromCode(code: string): Array { + const boundaries: Array = [] + const hydrateImportPattern = + /import\("([^"]*[?&]tss-hydrate=[^"]*)"\),\s*"([^"]+)"/g + let match: RegExpExecArray | null + + while ((match = hydrateImportPattern.exec(code))) { + const importId = match[1]! + const queryIndex = importId.indexOf('?') + const params = new URLSearchParams(importId.slice(queryIndex + 1)) + const boundaryId = params.get('tss-hydrate') + const separatorIndex = boundaryId?.indexOf('_') ?? -1 + const index = + boundaryId && separatorIndex > 0 + ? Number.parseInt(boundaryId.slice(0, separatorIndex), 36) + : Number.NaN + + if (boundaryId && Number.isInteger(index)) { + boundaries.push({ + id: boundaryId, + exportName: match[2]!, + index, + }) + } + } + + return boundaries.sort((a, b) => a.index - b.index) +} + +function virtualHydrateId( + file: string, + boundary: Pick, +) { + const params = new URLSearchParams() + params.set('tss-hydrate', boundary.id) + return `${file}?${params.toString()}` +} + +function withSourceHash(id: string, sourceHash: string) { + const separatorIndex = id.indexOf('_') + return `${id.slice(0, separatorIndex + 1)}${sourceHash}` +} + +function compileHydrate(options: { + code: string + id: string + root: string + env: 'client' | 'server' + envName?: string + framework?: CompileStartFrameworkOptions + plugin?: ReturnType +}) { + const plugin = options.plugin ?? createHydrateCompilerPlugin() + const envName = options.envName ?? options.env + const ast = parseAst({ code: options.code, sourceFilename: options.id }) + const result = plugin.transformAst?.({ + ast, + code: options.code, + id: options.id, + root: options.root, + env: options.env, + envName, + mode: 'dev', + framework: options.framework ?? 'react', + providerEnvName: 'ssr', + types: t, + parseExpression: (expressionCode) => t.identifier(expressionCode), + }) + if (!result) return null + + const generated = generateFromAst(ast, { + sourceMaps: true, + sourceFileName: options.id, + filename: options.id, + }) + + return { + code: generated.code, + map: generated.map, + boundaries: getHydrateBoundariesFromCode(generated.code), + plugin, + } +} + +function loadVirtualHydrateModule(options: { + code: string + id: string + root: string + envName?: string +}) { + const plugin = createHydrateCompilerPlugin() + return plugin.loadVirtualModule?.({ + code: options.code, + id: options.id, + root: options.root, + env: 'client', + envName: options.envName ?? 'client', + }) +} + +describe('Hydrate compiler transform', () => { + test('splits Hydrate children behind a lazy import', () => { + const result = compileHydrate({ + code: ` + import { Hydrate } from '@tanstack/react-start' + import { visible } from '@tanstack/react-start/hydration' + + export function Page() { + return ( + + + + ) + } + + function Widget(props: { title: string }) { + return

{props.title}

+ } + `, + id, + root, + env: 'client', + }) + + expect(result?.code).toContain('lazyRouteComponent') + expect(result?.code).toContain('tss-hydrate=') + expect(result?.code).not.toContain('tss-hydrate-index') + expect(result?.code).not.toContain('createElement') + expect(result?.code).toContain('h=') + expect(result?.code).not.toContain('p=') + }) + + test('uses the Solid Router import source for Solid Hydrate boundaries', () => { + const result = compileHydrate({ + code: ` + import { Hydrate } from '@tanstack/solid-start' + import { visible } from '@tanstack/solid-start/hydration' + + export function Page() { + return ( + + + + ) + } + + function Widget(props: { title: string }) { + return

{props.title}

+ } + `, + id, + root, + env: 'client', + framework: 'solid', + }) + + expect(result?.code).toContain( + 'lazyRouteComponent } from "@tanstack/solid-router"', + ) + expect(result?.code).toContain('tss-hydrate=') + expect(result?.code).toContain('h=') + expect(result?.code).not.toContain('p=') + }) + + test('rejects function-as-children unless the boundary opts out of splitting', () => { + expect(() => + compileHydrate({ + code: ` + import { Hydrate } from '@tanstack/react-start' + import { idle } from '@tanstack/react-start/hydration' + + export function Page() { + return ( + + {() =>

child

} +
+ ) + } + `, + id, + root, + env: 'client', + }), + ).toThrow(/function-as-children/) + }) + + test('rejects hook calls that would be moved into an extracted component', () => { + expect(() => + compileHydrate({ + code: ` + import { Hydrate } from '@tanstack/react-start' + import { idle } from '@tanstack/react-start/hydration' + + function useThing() { + return 'thing' + } + + export function Page() { + return ( + +

{useThing()}

+
+ ) + } + `, + id, + root, + env: 'client', + }), + ).toThrow(/hooks/) + }) + + test('strips Hydrate fallback from the server transform', () => { + const result = compileHydrate({ + code: ` + import { Hydrate } from '@tanstack/react-start' + import { idle, visible } from '@tanstack/react-start/hydration' + + const spreadProps = { + when: visible(), + fallback:
bound
, + } + + export function Page() { + return ( + <> + fallback
} + > + + + inline} + > + + + spread, + }} + > + + + + + + + ) + } + + function Widget(props: { title: string }) { + return

{props.title}

+ } + `, + id, + root, + env: 'server', + }) + + expect(result?.code).not.toContain('fallback=') + expect(result?.code).not.toContain('fallback:') + expect(result?.code).not.toContain('server-fallback') + expect(result?.code).not.toContain('server-inline') + expect(result?.code).not.toContain('server-spread') + expect(result?.code).not.toContain('server-bound-spread') + expect(result?.code).toContain('h=') + expect(result?.code).toContain('') + expect(result?.code).toContain('') + expect(result?.code).toContain('') + expect(result?.code).toContain('') + }) + + test('supports nested Hydrate boundaries in extracted virtual modules', () => { + const dir = mkdtempSync(join(tmpdir(), 'hydrate-when-')) + const file = join(dir, 'route.tsx') + const code = ` + import { Hydrate } from '@tanstack/react-start' + import { interaction, visible } from '@tanstack/react-start/hydration' + + const unused = 'remove me' + + export function Page() { + return ( + +
+ + + +
+
+ ) + } + ` + const firstPass = compileHydrate({ + code, + id: file, + root: dir, + env: 'client', + }) + expect(firstPass?.boundaries).toHaveLength(1) + + const virtualId = virtualHydrateId(file, firstPass!.boundaries[0]!) + const virtualModule = loadVirtualHydrateModule({ + code, + id: virtualId, + root: dir, + }) + expect(virtualModule?.code).not.toContain('remove me') + + const boundaryIndex = firstPass!.boundaries[0]!.index + const nestedPass = compileHydrate({ + code: virtualModule!.code, + id: virtualId, + root: dir, + env: 'client', + }) + + expect(boundaryIndex).toBe(0) + expect(nestedPass?.code).toContain('H1') + expect(nestedPass?.code).toContain('tss-hydrate=') + }) + + test('keeps sibling boundary ids stable after nested boundaries', () => { + const dir = mkdtempSync(join(tmpdir(), 'hydrate-when-')) + const file = join(dir, 'route.tsx') + const code = ` + import { Hydrate } from '@tanstack/react-start' + import { idle, interaction, visible } from '@tanstack/react-start/hydration' + + export function Page() { + return ( + <> + +
+ + + +
+
+ +

Sibling

+
+ + ) + } + ` + const firstPass = compileHydrate({ + code, + id: file, + root: dir, + env: 'client', + }) + expect( + firstPass?.boundaries.map((boundary) => boundary.exportName), + ).toEqual(['H0', 'H2']) + + const siblingBoundary = firstPass!.boundaries[1]! + const virtualId = virtualHydrateId(file, siblingBoundary) + const boundaryIndex = siblingBoundary.index + const virtualModule = loadVirtualHydrateModule({ + code, + id: virtualId, + root: dir, + }) + const parentVirtualId = virtualHydrateId(file, firstPass!.boundaries[0]!) + const parentVirtualModule = loadVirtualHydrateModule({ + code, + id: parentVirtualId, + root: dir, + }) + const nestedPass = compileHydrate({ + code: parentVirtualModule!.code, + id: parentVirtualId, + root: dir, + env: 'client', + }) + const serverPass = compileHydrate({ + code, + id: file, + root: dir, + env: 'server', + }) + + expect(boundaryIndex).toBe(2) + expect(virtualModule?.code).toContain('Sibling') + expect(virtualModule?.code).not.toContain('Nested') + expect(nestedPass?.boundaries[0]?.exportName).toBe('H1') + expect(serverPass?.code).toContain(firstPass!.boundaries[0]!.id) + expect(serverPass?.code).toContain(nestedPass!.boundaries[0]!.id) + expect(serverPass?.code).toContain(siblingBoundary.id) + }) + + test('loads virtual modules from supplied bundler code instead of the filesystem', () => { + const dir = mkdtempSync(join(tmpdir(), 'hydrate-when-')) + const file = join(dir, 'route.tsx') + const oldCode = ` + import { Hydrate } from '@tanstack/react-start' + import { visible } from '@tanstack/react-start/hydration' + + export function Page() { + return

Old

+ } + ` + const nextCode = oldCode.replace('Old', 'New') + const firstPass = compileHydrate({ + code: oldCode, + id: file, + root: dir, + env: 'client', + }) + const virtualModule = loadVirtualHydrateModule({ + code: nextCode, + id: virtualHydrateId(file, firstPass!.boundaries[0]!), + root: dir, + }) + + expect(virtualModule?.code).toContain('New') + expect(virtualModule?.code).not.toContain('Old') + }) + + test('captures identifiers used by shorthand objects and computed members', () => { + const dir = mkdtempSync(join(tmpdir(), 'hydrate-when-')) + const file = join(dir, 'route.tsx') + const code = ` + import { Hydrate } from '@tanstack/react-start' + import { visible } from '@tanstack/react-start/hydration' + + export function Page() { + const key = 'name' + const items = { name: 'Ada' } + return ( + + + + ) + } + + function Widget(props: { data: { key: string; value: string } }) { + return

{props.data.value}

+ } + ` + const firstPass = compileHydrate({ + code, + id: file, + root: dir, + env: 'client', + }) + const virtualModule = loadVirtualHydrateModule({ + code, + id: virtualHydrateId(file, firstPass!.boundaries[0]!), + root: dir, + }) + + expect(virtualModule?.code).toContain('export function H0({') + expect(virtualModule?.code).toContain('items') + expect(virtualModule?.code).toContain('key') + expect(virtualModule?.code).toContain('items[key]') + }) + + test('unwraps exported declarations needed by extracted virtual modules', () => { + const dir = mkdtempSync(join(tmpdir(), 'hydrate-when-')) + const file = join(dir, 'route.tsx') + const code = ` + import { createFileRoute } from '@tanstack/react-router' + import { Hydrate } from '@tanstack/react-start' + import { visible } from '@tanstack/react-start/hydration' + + export const Route = createFileRoute('/test')({ + component: Page, + }) + + export const label = 'Ada' + + export const Widget = () => { + return

{label}

+ } + + function Page() { + return + } + ` + const firstPass = compileHydrate({ + code, + id: file, + root: dir, + env: 'client', + }) + const virtualModule = loadVirtualHydrateModule({ + code, + id: virtualHydrateId(file, firstPass!.boundaries[0]!), + root: dir, + }) + + expect(virtualModule?.code).toContain('const Widget') + expect(virtualModule?.code).toContain('const label') + expect(virtualModule?.code).toContain('') + expect(virtualModule?.code).not.toContain('export const Widget') + expect(virtualModule?.code).not.toContain('createFileRoute') + expect(virtualModule?.code).not.toContain('const Route') + }) + + test('invalidates cached Hydrate source for virtual module loads', () => { + const dir = mkdtempSync(join(tmpdir(), 'hydrate-when-')) + const file = join(dir, 'route.tsx') + const oldCode = ` + import { Hydrate } from '@tanstack/react-start' + import { visible } from '@tanstack/react-start/hydration' + + export function Page() { + return

Old

+ } + ` + const nextCode = oldCode.replace('Old', 'New') + const envName = 'client' + const plugin = createHydrateCompilerPlugin() + const transformed = compileHydrate({ + code: oldCode, + id: file, + root: dir, + env: 'client', + envName, + plugin, + }) + const virtualId = virtualHydrateId(file, transformed!.boundaries[0]!) + + expect( + transformed!.plugin.loadVirtualModule?.({ + id: virtualId, + root: dir, + env: 'client', + envName, + })?.code, + ).toContain('Old') + + transformed!.plugin.invalidateModule?.({ id: file, envName }) + expect(() => + transformed!.plugin.loadVirtualModule?.({ + id: virtualId, + root: dir, + env: 'client', + envName, + }), + ).toThrow(/Missing Hydrate source/) + + const updated = compileHydrate({ + code: nextCode, + id: file, + root: dir, + env: 'client', + envName, + plugin, + }) + + expect( + updated!.plugin.loadVirtualModule?.({ + id: virtualId, + root: dir, + env: 'client', + envName, + })?.code, + ).toContain('New') + }) + + test('rejects virtual module ids whose source hash does not match', () => { + const code = ` + import { Hydrate } from '@tanstack/react-start' + import { idle, visible } from '@tanstack/react-start/hydration' + + export function Page() { + return ( + <> +

First

+

Second

+ + ) + } + ` + const firstPass = compileHydrate({ + code, + id, + root, + env: 'client', + }) + const mismatchedId = virtualHydrateId(id, { + id: withSourceHash(firstPass!.boundaries[0]!.id, 'mismatch'), + index: firstPass!.boundaries[0]!.index, + }) + + expect( + new URLSearchParams(mismatchedId.split('?')[1]).get('tss-hydrate'), + ).toMatch(/_mismatch$/) + expect( + loadVirtualHydrateModule({ code, id: mismatchedId, root }), + ).toBeNull() + }) +}) diff --git a/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenFunctionChild.tsx b/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenFunctionChild.tsx new file mode 100644 index 0000000000..a2560a6197 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenFunctionChild.tsx @@ -0,0 +1,6 @@ +import { Hydrate } from '@tanstack/react-start' +import { idle } from '@tanstack/react-start/hydration' + +export function Page() { + return {() =>

child

}
+} diff --git a/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenHookCall.tsx b/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenHookCall.tsx new file mode 100644 index 0000000000..1e89bb7303 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenHookCall.tsx @@ -0,0 +1,14 @@ +import { Hydrate } from '@tanstack/react-start' +import { idle } from '@tanstack/react-start/hydration' + +function useThing() { + return 'thing' +} + +export function Page() { + return ( + +

{useThing()}

+
+ ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenSuperCapture.tsx b/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenSuperCapture.tsx new file mode 100644 index 0000000000..63b91b0239 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenSuperCapture.tsx @@ -0,0 +1,16 @@ +import { Hydrate } from '@tanstack/react-start' +import { idle } from '@tanstack/react-start/hydration' + +class Base { + title = 'super' +} + +export class Page extends Base { + render() { + return ( + +

{super.title}

+
+ ) + } +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenThisCapture.tsx b/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenThisCapture.tsx new file mode 100644 index 0000000000..5f7b3df606 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/error-files/hydrateWhenThisCapture.tsx @@ -0,0 +1,14 @@ +import { Hydrate } from '@tanstack/react-start' +import { idle } from '@tanstack/react-start/hydration' + +export class Page { + title = 'this' + + render() { + return ( + +

{this.title}

+
+ ) + } +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts b/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts new file mode 100644 index 0000000000..2d121539fe --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts @@ -0,0 +1,241 @@ +import { readFile, readdir } from 'node:fs/promises' +import path from 'node:path' +import * as t from '@babel/types' +import { generateFromAst, parseAst } from '@tanstack/router-utils' +import { describe, expect, test } from 'vitest' +import { createHydrateCompilerPlugin } from '../../src/hydrate-when-transform' + +const fixtureRoot = path.resolve(import.meta.dirname, './test-files') +const errorRoot = path.resolve(import.meta.dirname, './error-files') + +function fixtureId(filename: string) { + return path.join(fixtureRoot, filename) +} + +function normalizeSnapshotCode(code: string) { + return code.split(fixtureRoot).join('') +} + +async function readFixture(filename: string) { + return await readFile(fixtureId(filename), 'utf8') +} + +async function getFilenames(dirname: string) { + return (await readdir(dirname)) + .filter((filename) => filename.endsWith('.tsx')) + .sort() +} + +type HydrateBoundary = { + id: string + exportName: string + index: number +} + +function getHydrateBoundariesFromCode(code: string): Array { + const boundaries: Array = [] + const hydrateImportPattern = + /import\("([^"]*[?&]tss-hydrate=[^"]*)"\),\s*"([^"]+)"/g + let match: RegExpExecArray | null + + while ((match = hydrateImportPattern.exec(code))) { + const importId = match[1]! + const queryIndex = importId.indexOf('?') + const params = new URLSearchParams(importId.slice(queryIndex + 1)) + const boundaryId = params.get('tss-hydrate') + const separatorIndex = boundaryId?.indexOf('_') ?? -1 + const index = + boundaryId && separatorIndex > 0 + ? Number.parseInt(boundaryId.slice(0, separatorIndex), 36) + : Number.NaN + + if (boundaryId && Number.isInteger(index)) { + boundaries.push({ + id: boundaryId, + exportName: match[2]!, + index, + }) + } + } + + return boundaries.sort((a, b) => a.index - b.index) +} + +function compile(opts: { + env: 'client' | 'server' + code: string + id: string + root?: string +}) { + const options = { + ...opts, + root: opts.root ?? fixtureRoot, + } + const plugin = createHydrateCompilerPlugin() + const ast = parseAst({ code: options.code, sourceFilename: options.id }) + const result = plugin.transformAst?.({ + ast, + code: options.code, + id: options.id, + root: options.root, + env: options.env, + envName: options.env, + mode: 'dev', + framework: 'react', + providerEnvName: 'ssr', + types: t, + parseExpression: (expressionCode) => t.identifier(expressionCode), + }) + if (!result) return null + + const generated = generateFromAst(ast, { + sourceMaps: true, + sourceFileName: options.id, + filename: options.id, + }) + + return { + code: generated.code, + map: generated.map, + boundaries: getHydrateBoundariesFromCode(generated.code), + } +} + +function loadVirtualHydrateModule(options: { + code: string + id: string + root: string +}) { + return createHydrateCompilerPlugin().loadVirtualModule?.({ + code: options.code, + id: options.id, + root: options.root, + env: 'client', + envName: 'client', + }) +} + +function virtualHydrateId( + file: string, + boundary: Pick, +) { + const params = new URLSearchParams() + params.set('tss-hydrate', boundary.id) + return `${file}?${params.toString()}` +} + +describe('Hydrate compiler transform fixtures', async () => { + const filenames = await getFilenames(fixtureRoot) + + describe.each(filenames)('should handle "%s"', async (filename) => { + const code = await readFixture(filename) + const id = fixtureId(filename) + + test(`should compile ${filename} for client`, async () => { + const result = compile({ env: 'client', code, id }) + + await expect( + normalizeSnapshotCode(result?.code ?? 'no-transform'), + ).toMatchFileSnapshot(`./snapshots/client/${filename}`) + }) + + test(`should compile ${filename} for server`, async () => { + const result = compile({ env: 'server', code, id }) + + await expect( + normalizeSnapshotCode(result?.code ?? 'no-transform'), + ).toMatchFileSnapshot(`./snapshots/server/${filename}`) + }) + }) + + test('should extract virtual modules and keep nested ids stable', async () => { + const filename = 'hydrateWhenNested.tsx' + const code = await readFixture(filename) + const id = fixtureId(filename) + const firstPass = compile({ env: 'client', code, id }) + + expect( + firstPass?.boundaries.map((boundary) => boundary.exportName), + ).toEqual(['H0', 'H2']) + + for (const boundary of firstPass!.boundaries) { + const virtualId = virtualHydrateId(id, boundary) + const loaded = loadVirtualHydrateModule({ + code, + id: virtualId, + root: fixtureRoot, + }) + + await expect( + normalizeSnapshotCode(loaded?.code ?? 'no-virtual-module'), + ).toMatchFileSnapshot( + `./snapshots/virtual/${filename}.${boundary.exportName}.tsx`, + ) + } + + const parentBoundary = firstPass!.boundaries[0]! + const parentVirtualId = virtualHydrateId(id, parentBoundary) + const parentVirtualModule = loadVirtualHydrateModule({ + code, + id: parentVirtualId, + root: fixtureRoot, + }) + const nestedPass = compile({ + code: parentVirtualModule!.code, + id: parentVirtualId, + env: 'client', + }) + + await expect( + normalizeSnapshotCode(nestedPass?.code ?? 'no-transform'), + ).toMatchFileSnapshot(`./snapshots/virtual/${filename}.H0.client.tsx`) + }) +}) + +describe('Hydrate compiler extraction errors', async () => { + const errorCases = [ + { + filename: 'hydrateWhenFunctionChild.tsx', + message: /function-as-children/, + }, + { + filename: 'hydrateWhenHookCall.tsx', + message: /hooks/, + }, + { + filename: 'hydrateWhenThisCapture.tsx', + message: /captures this/, + }, + { + filename: 'hydrateWhenSuperCapture.tsx', + message: /captures super/, + }, + ] as const + + describe.each(errorCases)('$filename', async ({ filename, message }) => { + const code = await readFile(path.join(errorRoot, filename), 'utf8') + const id = path.join(errorRoot, filename) + + test('should reject unsafe client extraction', () => { + expect(() => + compile({ + code, + id, + root: errorRoot, + env: 'client', + }), + ).toThrow(message) + }) + + test('should reject unsafe server extraction', () => { + expect(() => + compile({ + code, + id, + root: errorRoot, + env: 'server', + }), + ).toThrow(message) + }) + }) +}) diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx new file mode 100644 index 0000000000..c977cd70a2 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx @@ -0,0 +1,18 @@ +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 diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx new file mode 100644 index 0000000000..8a68575d69 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx @@ -0,0 +1,19 @@ +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 <> + + {<_H />} + + + {<_H2 />} + + + {<_H3 />} + + ; +} \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx new file mode 100644 index 0000000000..97c3dba1a4 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx @@ -0,0 +1,16 @@ +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 <> + + {<_H />} + + + {<_H2 />} + + ; +} \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx new file mode 100644 index 0000000000..426e83fa73 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx @@ -0,0 +1,9 @@ +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 diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNoImport.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNoImport.tsx new file mode 100644 index 0000000000..b35c36ab1b --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNoImport.tsx @@ -0,0 +1 @@ +no-transform \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNotFromTanstack.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNotFromTanstack.tsx new file mode 100644 index 0000000000..b35c36ab1b --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNotFromTanstack.tsx @@ -0,0 +1 @@ +no-transform \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx new file mode 100644 index 0000000000..1bbe2337d6 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx @@ -0,0 +1,26 @@ +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
+}; +export function Page() { + return <> + Direct} h="0_7f4dc3aa80"> + {<_H />} + + Inline + }} h="1_7f4dc3aa80"> + {<_H2 />} + + + {<_H3 />} + + ; +} \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx new file mode 100644 index 0000000000..9961cdc3c9 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx @@ -0,0 +1,19 @@ +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
+

{status}

+ { + setStatus('prefetched'); + setUnusedStatus('prefetched'); + }} h="0_24b5f958eb" p={_H0_preload}> + {<_H />} + +
; +} \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx new file mode 100644 index 0000000000..9c24d8cbd3 --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx @@ -0,0 +1,11 @@ +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 diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenSplitFalse.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenSplitFalse.tsx new file mode 100644 index 0000000000..b35c36ab1b --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenSplitFalse.tsx @@ -0,0 +1 @@ +no-transform \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenSplitFalseFunctionChild.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenSplitFalseFunctionChild.tsx new file mode 100644 index 0000000000..b35c36ab1b --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenSplitFalseFunctionChild.tsx @@ -0,0 +1 @@ +no-transform \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenWrongImportName.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenWrongImportName.tsx new file mode 100644 index 0000000000..b35c36ab1b --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenWrongImportName.tsx @@ -0,0 +1 @@ +no-transform \ No newline at end of file diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx new file mode 100644 index 0000000000..8bcf4099ca --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx @@ -0,0 +1,17 @@ +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
+ + + +
; +} \ 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 new file mode 100644 index 0000000000..6959b25b3e --- /dev/null +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx @@ -0,0 +1,24 @@ +import { Hydrate } from '@tanstack/react-start'; +import { load, media, visible } from '@tanstack/react-start/hydration'; +function Summary() { + return
Summary
; +} +function Comments() { + return
Comments
; +} +function Footer() { + return
Footer
; +} +export function Page() { + return <> + + + + + + + +