Vendor more dependencies (#41370)

thomasballinger · Convex, Inc. · commit 3744cb1c5100 · 2025-09-29T18:34:55.000Z
GitOrigin-RevId: b829293b328e5222eea7f567233c5e383f2379ce
diff --git a/npm-packages/common/config/rush/pnpm-lock.yaml b/npm-packages/common/config/rush/pnpm-lock.yaml
diff --git a/npm-packages/common/config/rush/repo-state.json b/npm-packages/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
   "preferredVersionsHash": "9e868af9e9249b1e68ae3b3da499e674c39e4cdc",
-  "packageJsonInjectedDependenciesHash": "4b5e08be616b0eaa4c000c646358f9595faf4254"
+  "packageJsonInjectedDependenciesHash": "dcb042a25a8e5fa8e6c99cf88895ec9b51de2ff9"
 }
diff --git a/npm-packages/convex/.prettierignore b/npm-packages/convex/.prettierignore
@@ -8,3 +8,4 @@ management-openapi.json
 log-stream-openapi.json
 src/cli/generatedApi.ts
 src/cli/lib/generatedLogStreamApi.ts
+src/vendor
diff --git a/npm-packages/convex/eslint.config.mjs b/npm-packages/convex/eslint.config.mjs
@@ -36,6 +36,8 @@ export default [
       ".prettierrc.js",
       "eslint.config.mjs",
       "jest.config.mjs",
+      // we could ignore everything in vendor
+      "src/vendor/progress",
     ],
   },
   ...compat.plugins("require-extensions"),
diff --git a/npm-packages/convex/package.json b/npm-packages/convex/package.json
@@ -279,7 +279,6 @@
     "@types/deep-equal": "1.0.4",
     "@types/inquirer": "^9.0.0",
     "@types/node": "^18.17.0",
-    "@types/progress": "~2.0.7",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "@types/semver": "^7.3.13",
@@ -295,7 +294,6 @@
     "depcheck": "~1.4.7",
     "detect-port": "^2.1.0",
     "dotenv": "^16.4.7",
-    "encoding": "^0.1.13",
     "esbuild": "0.25.4",
     "esbuild-plugin-external-global": "~1.0.1",
     "eslint": "9.32.0",
@@ -320,14 +318,12 @@
     "openid-client": "^5.3.1",
     "ora": "^8.1.1",
     "prettier": "3.6.2",
-    "progress": "~2.0.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "semver": "^7.6.0",
     "serve-handler": "~6.1.6",
     "shx": "~0.3.4",
     "skott": "~0.35.4",
-    "strip-ansi": "^7.0.1",
     "tar": "^7.4.3",
     "tsx": "^4.19.4",
     "typedoc": "^0.24.6",
diff --git a/npm-packages/convex/src/bundler/log.ts b/npm-packages/convex/src/bundler/log.ts
@@ -1,6 +1,9 @@
 import { format } from "util";
 import chalk from "chalk";
-import ProgressBar from "progress";
+import ProgressBar, {
+  ProgressBarInstance,
+  ProgressBarOptions,
+} from "../vendor/progress/index.js";
 import ora, { Ora } from "ora";
 
 let spinner: Ora | null = null;
