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/soft-ways-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
'@tanstack/router-devtools-core': patch
'@tanstack/arktype-adapter': patch
'@tanstack/eslint-plugin-router': patch
'@tanstack/history': patch
'@tanstack/nitro-v2-vite-plugin': patch
'@tanstack/react-router': patch
'@tanstack/react-router-devtools': patch
'@tanstack/react-router-ssr-query': patch
'@tanstack/react-start': patch
'@tanstack/react-start-client': patch
'@tanstack/react-start-server': patch
'@tanstack/router-cli': patch
'@tanstack/router-core': patch
'@tanstack/router-devtools': patch
'@tanstack/router-generator': patch
'@tanstack/router-plugin': patch
'@tanstack/router-ssr-query-core': patch
'@tanstack/router-utils': patch
'@tanstack/router-vite-plugin': patch
'@tanstack/solid-router': patch
'@tanstack/solid-router-devtools': patch
'@tanstack/solid-router-ssr-query': patch
'@tanstack/solid-start': patch
'@tanstack/solid-start-client': patch
'@tanstack/solid-start-server': patch
'@tanstack/start-client-core': patch
'@tanstack/start-fn-stubs': patch
'@tanstack/start-plugin-core': patch
'@tanstack/start-server-core': patch
'@tanstack/start-static-server-functions': patch
'@tanstack/start-storage-context': patch
'@tanstack/valibot-adapter': patch
'@tanstack/virtual-file-routes': patch
'@tanstack/vue-router': patch
'@tanstack/vue-router-devtools': patch
'@tanstack/vue-router-ssr-query': patch
'@tanstack/vue-start': patch
'@tanstack/vue-start-client': patch
'@tanstack/vue-start-server': patch
'@tanstack/zod-adapter': patch
---

build: update to vite-config 5.x (rolldown)
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@tanstack/eslint-config": "0.4.0",
"@tanstack/query-core": "^5.90.19",
"@tanstack/react-query": "^5.90.19",
"@tanstack/vite-config": "0.4.3",
"@tanstack/vite-config": "0.5.1",
"@types/node": "25.0.9",
"@types/react": "^19.2.8",
"@types/react-dom": "^19.2.3",
Expand All @@ -78,20 +78,23 @@
"typescript56": "npm:typescript@5.6",
"typescript57": "npm:typescript@5.7",
"typescript58": "npm:typescript@5.8",
"vite": "^7.3.1",
"vite": "^8.0.0",
"vitest": "^4.0.17"
},
"pnpm": {
"overrides": {
"@types/babel__traverse": "^7.28.0",
"vite-plugin-dts": "4.0.3",
"vite-plugin-dts": "4.2.3",
"solid-js": "1.9.10",
"react": "$react",
"react-dom": "$react-dom",
"@types/react": "$@types/react",
"@types/react-dom": "$@types/react-dom",
"eslint": "$eslint",
"vite": "$vite",
"@benchmarks/bundle-size>vite": "^7.3.1",
"@benchmarks/client-nav>vite": "^7.3.1",
"@benchmarks/ssr>vite": "^7.3.1",
"@types/node": "$@types/node",
"@playwright/test": "$@playwright/test",
"@tanstack/react-query": "$@tanstack/react-query",
Expand Down Expand Up @@ -136,7 +139,7 @@
"@tanstack/nitro-v2-vite-plugin": "workspace:*"
},
"patchedDependencies": {
"@tanstack/vite-config@0.4.3": "patches/@tanstack__vite-config@0.4.3.patch"
"@tanstack/vite-config@0.5.1": "patches/@tanstack__vite-config@0.5.1.patch"
}
}
}
4 changes: 2 additions & 2 deletions packages/router-devtools-core/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const merged = mergeConfig(
}),
)

merged.build.rollupOptions.output.manualChunks = undefined
merged.build.rollupOptions.output.preserveModules = false
merged.build.rolldownOptions.output.manualChunks = undefined
merged.build.rolldownOptions.output.preserveModules = false

export default merged
2 changes: 1 addition & 1 deletion packages/router-plugin/src/core/code-splitter/compilers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as t from '@babel/types'
import babel from '@babel/core'
import * as babel from '@babel/core'
import * as template from '@babel/template'
import {
deadCodeElimination,
Expand Down
2 changes: 1 addition & 1 deletion packages/router-plugin/src/core/route-autoimport-plugin.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { generateFromAst, logDiff, parseAst } from '@tanstack/router-utils'
import babel from '@babel/core'
import * as babel from '@babel/core'
import * as template from '@babel/template'
import { getConfig } from './config'
import { debug, normalizePath } from './utils'
Expand Down
25 changes: 15 additions & 10 deletions packages/solid-router/src/useBlocker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -292,17 +292,22 @@ const _resolvePromptBlockerArgs = (
}
}

export function Block<
TRouter extends AnyRouter = RegisteredRouter,
TWithResolver extends boolean = boolean,
>(opts: PromptProps<TRouter, TWithResolver>): SolidNode

/**
* @deprecated Use the UseBlockerOpts property instead
*/
export function Block(opts: LegacyPromptProps): SolidNode
interface BlockComponent {
<
TRouter extends AnyRouter = RegisteredRouter,
TWithResolver extends boolean = boolean,
>(
opts: PromptProps<TRouter, TWithResolver>,
): SolidNode
/**
* @deprecated Use the UseBlockerOpts property instead
*/
(opts: LegacyPromptProps): SolidNode
}

export function Block(opts: PromptProps | LegacyPromptProps): SolidNode {
export const Block: BlockComponent = function Block(
opts: PromptProps | LegacyPromptProps,
): SolidNode {
const [propsWithChildren, rest] = Solid.splitProps(opts, ['children'])
const args = _resolvePromptBlockerArgs(rest)

Expand Down
26 changes: 0 additions & 26 deletions patches/@tanstack__vite-config@0.4.3.patch

This file was deleted.

44 changes: 44 additions & 0 deletions patches/@tanstack__vite-config@0.5.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
diff --git a/dist/index.js b/dist/index.js
index b7eacf17711de6d5d476a8f9d4343809ded1f46b..2eb23eb2503d534e36c40f0578ced4d904960418 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -27,7 +27,7 @@ const tanstackViteConfig = (options) => {
exclude: options.exclude,
tsconfigPath: options.tsconfigPath,
compilerOptions: {
- module: 199,
+ module: 99,
declarationMap: false
},
beforeWriteFile: (filePath, content) => {
@@ -54,7 +54,7 @@ const tanstackViteConfig = (options) => {
exclude: options.exclude,
tsconfigPath: options.tsconfigPath,
compilerOptions: {
- module: 199,
+ module: 100,
declarationMap: false
},
beforeWriteFile: (filePath, content) => {
diff --git a/src/index.ts b/src/index.ts
index 74d87604e414f282589fc2df278040a10e7901e7..0b16ec25c9849de8905fb96ea889e3d8d6e325ae 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -57,7 +57,7 @@ export const tanstackViteConfig = (options: Options): UserConfig => {
exclude: options.exclude,
tsconfigPath: options.tsconfigPath,
compilerOptions: {
- module: 199, // NodeNext
+ module: 99, // ESNext
declarationMap: false,
},
beforeWriteFile: (filePath, content) => {
@@ -83,7 +83,7 @@ export const tanstackViteConfig = (options: Options): UserConfig => {
exclude: options.exclude,
tsconfigPath: options.tsconfigPath,
compilerOptions: {
- module: 199, // NodeNext
+ module: 100, // Node16
declarationMap: false,
},
beforeWriteFile: (filePath, content) => {
Loading
Loading