Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions .changeset/tasty-falcons-say.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
'@tanstack/start-static-server-functions': patch
'@tanstack/react-router-ssr-query': patch
'@tanstack/solid-router-ssr-query': patch
'@tanstack/react-router-devtools': patch
'@tanstack/router-ssr-query-core': patch
'@tanstack/solid-router-devtools': patch
'@tanstack/start-storage-context': patch
'@tanstack/eslint-plugin-router': patch
'@tanstack/nitro-v2-vite-plugin': patch
'@tanstack/router-devtools-core': patch
'@tanstack/vue-router-ssr-query': patch
'@tanstack/virtual-file-routes': patch
'@tanstack/vue-router-devtools': patch
'@tanstack/react-start-client': patch
'@tanstack/react-start-server': patch
'@tanstack/router-vite-plugin': patch
'@tanstack/solid-start-client': patch
'@tanstack/solid-start-server': patch
'@tanstack/start-client-core': patch
'@tanstack/start-plugin-core': patch
'@tanstack/start-server-core': patch
'@tanstack/router-generator': patch
'@tanstack/vue-start-client': patch
'@tanstack/vue-start-server': patch
'@tanstack/arktype-adapter': patch
'@tanstack/router-devtools': patch
'@tanstack/valibot-adapter': patch
'@tanstack/start-fn-stubs': patch
'@tanstack/router-plugin': patch
'@tanstack/react-router': patch
'@tanstack/router-utils': patch
'@tanstack/solid-router': patch
'@tanstack/react-start': patch
'@tanstack/router-core': patch
'@tanstack/solid-start': patch
'@tanstack/zod-adapter': patch
'@tanstack/router-cli': patch
'@tanstack/vue-router': patch
'@tanstack/vue-start': patch
'@tanstack/history': patch
---

fix: build with @tanstack/vite-config 0.4.3
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
"@eslint-react/eslint-plugin": "^1.26.2",
"@playwright/test": "^1.57.0",
"@svitejs/changesets-changelog-github-compact": "^1.2.0",
"@tanstack/config": "0.22.0",
"@tanstack/eslint-config": "0.4.0",
"@tanstack/query-core": "^5.90.19",
"@tanstack/react-query": "^5.90.19",
"@tanstack/vite-config": "0.4.3",
"@types/node": "25.0.9",
"@types/react": "^19.2.8",
"@types/react-dom": "^19.2.3",
Expand Down Expand Up @@ -134,6 +134,9 @@
"@tanstack/router-utils": "workspace:*",
"@tanstack/start-static-server-functions": "workspace:*",
"@tanstack/nitro-v2-vite-plugin": "workspace:*"
},
"patchedDependencies": {
"@tanstack/vite-config@0.4.3": "patches/@tanstack__vite-config@0.4.3.patch"
}
}
}
2 changes: 1 addition & 1 deletion packages/arktype-adapter/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-router/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/history/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/nitro-v2-vite-plugin/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'

const config = defineConfig({})

Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-devtools/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import react from '@vitejs/plugin-react'
import packageJson from './package.json'

Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-ssr-query/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import react from '@vitejs/plugin-react'
import packageJson from './package.json'

Expand Down
2 changes: 1 addition & 1 deletion packages/react-router/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import react from '@vitejs/plugin-react'
import packageJson from './package.json'

Expand Down
2 changes: 1 addition & 1 deletion packages/react-start-client/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import react from '@vitejs/plugin-react'
import packageJson from './package.json'
import type { ViteUserConfig } from 'vitest/config'
Expand Down
2 changes: 1 addition & 1 deletion packages/react-start-server/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import react from '@vitejs/plugin-react'
import packageJson from './package.json'

Expand Down
2 changes: 1 addition & 1 deletion packages/react-start/vite.config.server-entry.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'

