Skip to content

Commit

Permalink
fix(start): tsc the config package
Browse files Browse the repository at this point in the history
  • Loading branch information
tannerlinsley committed May 15, 2024
1 parent 8ae2cee commit 5d48fd6
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 16 deletions.
9 changes: 9 additions & 0 deletions packages/start/config.tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../../tsconfig.json",
"include": ["src/config/index.ts"],
"compilerOptions": {
"outDir": "dist/esm/config",
"target": "esnext",
"noEmit": false
}
}
7 changes: 4 additions & 3 deletions packages/start/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
"./config": {
"import": {
"_types": "./src/config/index.d.ts",
"default": "./src/config/index.js"
"types": "./dist/esm/config/index.d.ts",
"default": "./dist/esm/config/index.js"
}
},
"./client": {
Expand Down Expand Up @@ -90,7 +90,8 @@
"test:eslint": "eslint --ext .ts,.tsx ./src",
"test:types": "tsc --noEmit",
"test:build": "publint --strict",
"build": "vite build"
"build": "vite build && pnpm build:config",
"build:config": "tsc --project config.tsconfig.json"
},
"keywords": [
"react",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,29 @@ import { TanStackRouterVite } from '@tanstack/router-vite-plugin'
import { serverFunctions } from '@vinxi/server-functions/plugin'
import { serverTransform } from '@vinxi/server-functions/server'
import { config } from 'vinxi/plugins/config'
// import type * as vite from 'vite'
import type * as vite from 'vite'
// import { config } from 'vinxi/plugins/config'

function startVite() {
return config('start-vite', {
ssr: {
// external: ['@tanstack/start'],
// external: [
// '@tanstack/start/client-runtime',
// '@tanstack/start/server-runtime',
// '@tanstack/start/server-handler',
// ],
},
optimizeDeps: {
// exclude: ['@tanstack/start'],
},
})
}

export function defineConfig(opts) {
export function defineConfig(opts?: {
vite?: {
plugins: () => Array<vite.UserConfig>
}
}) {
return createApp({
server: {
preset: 'vercel',
Expand All @@ -47,15 +55,15 @@ export function defineConfig(opts) {
target: 'server',
plugins: () => [
startVite(),
opts.vite?.(),

TanStackRouterVite({
experimental: {
enableCodeSplitting: false,
enableCodeSplitting: true,
},
}),
tsconfigPaths(),
serverTransform({
runtime: resolveRelativePath('../server-runtime/index.tsx'),
runtime: resolveRelativePath('../server-runtime'),
}),
],
link: {
Expand All @@ -74,23 +82,23 @@ export function defineConfig(opts) {
plugins: () => [
TanStackRouterVite({
experimental: {
enableCodeSplitting: false,
enableCodeSplitting: true,
},
}),
startVite(),
opts.vite?.(),

tsconfigPaths(),
serverFunctions.client({
runtime: resolveRelativePath('../client-runtime/index.tsx'),
runtime: resolveRelativePath('../client-runtime'),
}),
reactRefresh(),
],
},
serverFunctions.router({
name: 'server',
plugins: () => [startVite(), opts.vite?.(), tsconfigPaths()],
handler: resolveRelativePath('../server-handler/index.tsx'),
runtime: resolveRelativePath('../server-runtime/index.tsx'),
plugins: () => [startVite(), tsconfigPaths()],
handler: resolveRelativePath('../server-handler'),
runtime: resolveRelativePath('../server-runtime'),
}),
],
})
Expand Down
1 change: 0 additions & 1 deletion packages/start/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export default mergeConfig(
config,
tanstackBuildConfig({
entry: [
'./src/constants.ts',
'./src/client/index.tsx',
'./src/server/index.tsx',
'./src/client-runtime/index.tsx',
Expand Down

0 comments on commit 5d48fd6

Please sign in to comment.