Skip to content

Commit d02d714

Browse files
committed
chore: fixing up bad network calls
1 parent 10a18d4 commit d02d714

File tree

20 files changed

+220
-189
lines changed

20 files changed

+220
-189
lines changed

frameworks/react-cra/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ export function register() {
2222
'code-router': {
2323
displayName: 'Code Router',
2424
description: 'TanStack Router using code to define the routes',
25+
forceTypescript: false,
2526
},
2627
'file-router': {
2728
displayName: 'File Router',
2829
description: 'TanStack Router using files to define the routes',
30+
forceTypescript: true,
2931
},
3032
},
3133
})

frameworks/solid/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ export function register() {
2222
'code-router': {
2323
displayName: 'Code Router',
2424
description: 'TanStack Router using code to define the routes',
25+
forceTypescript: true,
2526
},
2627
'file-router': {
2728
displayName: 'File Router',
2829
description: 'TanStack Router using files to define the routes',
30+
forceTypescript: true,
2931
},
3032
},
3133
})

packages/cta-cli/src/command-line.ts

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,39 +25,42 @@ export async function normalizeOptions(
2525
return undefined
2626
}
2727

28-
const framework = getFrameworkById(cliOptions.framework || 'react-cra')!
29-
30-
// TODO: Make this declarative
31-
let typescript =
32-
cliOptions.template === 'typescript' ||
33-
cliOptions.template === 'file-router' ||
34-
cliOptions.framework === 'solid'
35-
36-
if (forcedMode && framework.supportedModes[forcedMode].forceTypescript) {
37-
typescript = true
38-
}
39-
4028
let tailwind = !!cliOptions.tailwind
41-
if (cliOptions.framework === 'solid') {
42-
tailwind = true
43-
}
4429

4530
let mode: string =
46-
forcedMode || cliOptions.template === 'file-router'
47-
? 'file-router'
48-
: 'code-router'
31+
forcedMode ||
32+
(cliOptions.template === 'file-router' ? 'file-router' : 'code-router')
4933

5034
const starter = cliOptions.starter
5135
? await loadStarter(cliOptions.starter)
5236
: undefined
5337

38+
// TODO: Make this declarative
39+
let typescript =
40+
cliOptions.template === 'typescript' ||
41+
cliOptions.template === 'file-router' ||
42+
cliOptions.framework === 'solid'
43+
5444
if (starter) {
5545
tailwind = starter.tailwind
5646
typescript = starter.typescript
5747
cliOptions.framework = starter.framework
5848
mode = starter.mode
5949
}
6050

51+
const framework = getFrameworkById(cliOptions.framework || 'react-cra')!
52+
53+
if (
54+
forcedMode &&
55+
framework.supportedModes?.[forcedMode]?.forceTypescript !== undefined
56+
) {
57+
typescript = true
58+
}
59+
60+
if (cliOptions.framework === 'solid') {
61+
tailwind = true
62+
}
63+
6164
async function selectAddOns() {
6265
// Edge case for Windows Powershell
6366
if (Array.isArray(cliOptions.addOns) && cliOptions.addOns.length === 1) {

packages/cta-cli/tests/command-line.test.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ describe('normalizeOptions', () => {
6363
id: 'solid',
6464
name: 'Solid',
6565
getAddOns: () => [],
66+
supportedModes: {
67+
'code-router': {
68+
displayName: 'Code Router',
69+
description: 'TanStack Router using code to define the routes',
70+
forceTypescript: false,
71+
},
72+
'file-router': {
73+
displayName: 'File Router',
74+
description: 'TanStack Router using files to define the routes',
75+
forceTypescript: true,
76+
},
77+
},
6678
})
6779
fetch.mockResponseOnce(
6880
JSON.stringify({

packages/cta-cli/tests/options.test.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,18 @@ beforeEach(() => {
3636
modes: ['file-router', 'code-router'],
3737
},
3838
],
39+
supportedModes: {
40+
'code-router': {
41+
displayName: 'Code Router',
42+
description: 'TanStack Router using code to define the routes',
43+
forceTypescript: false,
44+
},
45+
'file-router': {
46+
displayName: 'File Router',
47+
description: 'TanStack Router using files to define the routes',
48+
forceTypescript: true,
49+
},
50+
},
3951
} as unknown as Framework)
4052

4153
__testRegisterFramework({

packages/cta-cli/tests/ui-prompts.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
selectTailwind,
1212
selectToolchain,
1313
} from '../src/ui-prompts'
14-
import { FILE_ROUTER } from '@tanstack/cta-engine'
1514

1615
import type { AddOn, Framework } from '@tanstack/cta-engine'
1716

@@ -44,7 +43,7 @@ describe('selectRouterType', () => {
4443
vi.spyOn(clack, 'isCancel').mockImplementation(() => false)
4544

4645
const routerType = await selectRouterType()
47-
expect(routerType).toBe(FILE_ROUTER)
46+
expect(routerType).toBe('file-router')
4847
})
4948

5049
it('should exit on cancel', async () => {

packages/cta-engine/tests/package-json.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { describe, expect, it } from 'vitest'
22

33
import { createPackageJSON } from '../src/package-json.js'
4-
import { FILE_ROUTER } from '../src/constants.js'
54

65
import type { Options, Framework } from '../src/types.js'
76

@@ -17,7 +16,7 @@ describe('createPackageJSON', () => {
1716
},
1817
},
1918
],
20-
mode: FILE_ROUTER,
19+
mode: 'file-router',
2120
typescript: true,
2221
tailwind: true,
2322
projectName: 'test',

packages/cta-ui/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
rel="stylesheet"
1111
href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap"
1212
/>
13+
<!-- PRELOAD-->
1314
</head>
1415
<body class="dark">
1516
<div id="root"></div>

packages/cta-ui/lib/engine-handling/create-app-wrapper.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import {
1111

1212
import { TMP_TARGET_DIR } from '../constants.js'
1313

14-
import { registerFrameworks } from './framework-registration.js'
15-
1614
import { cleanUpFileArray, cleanUpFiles } from './file-helpers.js'
1715
import { getApplicationMode, getProjectPath } from './server-environment.js'
1816

@@ -33,9 +31,10 @@ export async function createAppWrapper(
3331
environmentFactory?: () => Environment
3432
},
3533
) {
36-
registerFrameworks()
37-
3834
const framework = getFrameworkById(projectOptions.framework)!
35+
if (!framework) {
36+
throw new Error(`Framework ${projectOptions.framework} not found`)
37+
}
3938

4039
let starter: Starter | undefined
4140
const addOns: Array<string> = [...projectOptions.chosenAddOns]

packages/cta-ui/lib/engine-handling/framework-registration.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)