Skip to content

Commit 007127f

Browse files
committed
stabilized
1 parent d505974 commit 007127f

File tree

12 files changed

+142
-7
lines changed

12 files changed

+142
-7
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,11 @@
4545
"@radix-ui/react-dialog": "^1.1.10",
4646
"@radix-ui/react-dropdown-menu": "^2.1.12",
4747
"@radix-ui/react-label": "^2.1.7",
48+
"@radix-ui/react-popover": "^1.1.2",
4849
"@radix-ui/react-select": "^2.2.2",
50+
"@radix-ui/react-separator": "^1.1.0",
4951
"@radix-ui/react-slot": "^1.2.3",
52+
"@radix-ui/react-tooltip": "^1.1.5",
5053
"@radix-ui/react-switch": "^1.2.6",
5154
"@radix-ui/react-tabs": "^1.1.13",
5255
"@radix-ui/react-toast": "^1.2.2",

pnpm-lock.yaml

Lines changed: 64 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cta/lib/engine-handling/create-app-wrapper.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ export async function createAppWrapper(
2323
'./server-environment'
2424
)
2525
const { createMemoryEnvironment } = await import('./memory-environment')
26+
const { ensureFrameworkRegistered } = await import('./framework-registry')
27+
28+
// Ensure framework is registered
29+
await ensureFrameworkRegistered()
2630

2731
const framework = getFrameworkById(projectOptions.framework)!
2832
if (!framework) {
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
let frameworkRegistered = false
2+
3+
export async function ensureFrameworkRegistered() {
4+
if (frameworkRegistered) {
5+
return
6+
}
7+
8+
const { registerFramework } = await import('@tanstack/cta-engine')
9+
const { createFrameworkDefinition } = await import(
10+
'@tanstack/cta-framework-react-cra'
11+
)
12+
13+
registerFramework(createFrameworkDefinition())
14+
frameworkRegistered = true
15+
}

src/cta/lib/engine-handling/generate-initial-payload.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ export async function generateInitialPayload() {
3636
getProjectPath,
3737
getRegistry: getRegistryURL,
3838
} = await import('./server-environment')
39+
const { ensureFrameworkRegistered } = await import('./framework-registry')
40+
41+
// Ensure framework is registered
42+
await ensureFrameworkRegistered()
3943

4044
const projectPath = getProjectPath()
4145
const applicationMode = getApplicationMode()

src/forge/engine-handling/create-app-wrapper.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ export async function createAppWrapper(
2222
const { getApplicationMode, getProjectPath } = await import(
2323
'./server-environment'
2424
)
25+
const { ensureFrameworkRegistered } = await import('./framework-registry')
26+
27+
// Ensure framework is registered
28+
await ensureFrameworkRegistered()
2529

2630
const framework = getFrameworkById(projectOptions.framework)!
2731
if (!framework) {
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
let frameworkRegistered = false
2+
3+
export async function ensureFrameworkRegistered() {
4+
if (frameworkRegistered) {
5+
return
6+
}
7+
8+
const { registerFramework } = await import('@tanstack/cta-engine')
9+
const { createFrameworkDefinition } = await import(
10+
'@tanstack/cta-framework-react-cra'
11+
)
12+
13+
registerFramework(createFrameworkDefinition())
14+
frameworkRegistered = true
15+
}

src/forge/engine-handling/generate-initial-payload.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ export async function generateInitialPayload() {
3636
getProjectPath,
3737
getRegistry: getRegistryURL,
3838
} = await import('./server-environment')
39+
const { ensureFrameworkRegistered } = await import('./framework-registry')
40+
41+
// Ensure framework is registered
42+
await ensureFrameworkRegistered()
3943

4044
const projectPath = getProjectPath()
4145
const applicationMode = getApplicationMode()

src/forge/tools.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ export const getTools = async (convex: ConvexHttpClient, projectId: string) => {
4747
const { setServerEnvironment } = await import(
4848
'~/forge/engine-handling/server-environment'
4949
)
50+
const { ensureFrameworkRegistered } = await import(
51+
'~/forge/engine-handling/framework-registry'
52+
)
53+
54+
// Ensure framework is registered
55+
await ensureFrameworkRegistered()
5056

5157
const projectFiles = await convex.query(api.forge.getProjectFiles, {
5258
projectId: projectId as Id<'forge_projects'>,

src/routes/_libraries/account.tsx

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1-
import { FaSignOutAlt } from 'react-icons/fa'
2-
import { Authenticated, Unauthenticated, useMutation } from 'convex/react'
1+
import {
2+
FaSignOutAlt,
3+
FaKey,
4+
FaPlus,
5+
FaEdit,
6+
FaTrash,
7+
FaToggleOn,
8+
FaToggleOff,
9+
} from 'react-icons/fa'
10+
import {
11+
Authenticated,
12+
Unauthenticated,
13+
useMutation,
14+
useQuery,
15+
} from 'convex/react'
316
import { Link, redirect, createFileRoute } from '@tanstack/react-router'
417
import { authClient } from '~/utils/auth.client'
518
import { useCurrentUserQuery } from '~/hooks/useCurrentUser'

0 commit comments

Comments
 (0)