Removed v2 from core/sdk

Author: matt-aitken

apps/webapp/app/services/telemetry.server.ts

@@ -1,5 +1,4 @@
 import { Job } from "@trigger.dev/database";
-import { TriggerClient } from "@trigger.dev/sdk";
 import { PostHog } from "posthog-node";
 import { env } from "~/env.server";
 import { MatchedOrganization } from "~/hooks/useOrganizations";
@@ -11,17 +10,12 @@ import { loopsClient } from "./loops.server";
 
 type Options = {
   postHogApiKey?: string;
-  trigger?: {
-    apiKey: string;
-    apiUrl: string;
-  };
 };
 
 class Telemetry {
   #posthogClient: PostHog | undefined = undefined;
-  #triggerClient: TriggerClient | undefined = undefined;
 
-  constructor({ postHogApiKey, trigger }: Options) {
+  constructor({ postHogApiKey }: Options) {
     if (env.TRIGGER_TELEMETRY_DISABLED !== undefined) {
       console.log("📉 Telemetry disabled");
       return;
@@ -32,15 +26,6 @@ class Telemetry {
     } else {
       console.log("No PostHog API key, so analytics won't track");
     }
-
-    if (trigger) {
-      this.#triggerClient = new TriggerClient({
-        id: "triggerdotdev",
-        apiKey: trigger.apiKey,
-        apiUrl: trigger.apiUrl,
-      });
-      console.log("Created telemetry TriggerClient");
-    }
   }
 
   user = {
@@ -76,13 +61,6 @@ class Telemetry {
           email: user.email,
           name: user.name,
         });
-
-        this.#triggerClient?.sendEvent({
-          name: "user.created",
-          payload: {
-            userId: user.id,
-          },
-        });
       }
     },
   };
@@ -167,14 +145,7 @@ class Telemetry {
         },
       });
     },
-    deletedJob: ({ job }: { job: Job }) => {
-      this.#triggerClient?.sendEvent({
-        name: "job.deleted",
-        payload: {
-          id: job.id,
-        },
-      });
-    },
+    deletedJob: ({ job }: { job: Job }) => {},
   };
 
   #capture(event: CaptureEvent) {
@@ -258,12 +229,5 @@ export const telemetry = singleton(
   () =>
     new Telemetry({
       postHogApiKey: env.POSTHOG_PROJECT_KEY,
-      trigger:
-        env.TELEMETRY_TRIGGER_API_KEY && env.TELEMETRY_TRIGGER_API_URL
-          ? {
-              apiKey: env.TELEMETRY_TRIGGER_API_KEY,
-              apiUrl: env.TELEMETRY_TRIGGER_API_URL,
-            }
-          : undefined,
     })
 );

packages/core/package.json

@@ -23,15 +23,9 @@
       "./package.json": "./package.json",
       ".": "./src/index.ts",
       "./logger": "./src/logger.ts",
-      "./bloom": "./src/bloom.ts",
-      "./eventFilterMatches": "./src/eventFilterMatches.ts",
-      "./replacements": "./src/replacements.ts",
-      "./requestFilterMatches": "./src/requestFilterMatches.ts",
-      "./retry": "./src/retry.ts",
       "./utils": "./src/utils.ts",
       "./schemas": "./src/schemas/index.ts",
       "./types": "./src/types.ts",
-      "./versions": "./src/versions.ts",
       "./v3": "./src/v3/index.ts",
       "./v3/tracer": "./src/v3/tracer.ts",
       "./v3/build": "./src/v3/build/index.ts",
@@ -67,21 +61,6 @@
       "logger": [
         "dist/commonjs/logger.d.ts"
       ],
-      "bloom": [
-        "dist/commonjs/bloom.d.ts"
-      ],
-      "eventFilterMatches": [
-        "dist/commonjs/eventFilterMatches.d.ts"
-      ],
-      "replacements": [
-        "dist/commonjs/replacements.d.ts"
-      ],
-      "requestFilterMatches": [
-        "dist/commonjs/requestFilterMatches.d.ts"
-      ],
-      "retry": [
-        "dist/commonjs/retry.d.ts"
-      ],
       "utils": [
         "dist/commonjs/utils.d.ts"
       ],
@@ -91,9 +70,6 @@
       "types": [
         "dist/commonjs/types.d.ts"
       ],
-      "versions": [
-        "dist/commonjs/versions.d.ts"
-      ],
       "v3": [
         "dist/commonjs/v3/index.d.ts"
       ],
@@ -253,61 +229,6 @@
         "default": "./dist/commonjs/logger.js"
       }
     },
-    "./bloom": {
-      "import": {
-        "@triggerdotdev/source": "./src/bloom.ts",
-        "types": "./dist/esm/bloom.d.ts",
-        "default": "./dist/esm/bloom.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/bloom.d.ts",
-        "default": "./dist/commonjs/bloom.js"
-      }
-    },
-    "./eventFilterMatches": {
-      "import": {
-        "@triggerdotdev/source": "./src/eventFilterMatches.ts",
-        "types": "./dist/esm/eventFilterMatches.d.ts",
-        "default": "./dist/esm/eventFilterMatches.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/eventFilterMatches.d.ts",
-        "default": "./dist/commonjs/eventFilterMatches.js"
-      }
-    },
-    "./replacements": {
-      "import": {
-        "@triggerdotdev/source": "./src/replacements.ts",
-        "types": "./dist/esm/replacements.d.ts",
-        "default": "./dist/esm/replacements.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/replacements.d.ts",
-        "default": "./dist/commonjs/replacements.js"
-      }
-    },
-    "./requestFilterMatches": {
-      "import": {
-        "@triggerdotdev/source": "./src/requestFilterMatches.ts",
-        "types": "./dist/esm/requestFilterMatches.d.ts",
-        "default": "./dist/esm/requestFilterMatches.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/requestFilterMatches.d.ts",
-        "default": "./dist/commonjs/requestFilterMatches.js"
-      }
-    },
-    "./retry": {
-      "import": {
-        "@triggerdotdev/source": "./src/retry.ts",
-        "types": "./dist/esm/retry.d.ts",
-        "default": "./dist/esm/retry.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/retry.d.ts",
-        "default": "./dist/commonjs/retry.js"
-      }
-    },
     "./utils": {
       "import": {
         "@triggerdotdev/source": "./src/utils.ts",
@@ -341,17 +262,6 @@
         "default": "./dist/commonjs/types.js"
       }
     },
-    "./versions": {
-      "import": {
-        "@triggerdotdev/source": "./src/versions.ts",
-        "types": "./dist/esm/versions.d.ts",
-        "default": "./dist/esm/versions.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/versions.d.ts",
-        "default": "./dist/commonjs/versions.js"
-      }
-    },
     "./v3": {
       "import": {
         "@triggerdotdev/source": "./src/v3/index.ts",

packages/core/src/bloom.ts

@@ -1,9 +1,3 @@
-export * from "./schemas/index.js";
 export * from "./types.js";
 export * from "./utils.js";
-export * from "./retry.js";
-export * from "./replacements.js";
-export * from "./searchParams.js";
-export * from "./eventFilterMatches.js";
-export * from "./requestFilterMatches.js";
-export * from "./versions.js";
+export * from "./schemas/json.js";