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
5 changes: 5 additions & 0 deletions .changeset/start-generate-routes-vite-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tanstack/create": patch
---

Generate the route tree of new Start apps on Vite with `vite build` instead of `tsr generate`, which leaves out the Start `Register` block.
3 changes: 1 addition & 2 deletions packages/cli/tests-e2e/blank-smoke.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ const expectedDependencies = [

const expectedDevDependencies = [
'@cloudflare/vite-plugin',
'@tanstack/router-cli',
'@types/node',
'@types/react',
'@types/react-dom',
Expand Down Expand Up @@ -208,7 +207,7 @@ test('@blocking creates a production-valid blank React app', async ({
)
expect(packageJSON.scripts).toEqual({
dev: 'vite dev --port 3000',
'generate-routes': 'tsr generate',
'generate-routes': 'vite build',
build: 'vite build',
preview: 'vite preview',
deploy: 'npm run build && wrangler deploy',
Expand Down
5 changes: 5 additions & 0 deletions packages/create/src/edge-package-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ export function createPackageJSON(options: Options) {
options.mode === 'file-router'
? options.framework.optionalPackages.bundlerFileRouter?.[bundler]
: undefined,
options.mode === 'file-router' && options.routerOnly
? options.framework.optionalPackages.bundlerRouterOnlyFileRouter?.[
bundler
]
: undefined,
]
for (const addition of additions.filter(
(addition): addition is Record<string, unknown> => Boolean(addition),
Expand Down
7 changes: 5 additions & 2 deletions packages/create/src/frameworks/react/project/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"vite": {
"scripts": {
"dev": "vite dev --port 3000",
"generate-routes": "tsr generate",
"generate-routes": "vite build",
"build": "vite build",
"preview": "vite preview"
},
Expand Down Expand Up @@ -75,8 +75,11 @@
}
}
},
"bundlerFileRouter": {
"bundlerRouterOnlyFileRouter": {
"vite": {
"scripts": {
"generate-routes": "tsr generate"
},
"devDependencies": {
"@tanstack/router-cli": "^1.132.0"
}
Expand Down
7 changes: 5 additions & 2 deletions packages/create/src/frameworks/solid/project/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"vite": {
"scripts": {
"dev": "vite dev --port 3000",
"generate-routes": "tsr generate",
"generate-routes": "vite build",
"build": "vite build",
"start": "node .output/server/index.mjs",
"preview": "vite preview"
Expand Down Expand Up @@ -68,8 +68,11 @@
}
}
},
"bundlerFileRouter": {
"bundlerRouterOnlyFileRouter": {
"vite": {
"scripts": {
"generate-routes": "tsr generate"
},
"devDependencies": {
"@tanstack/router-cli": "^1.133.21"
}
Expand Down
5 changes: 5 additions & 0 deletions packages/create/src/package-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ export function createPackageJSON(options: Options) {
options.mode === 'file-router'
? options.framework.optionalPackages.bundlerFileRouter?.[bundler]
: undefined,
options.mode === 'file-router' && options.routerOnly
? options.framework.optionalPackages.bundlerRouterOnlyFileRouter?.[
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
bundler
]
: undefined,
]
for (const addition of additions.filter(Boolean)) {
packageJSON = mergePackageJSON(packageJSON, addition)
Expand Down
2 changes: 0 additions & 2 deletions packages/create/tests/blank-preset.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const BLANK_DEPENDENCY_ALLOWLIST = [
]

const BLANK_DEV_DEPENDENCY_ALLOWLIST = [
'@tanstack/router-cli',
'@types/node',
'@types/react',
'@types/react-dom',
Expand Down Expand Up @@ -169,7 +168,6 @@ describe('blank project preset', () => {
'solid-js',
])
expect(Object.keys(packageJSON.devDependencies).sort()).toEqual([
'@tanstack/router-cli',
'typescript',
'vite',
'vite-plugin-solid',
Expand Down
14 changes: 13 additions & 1 deletion packages/create/tests/bundlers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ describe('bundler project generation', () => {
expect(packageJSON.scripts.build).toBe(`${bundler} build`)
expect(packageJSON.scripts.preview).toBe(`${bundler} preview`)
expect(packageJSON.scripts['generate-routes']).toBe(
bundler === 'vite' ? 'tsr generate' : 'rsbuild build',
bundler === 'rsbuild'
? 'rsbuild build'
: routerOnly
? 'tsr generate'
: 'vite build',
)

if (bundler === 'vite') {
Expand Down Expand Up @@ -251,8 +255,16 @@ describe('bundler project generation', () => {
expect(packageJSON.scripts).not.toHaveProperty('start')
expect(packageJSON.dependencies).not.toHaveProperty('srvx')
expect(files[configFile]).toContain('@tanstack/router-plugin')
if (bundler === 'vite') {
expect(packageJSON.devDependencies).toHaveProperty(
'@tanstack/router-cli',
)
}
} else {
expect(packageJSON.dependencies).toHaveProperty(startPackage)
expect(packageJSON.devDependencies).not.toHaveProperty(
'@tanstack/router-cli',
)
if (bundler === 'rsbuild') {
expect(packageJSON.scripts.start).toContain('srvx')
expect(packageJSON.dependencies).toHaveProperty('srvx')
Expand Down
11 changes: 1 addition & 10 deletions packages/create/tests/framework-template.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,9 @@ describe('framework templates', () => {
it.each([
['React', createReactFrameworkDefinition],
['Solid', createSolidFrameworkDefinition],
])('%s includes route generation tooling', (_, createDefinition) => {
])('%s defaults to Vite and offers Rsbuild', (_, createDefinition) => {
const framework = createDefinition()

expect(
framework.optionalPackages.bundlers.vite.scripts['generate-routes'],
).toBe('tsr generate')
expect(
framework.optionalPackages.bundlers.rsbuild.scripts['generate-routes'],
).toBe('rsbuild build')
expect(
framework.optionalPackages.bundlerFileRouter.vite.devDependencies,
).toHaveProperty('@tanstack/router-cli')
expect(framework.defaultBundler).toBe('vite')
expect(framework.bundlers?.map((bundler) => bundler.id)).toEqual([
'vite',
Expand Down
38 changes: 38 additions & 0 deletions packages/create/tests/package-json.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,44 @@ describe('createPackageJSON', () => {
},
)

it.each([false, true])(
'applies a custom framework bundlerFileRouter to file-router apps (routerOnly=%s)',
(routerOnly) => {
const framework = {
id: 'custom',
basePackageJSON: {},
optionalPackages: {
bundlerFileRouter: {
vite: {
scripts: { routes: 'custom-routes' },
devDependencies: { 'custom-routes': '^1.0.0' },
},
},
},
} as unknown as Framework
const options = {
chosenAddOns: [],
addOnOptions: {},
mode: 'file-router',
routerOnly,
typescript: true,
tailwind: false,
projectName: 'test',
packageManager: 'pnpm',
framework,
} as unknown as Options

const packageJSON = createPackageJSON(options)

expect(packageJSON.scripts).toHaveProperty('routes', 'custom-routes')
expect(packageJSON.devDependencies).toHaveProperty(
'custom-routes',
'^1.0.0',
)
expect(createEdgePackageJSON(options)).toEqual(packageJSON)
},
)

it('should create a package.json', () => {
const packageJSON = createPackageJSON({
chosenAddOns: [
Expand Down
Loading