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
3 changes: 2 additions & 1 deletion .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
".tanstack-start",
".netlify",
"public",
"convex/.temp"
"convex/.temp",
".claude"
],
"rules": {
"no-array-constructor": "error",
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build": "vite build",
"start": "vite start",
"start:prod": "pnpm run with-env node scripts/run-built-server.mjs",
"lint": "oxlint --type-aware",
"lint": "oxlint --type-aware --disable-nested-config",
"format": "oxfmt --write",
"db:generate": "drizzle-kit generate",
"db:migrate": "drizzle-kit migrate",
Expand Down Expand Up @@ -122,6 +122,7 @@
"@playwright/test": "^1.59.0",
"@shikijs/transformers": "^4.0.2",
"@tanstack/devtools-vite": "^0.6.0",
"@tanstack/dom-vite": "0.1.0-alpha.4",
"@tanstack/react-devtools": "^0.10.2",
"@tanstack/react-query-devtools": "^5.99.0",
"@types/hast": "^3.0.4",
Expand Down
50 changes: 50 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { sentryTanstackStart } from '@sentry/tanstackstart-react/vite'
import { defineConfig } from 'vite'
import { tanstackDom } from '@tanstack/dom-vite'
import contentCollections from '@content-collections/vite'
import { devtools as tanstackDevtools } from '@tanstack/devtools-vite'
import { tanstackStart } from '@tanstack/react-start/plugin/vite'
Expand Down Expand Up @@ -36,10 +37,28 @@ const rscSsrExternals = [
const sentrySsrExternals = ['@sentry/node', '@sentry/tanstackstart-react']
const dbSsrExternals = ['drizzle-orm', 'drizzle-orm/postgres-js']

// Runtime-specific `react-dom/server` variants aren't in @tanstack/dom-vite's
// default alias map — our shim ships a single universal server build, unlike
// React which maintains per-runtime forks (edge/node/bun/browser + static.*).
// @vitejs/plugin-rsc and Netlify's edge adapter import them conditionally, so
// we funnel them all to `@tanstack/react-dom-server` at the top-level resolve
// (Vite 8's `EnvironmentResolveOptions` doesn't accept `alias`, so env-scoped
// aliasing isn't an option).
const serverVariantAliases: Record<string, string> = {
'react-dom/server.edge': '@tanstack/react-dom-server',
'react-dom/server.node': '@tanstack/react-dom-server',
'react-dom/server.bun': '@tanstack/react-dom-server',
'react-dom/server.browser': '@tanstack/react-dom-server',
'react-dom/static.edge': '@tanstack/react-dom-server',
'react-dom/static.node': '@tanstack/react-dom-server',
'react-dom/static': '@tanstack/react-dom-server',
}

export default defineConfig({
resolve: {
alias: {
'~': path.resolve(__dirname, './src'),
...serverVariantAliases,
},
},
server: {
Expand Down Expand Up @@ -102,6 +121,12 @@ export default defineConfig({
'discord-interactions',
// Don't pre-bundle CLI so we always get fresh changes during dev
...(isDev ? ['@tanstack/cli'] : []),
// `use client` libraries that plugin-rsc pre-bundles inconsistently
// across client/ssr/rsc envs when combined with our React shim — each
// env resolves `react` to a different target, so the optimizer's hash
// diverges. Excluding from optimize keeps resolution deterministic per
// env and silences the 50k+ "inconsistently optimized" warning flood.
'lucide-react',
],
},
build: {
Expand Down Expand Up @@ -168,6 +193,7 @@ export default defineConfig({
},
},
plugins: [
tanstackDom(),
...(isDev ? [tanstackDevtools()] : []),
tanstackStart({
rsc: {
Expand Down
Loading