Skip to content
Open
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
6 changes: 6 additions & 0 deletions .changeset/tidy-spoons-dream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@tanstack/create": patch
"@tanstack/cli": patch
---

Fix router-only package manifests by providing `@tanstack/router-core` for devtools under strict package managers and keeping `@tanstack/router-plugin` in devDependencies only.
4 changes: 1 addition & 3 deletions packages/create/src/frameworks/react/project/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
},
"file-router": {
"devDependencies": {
"@tanstack/router-cli": "^1.132.0"
},
"dependencies": {
"@tanstack/router-cli": "^1.132.0",
"@tanstack/router-plugin": "^1.132.0"
}
}
Expand Down
4 changes: 1 addition & 3 deletions packages/create/src/frameworks/solid/project/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
},
"file-router": {
"devDependencies": {
"@tanstack/router-cli": "^1.133.21"
},
"dependencies": {
"@tanstack/router-cli": "^1.133.21",
"@tanstack/router-plugin": "^1.133.21"
}
}
Expand Down
31 changes: 21 additions & 10 deletions packages/create/src/package-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,25 @@ export function createPackageJSON(options: Options) {
return formatCommand(getPackageManagerExecuteCommand(packageManager, pkg, args))
}

function applyRouterOnlyPackageJSONCompat() {
const routerPluginVersion =
packageJSON.devDependencies?.['@tanstack/router-plugin'] ??
packageJSON.dependencies?.['@tanstack/router-plugin'] ??
'latest'

delete packageJSON.dependencies?.['@tanstack/router-plugin']

packageJSON.devDependencies = {
...(packageJSON.devDependencies ?? {}),
'@tanstack/router-plugin': routerPluginVersion,
}
packageJSON.dependencies = {
...(packageJSON.dependencies ?? {}),
'@tanstack/router-core':
packageJSON.dependencies?.['@tanstack/router-core'] ?? 'latest',
}
}

let packageJSON = {
...JSON.parse(JSON.stringify(options.framework.basePackageJSON)),
name: options.projectName,
Expand Down Expand Up @@ -133,22 +152,14 @@ export function createPackageJSON(options: Options) {
if (options.framework.id === 'react') {
delete packageJSON.dependencies?.['@tanstack/react-start']
delete packageJSON.dependencies?.['@tanstack/react-router-ssr-query']
packageJSON.devDependencies = {
...(packageJSON.devDependencies ?? {}),
'@tanstack/router-plugin':
packageJSON.devDependencies?.['@tanstack/router-plugin'] ?? 'latest',
}
applyRouterOnlyPackageJSONCompat()
}

if (options.framework.id === 'solid') {
delete packageJSON.dependencies?.['@tanstack/solid-start']
delete packageJSON.dependencies?.['@tanstack/solid-router-ssr-query']
delete packageJSON.scripts?.start
packageJSON.devDependencies = {
...(packageJSON.devDependencies ?? {}),
'@tanstack/router-plugin':
packageJSON.devDependencies?.['@tanstack/router-plugin'] ?? 'latest',
}
applyRouterOnlyPackageJSONCompat()
}
}

Expand Down
94 changes: 94 additions & 0 deletions packages/create/tests/package-json.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,100 @@ describe('createPackageJSON', () => {
expect(JSON.stringify(packageJSON)).toEqual(JSON.stringify(expected))
})

it('should create a strict package-manager compatible React router-only package.json', () => {
const packageJSON = createPackageJSON({
chosenAddOns: [],
mode: 'file-router',
routerOnly: true,
typescript: true,
tailwind: true,
projectName: 'test',
framework: {
id: 'react',
basePackageJSON: {
dependencies: {
'@tanstack/react-router': 'latest',
'@tanstack/react-router-devtools': 'latest',
'@tanstack/react-router-ssr-query': 'latest',
'@tanstack/react-start': 'latest',
},
devDependencies: {},
},
optionalPackages: {
typescript: {},
tailwindcss: {},
'file-router': {
dependencies: {
'@tanstack/router-plugin': '^1.132.0',
},
devDependencies: {
'@tanstack/router-cli': '^1.132.0',
},
},
},
} as unknown as Framework,
} as unknown as Options)

expect(packageJSON.dependencies).toEqual({
'@tanstack/react-router': 'latest',
'@tanstack/react-router-devtools': 'latest',
'@tanstack/router-core': 'latest',
})
expect(packageJSON.devDependencies).toEqual({
'@tanstack/router-cli': '^1.132.0',
'@tanstack/router-plugin': '^1.132.0',
})
})

it('should move router-plugin to devDependencies for Solid router-only package.json', () => {
const packageJSON = createPackageJSON({
chosenAddOns: [],
mode: 'file-router',
routerOnly: true,
typescript: true,
tailwind: true,
projectName: 'test',
framework: {
id: 'solid',
basePackageJSON: {
scripts: {
start: 'node .output/server/index.mjs',
},
dependencies: {
'@tanstack/solid-router': 'latest',
'@tanstack/solid-router-devtools': 'latest',
'@tanstack/solid-router-ssr-query': 'latest',
'@tanstack/solid-start': 'latest',
},
devDependencies: {},
},
optionalPackages: {
typescript: {},
tailwindcss: {},
'file-router': {
dependencies: {
'@tanstack/router-plugin': '^1.133.21',
},
devDependencies: {
'@tanstack/router-cli': '^1.133.21',
},
},
},
} as unknown as Framework,
} as unknown as Options)

expect(packageJSON.dependencies).toEqual({
'@tanstack/router-core': 'latest',
'@tanstack/solid-router': 'latest',
'@tanstack/solid-router-devtools': 'latest',
})
expect(packageJSON.devDependencies).toEqual({
'@tanstack/router-cli': '^1.133.21',
'@tanstack/router-plugin': '^1.133.21',
})
expect(packageJSON.scripts).toEqual({})
})

it('should include sqlite build approval for pnpm templates', () => {
const packageJSON = createPackageJSON({
chosenAddOns: [
Expand Down