[Components] Remove the non-components push path (#42972)

We put out a release ~2 weeks ago that moved all customers to the new push path. The rollout has gone smoothly, so we can delete the old path now. We will only have to maintain one path now!

GitOrigin-RevId: 62a1841a97cfd5005da6176f774986ae402b93ff

Author: jordanhunt22

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

@@ -11,7 +11,7 @@ import {
   isNonProdBuildEnvironment,
   suggestedEnvVarName,
 } from "./lib/envvars.js";
-import { PushOptions } from "./lib/push.js";
+import { PushOptions } from "./lib/components.js";
 import {
   CONVEX_DEPLOY_KEY_ENV_VAR_NAME,
   CONVEX_SELF_HOSTED_URL_VAR_NAME,

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

@@ -43,7 +43,7 @@ import {
   rootComponentApiCJS,
 } from "../codegen_templates/component_api.js";
 import { functionsDir } from "./utils/utils.js";
-import { LargeIndexDeletionCheck } from "./push.js";
+import { LargeIndexDeletionCheck } from "./indexes.js";
 
 export type CodegenOptions = {
   url?: string | undefined;

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

@@ -21,11 +21,6 @@ import {
   waitForSchema,
 } from "./deploy2.js";
 import { version } from "../version.js";
-import {
-  LargeIndexDeletionCheck,
-  PushOptions,
-  runNonComponentsPush,
-} from "./push.js";
 import { ensureHasConvexDependency, functionsDir } from "./utils/utils.js";
 import {
   bundleDefinitions,
@@ -55,27 +50,30 @@ import {
 } from "./api.js";
 import { FinishPushDiff } from "./deployApi/finishPush.js";
 import { Reporter, Span } from "./tracing.js";
-import {
-  DEFINITION_FILENAME_JS,
-  DEFINITION_FILENAME_TS,
-} from "./components/constants.js";
+import { DEFINITION_FILENAME_TS } from "./components/constants.js";
 import { DeploymentSelection } from "./deploymentSelection.js";
 import { deploymentDashboardUrlPage } from "./dashboard.js";
-import { formatIndex } from "./indexes.js";
+import { formatIndex, LargeIndexDeletionCheck } from "./indexes.js";
 import { checkForLargeIndexDeletion } from "./checkForLargeIndexDeletion.js";
-
-async function findComponentRootPath(ctx: Context, functionsDir: string) {
-  // Default to `.ts` but fallback to `.js` if not present.
-  let componentRootPath = path.resolve(
-    path.join(functionsDir, DEFINITION_FILENAME_TS),
-  );
-  if (!ctx.fs.exists(componentRootPath)) {
-    componentRootPath = path.resolve(
-      path.join(functionsDir, DEFINITION_FILENAME_JS),
-    );
-  }
-  return componentRootPath;
-}
+import { LogManager } from "./logs.js";
+
+export type PushOptions = {
+  adminKey: string;
+  verbose: boolean;
+  dryRun: boolean;
+  typecheck: "enable" | "try" | "disable";
+  typecheckComponents: boolean;
+  debug: boolean;
+  debugBundlePath?: string | undefined;
+  debugNodeApis: boolean;
+  codegen: boolean;
+  url: string;
+  deploymentName: string | null;
+  writePushRequest?: string | undefined;
+  liveComponentSources: boolean;
+  logManager?: LogManager | undefined;
+  largeIndexDeletionCheck: LargeIndexDeletionCheck;
+};
 
 export async function runCodegen(
   ctx: Context,
@@ -88,23 +86,14 @@ export async function runCodegen(
   const { configPath, projectConfig } = await readProjectConfig(ctx);
   const functionsDirectoryPath = functionsDir(configPath, projectConfig);
 
-  const componentRootPath = await findComponentRootPath(
-    ctx,
-    functionsDirectoryPath,
-  );
-
   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
-  ) {
+  if (!options.systemUdfs) {
     // Early exit for a better error message trying to use a preview key.
     if (deploymentSelection.kind === "preview") {
       return await ctx.crash({
@@ -155,16 +144,7 @@ export async function runCodegen(
 
 export async function runPush(ctx: Context, options: PushOptions) {
   const { configPath, projectConfig } = await readProjectConfig(ctx);
-  const convexDir = functionsDir(configPath, projectConfig);
-  const componentRootPath = await findComponentRootPath(ctx, convexDir);
-  if (
-    !ctx.fs.exists(componentRootPath) &&
-    process.env.USE_LEGACY_PUSH !== undefined
-  ) {
-    await runNonComponentsPush(ctx, options, configPath, projectConfig);
-  } else {
-    await runComponentsPush(ctx, options, configPath, projectConfig);
-  }
+  await runComponentsPush(ctx, options, configPath, projectConfig);
 }
 
 async function startComponentsPushAndCodegen(

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

@@ -32,8 +32,6 @@ import {
   currentPackageHomepage,
 } from "./utils/utils.js";
 import { createHash } from "crypto";
-import { promisify } from "util";
-import zlib from "zlib";
 import { recursivelyDelete } from "./fsUtils.js";
 import { NodeDependency } from "./deployApi/modules.js";
 import { ComponentDefinitionPath } from "./components/definition/directoryStructure.js";
@@ -45,8 +43,6 @@ import { debugIsolateBundlesSerially } from "../../bundler/debugBundle.js";
 import { ensureWorkosEnvironmentProvisioned } from "./workos/workos.js";
 export { productionProvisionHost, provisionHost } from "./utils/utils.js";
 
-const brotli = promisify(zlib.brotliCompress);
-
 /** Type representing auth configuration. */
 export interface AuthInfo {
   // Provider-specific application identifier. Corresponds to the `aud` field in an OIDC token.
@@ -801,114 +797,6 @@ export type AppDefinitionSpecWithoutImpls = Omit<
   "schema" | "functions" | "auth"
 >;
 
-export function configJSON(
-  config: Config,
-  adminKey: string,
-  schemaId?: string,
-  pushMetrics?: PushMetrics,
-  bundledModuleInfos?: BundledModuleInfo[],
-) {
-  // Override origin with the url
-  const projectConfig = {
-    projectSlug: config.projectConfig.project,
-    teamSlug: config.projectConfig.team,
-    functions: config.projectConfig.functions,
-    authInfo: config.projectConfig.authInfo,
-  };
-  return {
-    config: projectConfig,
-    modules: config.modules,
-    nodeDependencies: config.nodeDependencies,
-    udfServerVersion: config.udfServerVersion,
-    schemaId,
-    adminKey,
-    pushMetrics,
-    bundledModuleInfos,
-    nodeVersion: config.nodeVersion,
-  };
-}
-
-// Time in seconds of various spans of time during a push.
-export type PushMetrics = {
-  typecheck: number;
-  bundle: number;
-  schemaPush: number;
-  codePull: number;
-  totalBeforePush: number;
-};
-
-/** Push configuration to the given remote origin. */
-export async function pushConfig(
-  ctx: Context,
-  config: Config,
-  options: {
-    adminKey: string;
-    url: string;
-    deploymentName: string | null;
-    pushMetrics?: PushMetrics | undefined;
-    schemaId?: string | undefined;
-    bundledModuleInfos?: BundledModuleInfo[];
-  },
-): Promise<void> {
-  const serializedConfig = configJSON(
-    config,
-    options.adminKey,
-    options.schemaId,
-    options.pushMetrics,
-    options.bundledModuleInfos,
-  );
-  const fetch = deploymentFetch(ctx, {
-    deploymentUrl: options.url,
-    adminKey: options.adminKey,
-  });
-  try {
-    if (config.nodeDependencies.length > 0) {
-      changeSpinner(
-        "Installing external packages and deploying source code...",
-      );
-    } else {
-      changeSpinner("Analyzing and deploying source code...");
-    }
-    await fetch("/api/push_config", {
-      body: await brotli(JSON.stringify(serializedConfig), {
-        params: {
-          [zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT,
-          [zlib.constants.BROTLI_PARAM_QUALITY]: 4,
-        },
-      }),
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "Content-Encoding": "br",
-      },
-    });
-  } catch (error: unknown) {
-    await handlePushConfigError(
-      ctx,
-      error,
-      "Error: Unable to push deployment config to " + options.url,
-      options.deploymentName,
-      {
-        adminKey: options.adminKey,
-        deploymentUrl: options.url,
-        deploymentNotice: "",
-      },
-    );
-  }
-}
-
-type Files = { source: string; filename: string }[];
-
-export type CodegenResponse =
-  | {
-      success: true;
-      files: Files;
-    }
-  | {
-      success: false;
-      error: string;
-    };
-
 function renderModule(module: {
   path: string;
   sourceMapSize: number;

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

@@ -27,7 +27,7 @@ import { finishPushDiff, FinishPushDiff } from "./deployApi/finishPush.js";
 import { Reporter, Span } from "./tracing.js";
 import { promisify } from "node:util";
 import zlib from "node:zlib";
-import { PushOptions } from "./push.js";
+import { PushOptions } from "./components.js";
 import { runPush } from "./components.js";
 import { suggestedEnvVarName } from "./envvars.js";
 import { runSystemQuery } from "./run.js";

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

@@ -13,7 +13,7 @@ import { runPush } from "./components.js";
 import { performance } from "perf_hooks";
 import path from "path";
 import { LogManager, LogMode, watchLogs } from "./logs.js";
-import { PushOptions } from "./push.js";
+import { PushOptions } from "./components.js";
 import {
   formatDuration,
   getCurrentTimeString,

npm-packages/convex/src/cli/lib/indexes.test.ts

@@ -1,86 +1,7 @@
 import { describe, test, expect } from "vitest";
-import {
-  IndexMetadata,
-  toDeveloperIndexConfig,
-  formatIndex,
-} from "./indexes.js";
 import { DeveloperIndexConfig } from "./deployApi/finishPush.js";
 import chalk from "chalk";
-
-describe("toDeveloperIndexConfig", () => {
-  test("converts database IndexMetadata to DeveloperIndexConfig", () => {
-    const databaseIndex: IndexMetadata = {
-      table: "messages",
-      name: "by_user_and_timestamp",
-      fields: ["userId", "timestamp"],
-      backfill: {
-        state: "done",
-      },
-      staged: false,
-    };
-
-    const result = toDeveloperIndexConfig(databaseIndex);
-
-    expect(result).toEqual({
-      type: "database",
-      name: "messages.by_user_and_timestamp",
-      fields: ["userId", "timestamp"],
-      staged: false,
-    });
-  });
-
-  test("converts text search IndexMetadata to DeveloperIndexConfig", () => {
-    const searchIndex: IndexMetadata = {
-      table: "articles",
-      name: "search_by_content",
-      fields: {
-        searchField: "content",
-        filterFields: ["category", "status"],
-      },
-      backfill: {
-        state: "done",
-      },
-      staged: false,
-    };
-
-    const result = toDeveloperIndexConfig(searchIndex);
-
-    expect(result).toEqual({
-      type: "search",
-      name: "articles.search_by_content",
-      searchField: "content",
-      filterFields: ["category", "status"],
-      staged: false,
-    });
-  });
-
-  test("converts vector search IndexMetadata to DeveloperIndexConfig", () => {
-    const vectorIndex: IndexMetadata = {
-      table: "documents",
-      name: "embedding_index",
-      fields: {
-        dimensions: 1536,
-        vectorField: "embedding",
-        filterFields: ["userId", "type"],
-      },
-      backfill: {
-        state: "done",
-      },
-      staged: true,
-    };
-
-    const result = toDeveloperIndexConfig(vectorIndex);
-
-    expect(result).toEqual({
-      type: "vector",
-      name: "documents.embedding_index",
-      dimensions: 1536,
-      vectorField: "embedding",
-      filterFields: ["userId", "type"],
-      staged: true,
-    });
-  });
-});
+import { formatIndex } from "./indexes.js";
 
 describe("formatIndex", () => {
   test("formats database index with multiple fields", () => {