Update

GitOrigin-RevId: defb3f5240237e9a949797d447ec6735e4333bf8

Author: jordanhunt22

src/cli/codegen.ts

@@ -35,6 +35,8 @@ export const codegen = new Command("codegen")
       "Generate CommonJS modules (CJS) instead of ECMAScript modules, the default. Bundlers typically take care of this conversion while bundling, so this setting is generally only useful for projects which do not use a bundler, typically Node.js projects. Convex functions can be written with either syntax.",
     ).hideHelp(),
   )
+  // Only for doing codegen on system UDFs
+  .addOption(new Option("--system-udfs").hideHelp())
   .action(async (options) => {
     const ctx = await oneoffContext(options);
     const deploymentSelection = await getDeploymentSelection(ctx, options);
@@ -49,5 +51,6 @@ export const codegen = new Command("codegen")
       adminKey: options.adminKey,
       liveComponentSources: !!options.liveComponentSources,
       debugNodeApis: false,
+      systemUdfs: !!options.systemUdfs,
     });
   });

src/cli/lib/codegen.ts

@@ -47,6 +47,7 @@ export type CodegenOptions = {
   commonjs: boolean;
   liveComponentSources: boolean;
   debugNodeApis: boolean;
+  systemUdfs: boolean;
 };
 
 export async function doCodegenForNewProject(ctx: Context) {
@@ -317,7 +318,7 @@ export async function doFinalComponentCodegen(
   );
 
   if (opts?.generateCommonJSApi || projectConfig.generateCommonJSApi) {
-    const apiCjsDTSPath = path.join(codegenDir, "api_cjs.d.ts");
+    const apiCjsDTSPath = path.join(codegenDir, "api_cjs.d.cts");
     await writeFormattedFile(
       ctx,
       tmpDir,

src/cli/lib/components.ts

@@ -89,7 +89,18 @@ export async function runCodegen(
     functionsDirectoryPath,
   );
 
-  if (ctx.fs.exists(componentRootPath)) {
+  if (options.init) {
+    await doInitCodegen(ctx, functionsDirectoryPath, false, {
+      dryRun: options.dryRun,
+      debug: options.debug,
+    });
+  }
+
+  if (
+    (ctx.fs.exists(componentRootPath) ||
+      process.env.USE_LEGACY_PUSH === undefined) &&
+    !options.systemUdfs
+  ) {
     // Early exit for a better error message trying to use a preview key.
     if (deploymentSelection.kind === "preview") {
       return await ctx.crash({
@@ -126,13 +137,6 @@ export async function runCodegen(
       },
     );
   } else {
-    if (options.init) {
-      await doInitCodegen(ctx, functionsDirectoryPath, false, {
-        dryRun: options.dryRun,
-        debug: options.debug,
-      });
-    }
-
     if (options.typecheck !== "disable") {
       logMessage(chalk.gray("Running TypeScript typecheck…"));
     }
@@ -150,12 +154,12 @@ export async function runPush(ctx: Context, options: PushOptions) {
   const convexDir = functionsDir(configPath, projectConfig);
   const componentRootPath = await findComponentRootPath(ctx, convexDir);
   if (
-    ctx.fs.exists(componentRootPath) ||
-    process.env.USE_COMPONENTS_PUSH === "true"
+    !ctx.fs.exists(componentRootPath) &&
+    process.env.USE_LEGACY_PUSH !== undefined
   ) {
-    await runComponentsPush(ctx, options, configPath, projectConfig);
-  } else {
     await runNonComponentsPush(ctx, options, configPath, projectConfig);
+  } else {
+    await runComponentsPush(ctx, options, configPath, projectConfig);
   }
 }
 

src/cli/lib/components/definition/bundle.ts

@@ -55,7 +55,7 @@ function virtualConfig({
         async (_args) => {
           return {
             contents: VIRTUAL_CONFIG_CONTENTS,
-            resolveDir: rootComponentDirectory.path,
+            resolveDir: path.dirname(rootComponentDirectory.path),
           };
         },
       );
@@ -296,8 +296,7 @@ export async function componentGraph(
     });
   }
   for (const warning of result.warnings) {
-    // eslint-disable-next-line no-console
-    console.log(chalk.yellow(`esbuild warning: ${warning.text}`));
+    logWarning(chalk.yellow(`esbuild warning: ${warning.text}`));
   }
   return await findComponentDependencies(ctx, result.metafile);
 }
@@ -435,8 +434,7 @@ export async function bundleDefinitions(
     });
   }
   for (const warning of result.warnings) {
-    // eslint-disable-next-line no-console
-    console.log(chalk.yellow(`esbuild warning: ${warning.text}`));
+    logWarning(chalk.yellow(`esbuild warning: ${warning.text}`));
   }
 
   const outputs: {