login working again

Author: jherr

src/cta/lib/engine-handling/add-to-app-wrapper.ts

@@ -1,35 +1,32 @@
 import { resolve } from 'node:path'
-
-import {
-  CONFIG_FILE,
-  addToApp,
-  createAppOptionsFromPersisted,
-  createDefaultEnvironment,
-  createSerializedOptionsFromPersisted,
-  readConfigFile,
-  recursivelyGatherFiles,
-  writeConfigFileToEnvironment,
-} from '@tanstack/cta-engine'
-
 import { TMP_TARGET_DIR } from '../constants'
-
-import { cleanUpFileArray, cleanUpFiles } from './file-helpers'
-import { getProjectPath } from './server-environment'
-import { createAppWrapper } from './create-app-wrapper'
-
-import type { Environment } from '@tanstack/cta-engine'
 import type { Response } from 'express'
 import type { DryRunOutput } from '../types'
-import { createMemoryEnvironment } from './memory-environment'
 
 export async function addToAppWrapper(
   addOns: Array<string>,
   opts: {
     dryRun?: boolean
     response?: Response
-    environmentFactory?: () => Environment
+    environmentFactory?: () => any
   }
 ) {
+  // Dynamically import CTA engine to prevent client bundling
+  const {
+    CONFIG_FILE,
+    addToApp,
+    createAppOptionsFromPersisted,
+    createDefaultEnvironment,
+    createSerializedOptionsFromPersisted,
+    readConfigFile,
+    recursivelyGatherFiles,
+    writeConfigFileToEnvironment,
+  } = await import('@tanstack/cta-engine')
+  const { cleanUpFileArray, cleanUpFiles } = await import('./file-helpers')
+  const { getProjectPath } = await import('./server-environment')
+  const { createAppWrapper } = await import('./create-app-wrapper')
+  const { createMemoryEnvironment } = await import('./memory-environment')
+
   const projectPath = getProjectPath()
 
   const persistedOptions = await readConfigFile(projectPath)

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

@@ -1,42 +1,35 @@
 import { resolve } from 'node:path'
-
-import {
-  createApp,
-  createDefaultEnvironment,
-  finalizeAddOns,
-  getFrameworkById,
-  loadStarter,
-} from '@tanstack/cta-engine'
-
 import { TMP_TARGET_DIR } from '../constants'
-
-import { cleanUpFileArray, cleanUpFiles } from './file-helpers'
-import { getApplicationMode, getProjectPath } from './server-environment'
-
-import type {
-  Environment,
-  Options,
-  SerializedOptions,
-  Starter,
-} from '@tanstack/cta-engine'
-
 import type { Response } from 'express'
-import { createMemoryEnvironment } from './memory-environment'
 
 export async function createAppWrapper(
-  projectOptions: SerializedOptions,
+  projectOptions: any,
   opts: {
     dryRun?: boolean
     response?: Response
-    environmentFactory?: () => Environment
+    environmentFactory?: () => any
   }
 ) {
+  // Dynamically import CTA engine to prevent client bundling
+  const {
+    createApp,
+    createDefaultEnvironment,
+    finalizeAddOns,
+    getFrameworkById,
+    loadStarter,
+  } = await import('@tanstack/cta-engine')
+  const { cleanUpFileArray, cleanUpFiles } = await import('./file-helpers')
+  const { getApplicationMode, getProjectPath } = await import(
+    './server-environment'
+  )
+  const { createMemoryEnvironment } = await import('./memory-environment')
+
   const framework = getFrameworkById(projectOptions.framework)!
   if (!framework) {
     throw new Error(`Framework ${projectOptions.framework} not found`)
   }
 
-  let starter: Starter | undefined
+  let starter: any | undefined
   const addOns: Array<string> = [...projectOptions.chosenAddOns]
   if (projectOptions.starter) {
     starter = await loadStarter(projectOptions.starter)

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

@@ -1,30 +1,7 @@
 import { basename, resolve } from 'node:path'
-
-import {
-  createSerializedOptionsFromPersisted,
-  getAllAddOns,
-  getFrameworkById,
-  getRawRegistry,
-  getRegistryAddOns,
-  readConfigFile,
-  recursivelyGatherFiles,
-} from '@tanstack/cta-engine'
-
-import { cleanUpFiles } from './file-helpers'
-import { createAppWrapper } from './create-app-wrapper'
-import {
-  getApplicationMode,
-  getForcedAddOns,
-  getForcedRouterMode,
-  getProjectOptions,
-  getProjectPath,
-  getRegistry as getRegistryURL,
-} from './server-environment'
-
-import type { AddOn, SerializedOptions } from '@tanstack/cta-engine'
 import type { AddOnInfo } from '../types'
 
-function convertAddOnToAddOnInfo(addOn: AddOn): AddOnInfo {
+function convertAddOnToAddOnInfo(addOn: any): AddOnInfo {
   return {
     id: addOn.id,
     name: addOn.name,
@@ -39,6 +16,27 @@ function convertAddOnToAddOnInfo(addOn: AddOn): AddOnInfo {
 }
 
 export async function generateInitialPayload() {
+  // Dynamically import CTA engine modules to prevent client bundling
+  const {
+    createSerializedOptionsFromPersisted,
+    getAllAddOns,
+    getFrameworkById,
+    getRawRegistry,
+    getRegistryAddOns,
+    readConfigFile,
+    recursivelyGatherFiles,
+  } = await import('@tanstack/cta-engine')
+  const { cleanUpFiles } = await import('./file-helpers')
+  const { createAppWrapper } = await import('./create-app-wrapper')
+  const {
+    getApplicationMode,
+    getForcedAddOns,
+    getForcedRouterMode,
+    getProjectOptions,
+    getProjectPath,
+    getRegistry: getRegistryURL,
+  } = await import('./server-environment')
+
   const projectPath = getProjectPath()
   const applicationMode = getApplicationMode()
 

src/forge/engine-handling/add-to-app-wrapper.ts

@@ -1,34 +1,31 @@
 import { resolve } from 'node:path'
-
-import {
-  CONFIG_FILE,
-  addToApp,
-  createAppOptionsFromPersisted,
-  createDefaultEnvironment,
-  createMemoryEnvironment,
-  createSerializedOptionsFromPersisted,
-  readConfigFile,
-  recursivelyGatherFiles,
-  writeConfigFileToEnvironment,
-} from '@tanstack/cta-engine'
-
 import { TMP_TARGET_DIR } from '~/forge/constants'
-
-import { cleanUpFileArray, cleanUpFiles } from './file-helpers'
-import { getProjectPath } from './server-environment'
-import { createAppWrapper } from './create-app-wrapper'
-
-import type { Environment } from '@tanstack/cta-engine'
 import type { DryRunOutput } from '~/forge/types'
 
 export async function addToAppWrapper(
   addOns: Array<string>,
   opts: {
     dryRun?: boolean
     stream?: boolean
-    environmentFactory?: () => Environment
+    environmentFactory?: () => any
   }
 ) {
+  // Dynamically import CTA engine to prevent client bundling
+  const {
+    CONFIG_FILE,
+    addToApp,
+    createAppOptionsFromPersisted,
+    createDefaultEnvironment,
+    createMemoryEnvironment,
+    createSerializedOptionsFromPersisted,
+    readConfigFile,
+    recursivelyGatherFiles,
+    writeConfigFileToEnvironment,
+  } = await import('@tanstack/cta-engine')
+  const { cleanUpFileArray, cleanUpFiles } = await import('./file-helpers')
+  const { getProjectPath } = await import('./server-environment')
+  const { createAppWrapper } = await import('./create-app-wrapper')
+
   const projectPath = getProjectPath()
 
   const persistedOptions = await readConfigFile(projectPath)

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

@@ -1,34 +1,28 @@
 import { resolve } from 'node:path'
-
-import {
-  createApp,
-  createDefaultEnvironment,
-  createMemoryEnvironment,
-  finalizeAddOns,
-  getFrameworkById,
-  loadStarter,
-} from '@tanstack/cta-engine'
-
 import { TMP_TARGET_DIR } from '~/forge/constants'
 
-import { cleanUpFileArray, cleanUpFiles } from './file-helpers'
-import { getApplicationMode, getProjectPath } from './server-environment'
-
-import type {
-  Environment,
-  Options,
-  SerializedOptions,
-  Starter,
-} from '@tanstack/cta-engine'
-
 export async function createAppWrapper(
-  projectOptions: SerializedOptions,
+  projectOptions: any,
   opts: {
     dryRun?: boolean
     stream?: boolean
-    environmentFactory?: () => Environment
+    environmentFactory?: () => any
   }
 ) {
+  // Dynamically import CTA engine to prevent client bundling
+  const {
+    createApp,
+    createDefaultEnvironment,
+    createMemoryEnvironment,
+    finalizeAddOns,
+    getFrameworkById,
+    loadStarter,
+  } = await import('@tanstack/cta-engine')
+  const { cleanUpFileArray, cleanUpFiles } = await import('./file-helpers')
+  const { getApplicationMode, getProjectPath } = await import(
+    './server-environment'
+  )
+
   const framework = getFrameworkById(projectOptions.framework)!
   if (!framework) {
     throw new Error(`Framework ${projectOptions.framework} not found`)

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

@@ -1,30 +1,7 @@
 import { basename, resolve } from 'node:path'
-
-import {
-  createSerializedOptionsFromPersisted,
-  getAllAddOns,
-  getFrameworkById,
-  getRawRegistry,
-  getRegistryAddOns,
-  readConfigFile,
-  recursivelyGatherFiles,
-} from '@tanstack/cta-engine'
-
-import { cleanUpFiles } from './file-helpers'
-import { createAppWrapper } from './create-app-wrapper'
-import {
-  getApplicationMode,
-  getForcedAddOns,
-  getForcedRouterMode,
-  getProjectOptions,
-  getProjectPath,
-  getRegistry as getRegistryURL,
-} from './server-environment'
-
-import type { AddOn, SerializedOptions } from '@tanstack/cta-engine'
 import type { AddOnInfo } from '~/forge/types'
 
-function convertAddOnToAddOnInfo(addOn: AddOn): AddOnInfo {
+function convertAddOnToAddOnInfo(addOn: any): AddOnInfo {
   return {
     id: addOn.id,
     name: addOn.name,
@@ -39,6 +16,27 @@ function convertAddOnToAddOnInfo(addOn: AddOn): AddOnInfo {
 }
 
 export async function generateInitialPayload() {
+  // Dynamically import CTA engine modules to prevent client bundling
+  const {
+    createSerializedOptionsFromPersisted,
+    getAllAddOns,
+    getFrameworkById,
+    getRawRegistry,
+    getRegistryAddOns,
+    readConfigFile,
+    recursivelyGatherFiles,
+  } = await import('@tanstack/cta-engine')
+  const { cleanUpFiles } = await import('./file-helpers')
+  const { createAppWrapper } = await import('./create-app-wrapper')
+  const {
+    getApplicationMode,
+    getForcedAddOns,
+    getForcedRouterMode,
+    getProjectOptions,
+    getProjectPath,
+    getRegistry: getRegistryURL,
+  } = await import('./server-environment')
+
   const projectPath = getProjectPath()
   const applicationMode = getApplicationMode()
 

src/forge/engine-handling/initialize.ts

@@ -1,33 +1,34 @@
-import { register } from '@tanstack/cta-framework-react-cra'
-
 import { setServerEnvironment } from './server-environment'
 
 let initialized = false
 
-setServerEnvironment({
-  projectPath: './',
-  mode: 'setup',
-  addOns: [],
-  options: {
-    framework: 'react-cra',
-    projectName: 'test',
-    typescript: true,
-    tailwind: true,
-    targetDir: './',
-    packageManager: 'pnpm',
-    git: true,
-    mode: 'file-router',
-    chosenAddOns: [],
-    starter: undefined,
-  },
-  forcedRouterMode: undefined,
-  forcedAddOns: ['start'],
-  registry: undefined,
-})
-
-export function initialize() {
+export async function initialize() {
   if (initialized) return
   initialized = true
 
+  // Dynamically import CTA framework to prevent client bundling
+  const { register } = await import('@tanstack/cta-framework-react-cra')
+
+  setServerEnvironment({
+    projectPath: './',
+    mode: 'setup',
+    addOns: [],
+    options: {
+      framework: 'react-cra',
+      projectName: 'test',
+      typescript: true,
+      tailwind: true,
+      targetDir: './',
+      packageManager: 'pnpm',
+      git: true,
+      mode: 'file-router',
+      chosenAddOns: [],
+      starter: undefined,
+    },
+    forcedRouterMode: undefined,
+    forcedAddOns: ['start'],
+    registry: undefined,
+  })
+
   register()
 }