Enable components in js-integration-tests (#27632)

GitOrigin-RevId: 6a3c452b4fc133911b9ad7af8ab24c7674815711

Author: emmaling27

crates/application/src/tests/components.rs

@@ -66,7 +66,7 @@ use crate::{
     Application,
 };
 
-// $ COMPONENTS_ENABLED=true cargo test -p application --lib -- --ignored
+// $ cargo test -p application --lib -- --ignored
 // component_v8 --nocapture
 #[ignore]
 #[convex_macro::test_runtime]

crates/common/src/components/mod.rs

@@ -1,9 +1,5 @@
-use std::{
-    str::FromStr,
-    sync::LazyLock,
-};
+use std::str::FromStr;
 
-use cmd_util::env::env_config;
 use value::{
     InternalId,
     TableNamespace,
@@ -35,9 +31,6 @@ pub use self::{
     },
 };
 
-pub static COMPONENTS_ENABLED: LazyLock<bool> =
-    LazyLock::new(|| env_config("COMPONENTS_ENABLED", false));
-
 // Globally unique system-assigned ID for a component.
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub enum ComponentId {

npm-packages/convex/src/cli/deploy.ts

@@ -21,7 +21,7 @@ import {
   isNonProdBuildEnvironment,
   suggestedEnvVarName,
 } from "./lib/envvars.js";
-import { PushOptions, runPush } from "./lib/push.js";
+import { PushOptions } from "./lib/push.js";
 import {
   CONVEX_DEPLOY_KEY_ENV_VAR_NAME,
   bigBrainAPI,
@@ -36,6 +36,7 @@ import {
   getConfiguredDeploymentFromEnvVar,
   isPreviewDeployKey,
 } from "./lib/deployment.js";
+import { runPush } from "./lib/components.js";
 
 export const deploy = new Command("deploy")
   .summary("Deploy to your prod deployment")
@@ -229,7 +230,6 @@ async function deployToNewPreviewDeployment(
     debugBundlePath: options.debugBundlePath,
     codegen: options.codegen === "enable",
     url: previewUrl,
-    enableComponents: false,
   };
   showSpinner(ctx, `Deploying to ${previewUrl}...`);
   await runPush(oneoffContext, pushOptions);
@@ -317,7 +317,6 @@ async function deployToExistingDeployment(
     debugBundlePath: options.debugBundlePath,
     codegen: options.codegen === "enable",
     url,
-    enableComponents: false,
   };
   showSpinner(
     ctx,

npm-packages/convex/src/cli/dev.ts

@@ -15,7 +15,7 @@ import {
 } from "../bundler/context.js";
 import { deploymentCredentialsOrConfigure } from "./configure.js";
 import { checkAuthorization, performLogin } from "./lib/login.js";
-import { PushOptions, runPush } from "./lib/push.js";
+import { PushOptions } from "./lib/push.js";
 import {
   formatDuration,
   getCurrentTimeString,
@@ -27,7 +27,7 @@ import { watchLogs } from "./lib/logs.js";
 import { runFunctionAndLog, subscribe } from "./lib/run.js";
 import { Value } from "../values/index.js";
 import { usageStateWarning } from "./lib/usage.js";
-import { runComponentsPush } from "./lib/components.js";
+import { runPush } from "./lib/components.js";
 
 export const dev = new Command("dev")
   .summary("Develop against a dev deployment, watching for changes")
@@ -96,7 +96,6 @@ export const dev = new Command("dev")
   .addOption(new Option("--admin-key <adminKey>").hideHelp())
   .addOption(new Option("--url <url>").hideHelp())
   .addOption(new Option("--debug-bundle-path <path>").hideHelp())
-  .addOption(new Option("--experimental-components").hideHelp())
   // Options for testing
   .addOption(new Option("--override-auth-url <url>").hideHelp())
   .addOption(new Option("--override-auth-client <id>").hideHelp())
@@ -144,7 +143,6 @@ export const dev = new Command("dev")
           debug: false,
           debugBundlePath: cmdOptions.debugBundlePath,
           codegen: cmdOptions.codegen === "enable",
-          enableComponents: !!cmdOptions.experimentalComponents,
         },
         cmdOptions,
       ),
@@ -177,11 +175,7 @@ export async function watchAndPush(
     const ctx = new WatchContext(cmdOptions.traceEvents);
     showSpinner(ctx, "Preparing Convex functions...");
     try {
-      if (options.enableComponents) {
-        await runComponentsPush(ctx, options);
-      } else {
-        await runPush(ctx, options);
-      }
+      await runPush(ctx, options);
       const end = performance.now();
       numFailures = 0;
       logFinishedStep(

npm-packages/convex/src/cli/lib/components.ts

@@ -1,9 +1,13 @@
 import path from "path";
 import { Context, changeSpinner, logError } from "../../bundler/context.js";
-import { configFromProjectConfig, readProjectConfig } from "./config.js";
+import {
+  ProjectConfig,
+  configFromProjectConfig,
+  readProjectConfig,
+} from "./config.js";
 import { finishPush, startPush, waitForSchema } from "./deploy2.js";
 import { version } from "../version.js";
-import { PushOptions } from "./push.js";
+import { PushOptions, runNonComponentsPush } from "./push.js";
 import { ensureHasConvexDependency, functionsDir } from "./utils.js";
 import {
   bundleDefinitions,
@@ -21,16 +25,30 @@ import {
 } from "./deployApi/definitionConfig.js";
 import { typeCheckFunctionsInMode } from "./typecheck.js";
 import { withTmpDir } from "../../bundler/fs.js";
+import { ROOT_DEFINITION_FILENAME } from "./components/constants.js";
 
-export async function runComponentsPush(ctx: Context, options: PushOptions) {
+export async function runPush(ctx: Context, options: PushOptions) {
   const { configPath, projectConfig } = await readProjectConfig(ctx);
+  const convexDir = functionsDir(configPath, projectConfig);
+  const componentRootPath = path.resolve(
+    path.join(convexDir, ROOT_DEFINITION_FILENAME),
+  );
+  if (ctx.fs.exists(componentRootPath)) {
+    await runComponentsPush(ctx, options, configPath, projectConfig);
+  } else {
+    await runNonComponentsPush(ctx, options, configPath, projectConfig);
+  }
+}
+
+export async function runComponentsPush(
+  ctx: Context,
+  options: PushOptions,
+  configPath: string,
+  projectConfig: ProjectConfig,
+) {
   const verbose = options.verbose || options.dryRun;
   await ensureHasConvexDependency(ctx, "push");
 
-  if (!options.codegen) {
-    logError(ctx, "disabling codegen not allowed");
-    await ctx.crash(1, "fatal");
-  }
   if (options.dryRun) {
     logError(ctx, "dryRun not allowed yet");
     await ctx.crash(1, "fatal");
@@ -39,10 +57,6 @@ export async function runComponentsPush(ctx: Context, options: PushOptions) {
     logError(ctx, "debugBundlePath not allowed yet");
     await ctx.crash(1, "fatal");
   }
-  if (!options.enableComponents) {
-    logError(ctx, "enableComponents must be true");
-    await ctx.crash(1, "fatal");
-  }
 
   const convexDir = functionsDir(configPath, projectConfig);
 

npm-packages/convex/src/cli/lib/push.ts

@@ -8,11 +8,11 @@ import {
 import { doCodegen } from "./codegen.js";
 import {
   Config,
+  ProjectConfig,
   configFromProjectConfig,
   diffConfig,
   pullConfig,
   pushConfig,
-  readProjectConfig,
 } from "./config.js";
 import { pushSchema } from "./indexes.js";
 import { typeCheckFunctionsInMode } from "./typecheck.js";
@@ -28,12 +28,15 @@ export type PushOptions = {
   debugBundlePath?: string;
   codegen: boolean;
   url: string;
-  enableComponents: boolean;
 };
 
-export async function runPush(ctx: Context, options: PushOptions) {
+export async function runNonComponentsPush(
+  ctx: Context,
+  options: PushOptions,
+  configPath: string,
+  projectConfig: ProjectConfig,
+) {
   const timeRunPushStarts = performance.now();
-  const { configPath, projectConfig } = await readProjectConfig(ctx);
   const origin = options.url;
   const verbose = options.verbose || options.dryRun;
   await ensureHasConvexDependency(ctx, "push");

npm-packages/convex/src/cli/run.ts

@@ -78,7 +78,6 @@ export const run = new Command("run")
           debug: false,
           codegen: options.codegen === "enable",
           url: deploymentUrl,
-          enableComponents: false,
         },
         {
           once: true,

npm-packages/convex/src/server/components/index.ts

@@ -233,8 +233,9 @@ export function defineComponent<Args extends PropertyValidators = {}>(
 }
 
 /**
- * @internal
+ * Experimental - DO NOT USE.
  */
+// TODO Make this not experimental.
 export function defineApp(): AppDefinition {
   const ret: RuntimeAppDefinition = {
     _isRoot: true,