@@ -51,8 +54,8 @@ export function logVerbose(...logged: any) {
  */
 export function startLogProgress(
   format: string,
-  progressBarOptions: ProgressBar.ProgressBarOptions,
-): ProgressBar {
+  progressBarOptions: ProgressBarOptions,
+): ProgressBarInstance {
   spinner?.clear();
   return new ProgressBar(format, progressBarOptions);
 }
diff --git a/npm-packages/convex/src/cli/lib/config.test.ts b/npm-packages/convex/src/cli/lib/config.test.ts
@@ -2,7 +2,7 @@ import { vi, test, expect } from "vitest";
 import { parseProjectConfig } from "./config.js";
 import { oneoffContext } from "../../bundler/context.js";
 import { logFailure } from "../../bundler/log.js";
-import stripAnsi from "strip-ansi";
+import { stripVTControlCharacters } from "util";
 
 test("parseProjectConfig", async () => {
   // Make a context that throws on crashes so we can detect them.
@@ -30,7 +30,7 @@ test("parseProjectConfig", async () => {
   const assertParseError = async (inp: any, err: string) => {
     await expect(parseProjectConfig(ctx, inp)).rejects.toThrow();
     const calledWith = stderrSpy.mock.calls as string[][];
-    expect(stripAnsi(calledWith[0][0])).toEqual(err);
+    expect(stripVTControlCharacters(calledWith[0][0])).toEqual(err);
   };
 
   await assertParses({
diff --git a/npm-packages/convex/src/cli/lib/localDeployment/download.ts b/npm-packages/convex/src/cli/lib/localDeployment/download.ts
@@ -24,7 +24,7 @@ import { TempPath, nodeFs, withTmpDir } from "../../../bundler/fs.js";
 import { components } from "@octokit/openapi-types";
 import { recursivelyDelete, recursivelyCopy } from "../fsUtils.js";
 import { LocalDeploymentError } from "./errors.js";
-import ProgressBar from "progress";
+import type { ProgressBarInstance } from "../../../vendor/progress/index.js";
 import path from "path";
 
 async function makeExecutable(p: string) {
@@ -325,7 +325,7 @@ async function downloadZipFile(
     response.headers.get("content-length") ?? "",
     10,
   );
-  let progressBar: ProgressBar | null = null;
+  let progressBar: ProgressBarInstance | null = null;
   if (!isNaN(contentLength) && contentLength !== 0 && process.stdout.isTTY) {
     progressBar = startLogProgress(
       `Downloading ${nameForLogging} [:bar] :percent :etas`,
diff --git a/npm-packages/convex/src/cli/lib/localDeployment/run.test.ts b/npm-packages/convex/src/cli/lib/localDeployment/run.test.ts
@@ -3,7 +3,7 @@ import { oneoffContext } from "../../../bundler/context.js";
 import { logFailure } from "../../../bundler/log.js";
 import { findLatestVersionWithBinary } from "./download.js";
 import { components } from "@octokit/openapi-types";
-import stripAnsi from "strip-ansi";
+import { stripVTControlCharacters } from "util";
 
 async function setupContext() {
   const originalContext = await oneoffContext({
@@ -62,7 +62,7 @@ test("findLatestVersionWithBinary", async () => {
       "https://api.github.com/repos/get-convex/convex-backend/releases?per_page=30",
     );
     const calledWith = stderrSpy.mock.calls as string[][];
-    const err = stripAnsi(calledWith[0][0]);
+    const err = stripVTControlCharacters(calledWith[0][0]);
     fetchSpy.mockRestore();
     stderrSpy.mockClear();
     return err;
diff --git a/npm-packages/convex/src/cli/lib/utils/sentry.ts b/npm-packages/convex/src/cli/lib/utils/sentry.ts
@@ -1,8 +1,8 @@
 import "@sentry/tracing";
 import { productionProvisionHost, provisionHost } from "../config.js";
-import stripAnsi from "strip-ansi";
 import * as Sentry from "@sentry/node";
 import { version } from "../../../index.js";
+import { stripVTControlCharacters } from "util";
 
 export const SENTRY_DSN =
   "https://f9fa0306e3d540079cf40ce8c2ad9644@o1192621.ingest.sentry.io/6390839";
@@ -19,7 +19,7 @@ export function initSentry() {
       beforeBreadcrumb: (breadcrumb) => {
         // Strip ANSI color codes from log lines that are sent as breadcrumbs.
         if (breadcrumb.message) {
-          breadcrumb.message = stripAnsi(breadcrumb.message);
+          breadcrumb.message = stripVTControlCharacters(breadcrumb.message);
         }
         return breadcrumb;
       },
diff --git a/npm-packages/convex/src/react/auth_websocket.test.tsx b/npm-packages/convex/src/react/auth_websocket.test.tsx
@@ -28,7 +28,7 @@ const testReactClient = (address: string, options?: ConvexReactClientOptions) =>
 // https://linear.app/convex/issue/ENG-7052/re-enable-auth-websocket-client-tests
 
 // On Linux these can retry forever due to EADDRINUSE so run then sequentially.
--describe.sequential.skip("auth websocket tests", () => {
+describe.sequential.skip("auth websocket tests", () => {
   // This is the path usually taken on page load after a user logged in,
   // with a constant token provider.
   test("Authenticate via valid static token", async () => {
diff --git a/npm-packages/convex/src/vendor/README.md b/npm-packages/convex/src/vendor/README.md
@@ -14,3 +14,5 @@ We're currently vendoring just a few libraries:
 1. jwt-decode which has caused some users trouble when installing deps
 1. jwt-encode is gone from GitHub, very short, and the published version uses an
    old crypto lib we can avoid using by vendoring and swapping it out.
+1. progress is by good old TJ but it hasn't been published in 7 years and is
+   tiny.
diff --git a/npm-packages/convex/src/vendor/progress/LICENSE b/npm-packages/convex/src/vendor/progress/LICENSE
@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2017 TJ Holowaychuk <tj@vision-media.ca>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/npm-packages/convex/src/vendor/progress/index.ts b/npm-packages/convex/src/vendor/progress/index.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.`
`2`	`2`	`{`
`3`	`3`	`"preferredVersionsHash": "9e868af9e9249b1e68ae3b3da499e674c39e4cdc",`
`4`		`- "packageJsonInjectedDependenciesHash": "4b5e08be616b0eaa4c000c646358f9595faf4254"`
	`4`	`+ "packageJsonInjectedDependenciesHash": "dcb042a25a8e5fa8e6c99cf88895ec9b51de2ff9"`
`5`	`5`	`}`