export default tanstackViteConfig({
srcDir: './src/default-entry',
Expand Down
2 changes: 1 addition & 1 deletion packages/react-start/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import { copyFilesPlugin } from '@tanstack/router-utils'
import packageJson from './package.json'

Expand Down
5 changes: 2 additions & 3 deletions packages/router-cli/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import * as yargs from 'yargs'
import yargs from 'yargs'
import { getConfig } from '@tanstack/router-generator'
import { generate } from './generate'
import { watch } from './watch'

main()

export function main() {
yargs
// @ts-expect-error
yargs()
.scriptName('tsr')
.usage('$0 <cmd> [args]')
.command('generate', 'Generate the routes for a project', async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/router-cli/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'

const config = defineConfig({})

Expand Down
2 changes: 2 additions & 0 deletions packages/router-core/src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,8 @@ export interface ServerSsr {
isDehydrated: () => boolean
isSerializationFinished: () => boolean
onRenderFinished: (listener: () => void) => void
setRenderFinished: () => void
cleanup: () => void
onSerializationFinished: (listener: () => void) => void
dehydrate: () => Promise<void>
takeBufferedScripts: () => RouterManagedTag | undefined
Expand Down
2 changes: 1 addition & 1 deletion packages/router-core/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'node:path'
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import minifyScriptPlugin from './vite-minify-plugin'
import packageJson from './package.json'
import type { ViteUserConfig } from 'vitest/config'
Expand Down
2 changes: 1 addition & 1 deletion packages/router-devtools-core/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import solid from 'vite-plugin-solid'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/router-devtools/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import react from '@vitejs/plugin-react'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/router-generator/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/router-plugin/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/router-ssr-query-core/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'
import type { ViteUserConfig } from 'vitest/config'

Expand Down
2 changes: 1 addition & 1 deletion packages/router-utils/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/router-vite-plugin/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'

const config = defineConfig({})

Expand Down
2 changes: 1 addition & 1 deletion packages/solid-router-devtools/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import solid from 'vite-plugin-solid'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-router-ssr-query/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import solid from 'vite-plugin-solid'
import packageJson from './package.json'

Expand Down
2 changes: 1 addition & 1 deletion packages/solid-router/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import solid from 'vite-plugin-solid'
import packageJson from './package.json'
import type { ViteUserConfig } from 'vitest/config'
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-start-client/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import solid from 'vite-plugin-solid'
import packageJson from './package.json'
import type { ViteUserConfig } from 'vitest/config'
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-start-server/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import solid from 'vite-plugin-solid'
import packageJson from './package.json'

Expand Down
2 changes: 1 addition & 1 deletion packages/solid-start/vite.config.server-entry.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'

export default tanstackViteConfig({
srcDir: './src/default-entry',
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-start/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import { copyFilesPlugin } from '@tanstack/router-utils'
import packageJson from './package.json'

Expand Down
2 changes: 1 addition & 1 deletion packages/start-client-core/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/start-fn-stubs/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/start-plugin-core/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/start-server-core/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'
// this needs to be imported from the actual file instead of from 'index.tsx'
// so we don't trigger the import of a `?script-string` import before the minifyScriptPlugin is setup
Expand Down
2 changes: 1 addition & 1 deletion packages/start-static-server-functions/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/start-storage-context/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/valibot-adapter/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/virtual-file-routes/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-router-devtools/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import vueJsx from '@vitejs/plugin-vue-jsx'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-router-ssr-query/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import vueJsx from '@vitejs/plugin-vue-jsx'

const config = defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-router/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { dirname, resolve } from 'node:path'
import { fileURLToPath } from 'node:url'
import { defineConfig, mergeConfig } from 'vitest/config'
import vueJsx from '@vitejs/plugin-vue-jsx'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const __filename = fileURLToPath(import.meta.url)
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-start-client/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import vueJsx from '@vitejs/plugin-vue-jsx'
import packageJson from './package.json'
import type { ViteUserConfig } from 'vitest/config'
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-start-server/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import vueJsx from '@vitejs/plugin-vue-jsx'
import packageJson from './package.json'

Expand Down
2 changes: 1 addition & 1 deletion packages/vue-start/vite.config.server-entry.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import vueJsx from '@vitejs/plugin-vue-jsx'
import { mergeConfig, defineConfig } from 'vitest/config'

Expand Down
2 changes: 1 addition & 1 deletion packages/vue-start/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import { copyFilesPlugin } from '@tanstack/router-utils'
import vueJsx from '@vitejs/plugin-vue-jsx'
import packageJson from './package.json'
Expand Down
2 changes: 1 addition & 1 deletion packages/zod-adapter/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/config/vite'
import { tanstackViteConfig } from '@tanstack/vite-config'
import packageJson from './package.json'

const config = defineConfig({
Expand Down
Loading
Loading