From cc7a438c51602ddb4346aea8d6e6fc5dcafc93a6 Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Tue, 6 Aug 2024 11:01:43 +0100 Subject: [PATCH] move core-backend code into core subpath export --- .changeset/pre.json | 32 +--- .../webapp/app/services/db/pgListen.server.ts | 2 +- apps/webapp/app/services/logger.server.ts | 4 +- .../runs/performRunExecutionV3.server.ts | 2 +- .../app/v3/marqs/concurrencyMonitor.server.ts | 2 +- apps/webapp/app/v3/utils/zodPubSub.server.ts | 2 +- apps/webapp/package.json | 1 - apps/webapp/tsconfig.json | 2 - packages/core-backend/CHANGELOG.md | 175 ------------------ packages/core-backend/LICENSE | 21 --- packages/core-backend/jest.config.js | 8 - packages/core-backend/package.json | 51 ----- packages/core-backend/src/index.ts | 2 - packages/core-backend/tsconfig.build.json | 11 -- packages/core-backend/tsconfig.json | 16 -- packages/core-backend/tsup.config.ts | 6 - packages/core/package.json | 24 +++ packages/{core-backend => core}/src/bloom.ts | 2 + packages/{core-backend => core}/src/logger.ts | 0 .../test/bloomFilter.test.ts | 2 +- packages/trigger-sdk/package.json | 1 - packages/trigger-sdk/src/apiClient.ts | 2 +- packages/trigger-sdk/src/io.ts | 4 +- packages/trigger-sdk/src/job.ts | 2 +- packages/trigger-sdk/src/triggerClient.ts | 2 +- .../src/triggers/externalSource.ts | 2 +- packages/trigger-sdk/src/types.ts | 2 +- packages/trigger-sdk/tsconfig.json | 4 +- 28 files changed, 43 insertions(+), 341 deletions(-) delete mode 100644 packages/core-backend/CHANGELOG.md delete mode 100644 packages/core-backend/LICENSE delete mode 100644 packages/core-backend/jest.config.js delete mode 100644 packages/core-backend/package.json delete mode 100644 packages/core-backend/src/index.ts delete mode 100644 packages/core-backend/tsconfig.build.json delete mode 100644 packages/core-backend/tsconfig.json delete mode 100644 packages/core-backend/tsup.config.ts rename packages/{core-backend => core}/src/bloom.ts (97%) rename packages/{core-backend => core}/src/logger.ts (100%) rename packages/{core-backend => core}/test/bloomFilter.test.ts (94%) diff --git a/.changeset/pre.json b/.changeset/pre.json index ce3ea1b25..edc3c8841 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -8,40 +8,12 @@ "proxy": "0.0.11", "webapp": "1.0.0", "yalt": "0.0.1", - "@trigger.dev/airtable": "2.3.18", - "@trigger.dev/github": "2.3.18", - "@trigger.dev/linear": "2.3.18", - "@trigger.dev/openai": "2.3.18", - "@trigger.dev/plain": "2.3.18", - "@trigger.dev/replicate": "2.3.18", - "@trigger.dev/resend": "2.3.18", - "@trigger.dev/sendgrid": "2.3.18", - "@trigger.dev/shopify": "2.3.18", - "@trigger.dev/slack": "2.3.18", - "@trigger.dev/stripe": "2.3.18", - "@trigger.dev/supabase": "2.3.18", - "@trigger.dev/typeform": "2.3.18", - "@trigger.dev/astro": "2.3.18", - "@trigger.dev/cli": "2.3.18", "trigger.dev": "2.3.18", "@trigger.dev/core": "2.3.18", - "@trigger.dev/core-apps": "0.0.0", - "@trigger.dev/core-backend": "2.3.18", "@trigger.dev/database": "0.0.1", "emails": "1.0.0", - "@trigger.dev/eslint-plugin": "2.3.18", - "@trigger.dev/express": "2.3.18", - "@trigger.dev/hono": "2.3.18", - "@trigger.dev/integration-kit": "2.3.18", - "@trigger.dev/nestjs": "2.3.18", - "@trigger.dev/nextjs": "2.3.18", "@trigger.dev/otlp-importer": "2.3.11", - "@trigger.dev/react": "2.3.18", - "@trigger.dev/remix": "2.3.18", - "@trigger.dev/sveltekit": "2.3.18", - "@trigger.dev/testing": "2.3.18", - "@trigger.dev/sdk": "2.3.18", - "@trigger.dev/yalt": "2.3.18" + "@trigger.dev/sdk": "2.3.18" }, "changesets": [ "afraid-sheep-joke", @@ -197,4 +169,4 @@ "young-jars-wait", "young-snails-sell" ] -} +} \ No newline at end of file diff --git a/apps/webapp/app/services/db/pgListen.server.ts b/apps/webapp/app/services/db/pgListen.server.ts index ddcc54c7b..b819ceec6 100644 --- a/apps/webapp/app/services/db/pgListen.server.ts +++ b/apps/webapp/app/services/db/pgListen.server.ts @@ -1,4 +1,4 @@ -import { Logger } from "@trigger.dev/core-backend"; +import { Logger } from "@trigger.dev/core/logger"; import type { PoolClient } from "pg"; import { z } from "zod"; import { logger } from "~/services/logger.server"; diff --git a/apps/webapp/app/services/logger.server.ts b/apps/webapp/app/services/logger.server.ts index 6fa563d1b..2d208bca0 100644 --- a/apps/webapp/app/services/logger.server.ts +++ b/apps/webapp/app/services/logger.server.ts @@ -1,5 +1,5 @@ -import type { LogLevel } from "@trigger.dev/core-backend"; -import { Logger } from "@trigger.dev/core-backend"; +import type { LogLevel } from "@trigger.dev/core/logger"; +import { Logger } from "@trigger.dev/core/logger"; import { sensitiveDataReplacer } from "./sensitiveDataReplacer"; import { AsyncLocalStorage } from "async_hooks"; import { getHttpContext } from "./httpAsyncStorage.server"; diff --git a/apps/webapp/app/services/runs/performRunExecutionV3.server.ts b/apps/webapp/app/services/runs/performRunExecutionV3.server.ts index ca2fb19f1..dee7b0fd7 100644 --- a/apps/webapp/app/services/runs/performRunExecutionV3.server.ts +++ b/apps/webapp/app/services/runs/performRunExecutionV3.server.ts @@ -15,7 +15,7 @@ import { RunSourceContextSchema, supportsFeature, } from "@trigger.dev/core"; -import { BloomFilter } from "@trigger.dev/core-backend"; +import { BloomFilter } from "@trigger.dev/core/bloom"; import { ConcurrencyLimitGroup, Job, JobRun, JobVersion } from "@trigger.dev/database"; import { generateErrorMessage } from "zod-error"; import { eventRecordToApiJson } from "~/api.server"; diff --git a/apps/webapp/app/v3/marqs/concurrencyMonitor.server.ts b/apps/webapp/app/v3/marqs/concurrencyMonitor.server.ts index abf82ce36..cc091a6a0 100644 --- a/apps/webapp/app/v3/marqs/concurrencyMonitor.server.ts +++ b/apps/webapp/app/v3/marqs/concurrencyMonitor.server.ts @@ -1,4 +1,4 @@ -import { Logger } from "@trigger.dev/core-backend"; +import { Logger } from "@trigger.dev/core/logger"; import { Redis } from "ioredis"; import { prisma } from "~/db.server"; import { logger } from "~/services/logger.server"; diff --git a/apps/webapp/app/v3/utils/zodPubSub.server.ts b/apps/webapp/app/v3/utils/zodPubSub.server.ts index 4ba4ce14e..9680f89d3 100644 --- a/apps/webapp/app/v3/utils/zodPubSub.server.ts +++ b/apps/webapp/app/v3/utils/zodPubSub.server.ts @@ -1,4 +1,4 @@ -import { Logger } from "@trigger.dev/core-backend"; +import { Logger } from "@trigger.dev/core/logger"; import { ZodMessageCatalogSchema, ZodMessageHandler } from "@trigger.dev/core/v3/zodMessageHandler"; import { Evt } from "evt"; import Redis, { RedisOptions } from "ioredis"; diff --git a/apps/webapp/package.json b/apps/webapp/package.json index 33a3e09d6..64efcde7d 100644 --- a/apps/webapp/package.json +++ b/apps/webapp/package.json @@ -93,7 +93,6 @@ "@team-plain/typescript-sdk": "^3.5.0", "@trigger.dev/companyicons": "^1.5.35", "@trigger.dev/core": "workspace:*", - "@trigger.dev/core-backend": "workspace:*", "@trigger.dev/database": "workspace:*", "@trigger.dev/otlp-importer": "workspace:*", "@trigger.dev/platform": "1.0.12", diff --git a/apps/webapp/tsconfig.json b/apps/webapp/tsconfig.json index e9a5102cb..f2825d7e2 100644 --- a/apps/webapp/tsconfig.json +++ b/apps/webapp/tsconfig.json @@ -24,8 +24,6 @@ "@trigger.dev/sdk/*": ["../../packages/trigger-sdk/src/*"], "@trigger.dev/core": ["../../packages/core/src/index"], "@trigger.dev/core/*": ["../../packages/core/src/*"], - "@trigger.dev/core-backend": ["../../packages/core-backend/src/index"], - "@trigger.dev/core-backend/*": ["../../packages/core-backend/src/*"], "@trigger.dev/database": ["../../packages/database/src/index"], "@trigger.dev/database/*": ["../../packages/database/src/*"], "@trigger.dev/yalt": ["../../packages/yalt/src/index"], diff --git a/packages/core-backend/CHANGELOG.md b/packages/core-backend/CHANGELOG.md deleted file mode 100644 index 3b770af60..000000000 --- a/packages/core-backend/CHANGELOG.md +++ /dev/null @@ -1,175 +0,0 @@ -# @trigger.dev/core-backend - -## 3.0.0-beta.55 - -## 3.0.0-beta.54 - -## 3.0.0-beta.53 - -## 3.0.0-beta.52 - -## 3.0.0-beta.51 - -## 3.0.0-beta.50 - -## 3.0.0-beta.49 - -## 3.0.0-beta.48 - -## 3.0.0-beta.47 - -## 3.0.0-beta.46 - -## 3.0.0-beta.45 - -## 3.0.0-beta.44 - -## 3.0.0-beta.43 - -## 3.0.0-beta.42 - -## 3.0.0-beta.41 - -## 3.0.0-beta.40 - -## 3.0.0-beta.39 - -## 3.0.0-beta.38 - -## 3.0.0-beta.37 - -## 3.0.0-beta.36 - -## 3.0.0-beta.35 - -## 3.0.0-beta.34 - -## 3.0.0-beta.33 - -## 3.0.0-beta.32 - -## 3.0.0-beta.31 - -## 3.0.0-beta.30 - -## 3.0.0-beta.29 - -## 3.0.0-beta.28 - -## 3.0.0-beta.27 - -## 3.0.0-beta.26 - -## 3.0.0-beta.25 - -## 3.0.0-beta.24 - -## 3.0.0-beta.23 - -## 3.0.0-beta.22 - -## 3.0.0-beta.21 - -## 3.0.0-beta.20 - -## 3.0.0-beta.19 - -## 3.0.0-beta.18 - -## 3.0.0-beta.17 - -## 3.0.0-beta.16 - -## 3.0.0-beta.15 - -## 3.0.0-beta.14 - -## 3.0.0-beta.13 - -## 3.0.0-beta.12 - -## 3.0.0-beta.11 - -## 3.0.0-beta.7 - -## 3.0.0-beta.6 - -## 3.0.0-beta.5 - -## 3.0.0-beta.4 - -## 3.0.0-beta.3 - -## 3.0.0-beta.2 - -## 3.0.0-beta.1 - -## 3.0.0-beta.0 - -## 2.3.18 - -## 2.3.17 - -## 2.3.16 - -## 2.3.15 - -## 2.3.14 - -## 2.3.13 - -## 2.3.12 - -## 2.3.11 - -## 2.3.10 - -## 2.3.9 - -## 2.3.8 - -## 2.3.7 - -## 2.3.6 - -## 2.3.5 - -## 2.3.4 - -## 2.3.3 - -## 2.3.2 - -## 2.3.1 - -### Patch Changes - -- f3efcc0c: Moved Logger to core-backend, no longer importing node:buffer in core/react - -## 2.3.0 - -### Minor Changes - -- 17f6f29d: Support for Deno, Bun and Cloudflare workers, as well as conditionally exporting ESM versions of the package instead of just commonjs. - - Cloudflare worker support requires the node compat flag turned on (https://developers.cloudflare.com/workers/runtime-apis/nodejs/) - -## 2.2.11 - -## 2.2.10 - -## 2.2.9 - -## 2.2.8 - -## 2.2.7 - -## 2.2.6 - -## 2.2.5 - -## 2.2.4 - -### Patch Changes - -- c1710ae7: Creates a new package @trigger.dev/core-backend that includes code shared between @trigger.dev/sdk and the Trigger.dev server diff --git a/packages/core-backend/LICENSE b/packages/core-backend/LICENSE deleted file mode 100644 index e51e7b10a..000000000 --- a/packages/core-backend/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 Trigger.dev - -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/packages/core-backend/jest.config.js b/packages/core-backend/jest.config.js deleted file mode 100644 index e21cd117c..000000000 --- a/packages/core-backend/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - moduleFileExtensions: ["ts", "tsx", "js"], - transform: { - "^.+\\.(ts|tsx)$": "ts-jest", - }, - testMatch: ["/test/**/*.ts?(x)", "/test/**/?(*.)+(spec|test).ts?(x)"], - testEnvironment: "node", -}; diff --git a/packages/core-backend/package.json b/packages/core-backend/package.json deleted file mode 100644 index 7fde5f3c1..000000000 --- a/packages/core-backend/package.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "@trigger.dev/core-backend", - "version": "3.0.0-beta.55", - "description": "Core code used across `@trigger.dev/sdk` and Trigger.dev server", - "license": "MIT", - "main": "./dist/index.js", - "types": "./dist/index.d.ts", - "module": "./dist/index.mjs", - "publishConfig": { - "access": "public" - }, - "files": [ - "dist" - ], - "exports": { - ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": "./dist/index.js", - "types": "./dist/index.d.ts" - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "scripts": { - "clean": "rimraf dist", - "build": "npm run clean && npm run build:tsup", - "build:tsup": "tsup --dts-resolve", - "typecheck": "tsc --noEmit", - "test": "jest" - }, - "devDependencies": { - "@trigger.dev/tsconfig": "workspace:*", - "@trigger.dev/tsup": "workspace:*", - "@types/jest": "^29.5.3", - "@types/node": "18", - "jest": "^29.6.2", - "rimraf": "^3.0.2", - "ts-jest": "^29.1.1", - "tsup": "^8.0.1", - "typescript": "^5.3.0" - }, - "engines": { - "node": ">=18.0.0" - }, - "dependencies": { - "@opentelemetry/api": "^1.8.0" - } -} \ No newline at end of file diff --git a/packages/core-backend/src/index.ts b/packages/core-backend/src/index.ts deleted file mode 100644 index 9b274c474..000000000 --- a/packages/core-backend/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from "./bloom"; -export * from "./logger"; diff --git a/packages/core-backend/tsconfig.build.json b/packages/core-backend/tsconfig.build.json deleted file mode 100644 index f444efc19..000000000 --- a/packages/core-backend/tsconfig.build.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "@trigger.dev/tsconfig/node18.json", - "include": ["src/globals.d.ts", "./src/**/*.ts", "tsup.config.ts"], - "compilerOptions": { - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "declaration": false, - "declarationMap": false - }, - "exclude": ["node_modules"] -} diff --git a/packages/core-backend/tsconfig.json b/packages/core-backend/tsconfig.json deleted file mode 100644 index 34072687b..000000000 --- a/packages/core-backend/tsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "@trigger.dev/tsconfig/node18.json", - "include": ["src/globals.d.ts", "./src/**/*.ts", "tsup.config.ts", "./test/**/*.ts"], - "compilerOptions": { - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "declaration": false, - "declarationMap": false, - "types": ["jest"], - "paths": { - "@trigger.dev/tsup/*": ["../../config-packages/tsup/src/*"], - "@trigger.dev/tsup": ["../../config-packages/tsup/src/index"] - } - }, - "exclude": ["node_modules"] -} diff --git a/packages/core-backend/tsup.config.ts b/packages/core-backend/tsup.config.ts deleted file mode 100644 index 1914192e5..000000000 --- a/packages/core-backend/tsup.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { packageOptions, defineConfig } from "@trigger.dev/tsup"; - -export default defineConfig({ - ...packageOptions, - config: "tsconfig.build.json", -}); diff --git a/packages/core/package.json b/packages/core/package.json index 1609e3739..d577f32f7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -17,6 +17,8 @@ "exports": { "./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", @@ -107,6 +109,28 @@ "default": "./dist/commonjs/index.js" } }, + "./logger": { + "import": { + "triggerdotdev-source": "./src/logger.ts", + "types": "./dist/esm/logger.d.ts", + "default": "./dist/esm/logger.js" + }, + "require": { + "types": "./dist/commonjs/logger.d.ts", + "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", diff --git a/packages/core-backend/src/bloom.ts b/packages/core/src/bloom.ts similarity index 97% rename from packages/core-backend/src/bloom.ts rename to packages/core/src/bloom.ts index 63428ab76..fe4e386a2 100644 --- a/packages/core-backend/src/bloom.ts +++ b/packages/core/src/bloom.ts @@ -11,11 +11,13 @@ export class BloomFilter { add(item: string): void { const index = murmurHash3(item) % this.size; + // @ts-expect-error this.bitArray[Math.floor(index / 8)] |= 1 << index % 8; } test(item: string): boolean { const index = murmurHash3(item) % this.size; + // @ts-expect-error return (this.bitArray[Math.floor(index / 8)] & (1 << index % 8)) !== 0; } diff --git a/packages/core-backend/src/logger.ts b/packages/core/src/logger.ts similarity index 100% rename from packages/core-backend/src/logger.ts rename to packages/core/src/logger.ts diff --git a/packages/core-backend/test/bloomFilter.test.ts b/packages/core/test/bloomFilter.test.ts similarity index 94% rename from packages/core-backend/test/bloomFilter.test.ts rename to packages/core/test/bloomFilter.test.ts index b66a53ec8..cc4bb2771 100644 --- a/packages/core-backend/test/bloomFilter.test.ts +++ b/packages/core/test/bloomFilter.test.ts @@ -1,4 +1,4 @@ -import { BloomFilter } from "../src"; +import { BloomFilter } from "../src/bloom.js"; describe("BloomFilter", () => { it("should be able to correct test for inclusion in the set", () => { diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json index a2e6164a0..9d886bcc5 100644 --- a/packages/trigger-sdk/package.json +++ b/packages/trigger-sdk/package.json @@ -49,7 +49,6 @@ "@opentelemetry/api-logs": "0.52.1", "@opentelemetry/semantic-conventions": "1.25.1", "@trigger.dev/core": "workspace:3.0.0-beta.52", - "@trigger.dev/core-backend": "workspace:3.0.0-beta.52", "chalk": "^5.2.0", "cronstrue": "^2.21.0", "debug": "^4.3.4", diff --git a/packages/trigger-sdk/src/apiClient.ts b/packages/trigger-sdk/src/apiClient.ts index abb3d6a70..b63cbf36c 100644 --- a/packages/trigger-sdk/src/apiClient.ts +++ b/packages/trigger-sdk/src/apiClient.ts @@ -39,7 +39,7 @@ import { assertExhaustive, urlWithSearchParams, } from "@trigger.dev/core"; -import { LogLevel, Logger } from "@trigger.dev/core-backend"; +import { LogLevel, Logger } from "@trigger.dev/core/logger"; import { env } from "node:process"; import { z } from "zod"; diff --git a/packages/trigger-sdk/src/io.ts b/packages/trigger-sdk/src/io.ts index eda9d0887..105af33f3 100644 --- a/packages/trigger-sdk/src/io.ts +++ b/packages/trigger-sdk/src/io.ts @@ -21,8 +21,8 @@ import { UpdateWebhookBody, supportsFeature, } from "@trigger.dev/core"; -import { LogLevel, Logger } from "@trigger.dev/core-backend"; -import { BloomFilter } from "@trigger.dev/core-backend"; +import { LogLevel, Logger } from "@trigger.dev/core/logger"; +import { BloomFilter } from "@trigger.dev/core/bloom"; import { AsyncLocalStorage } from "node:async_hooks"; import { webcrypto } from "node:crypto"; import { ApiClient } from "./apiClient"; diff --git a/packages/trigger-sdk/src/job.ts b/packages/trigger-sdk/src/job.ts index 8be95178d..5f905b9af 100644 --- a/packages/trigger-sdk/src/job.ts +++ b/packages/trigger-sdk/src/job.ts @@ -7,7 +7,7 @@ import { RunNotification, SuccessfulRunNotification, } from "@trigger.dev/core"; -import { LogLevel } from "@trigger.dev/core-backend"; +import { LogLevel } from "@trigger.dev/core/logger"; import { ConcurrencyLimit } from "./concurrencyLimit"; import { IOWithIntegrations, TriggerIntegration } from "./integrations"; import { runLocalStorage } from "./runLocalStorage"; diff --git a/packages/trigger-sdk/src/triggerClient.ts b/packages/trigger-sdk/src/triggerClient.ts index 3e132d7b2..71c5e4848 100644 --- a/packages/trigger-sdk/src/triggerClient.ts +++ b/packages/trigger-sdk/src/triggerClient.ts @@ -44,7 +44,7 @@ import { WebhookMetadata, WebhookSourceRequestHeadersSchema, } from "@trigger.dev/core"; -import { LogLevel, Logger } from "@trigger.dev/core-backend"; +import { LogLevel, Logger } from "@trigger.dev/core/logger"; import EventEmitter from "node:events"; import { env } from "node:process"; import * as packageJson from "../package.json"; diff --git a/packages/trigger-sdk/src/triggers/externalSource.ts b/packages/trigger-sdk/src/triggers/externalSource.ts index 5ba7ff45b..0285b6e00 100644 --- a/packages/trigger-sdk/src/triggers/externalSource.ts +++ b/packages/trigger-sdk/src/triggers/externalSource.ts @@ -12,7 +12,7 @@ import { TriggerMetadata, deepMergeFilters, } from "@trigger.dev/core"; -import { Logger } from "@trigger.dev/core-backend"; +import { Logger } from "@trigger.dev/core/logger"; import type { Buffer } from "buffer"; import { IOWithIntegrations, TriggerIntegration } from "../integrations"; import { IO } from "../io"; diff --git a/packages/trigger-sdk/src/types.ts b/packages/trigger-sdk/src/types.ts index 139823214..a699d924f 100644 --- a/packages/trigger-sdk/src/types.ts +++ b/packages/trigger-sdk/src/types.ts @@ -12,7 +12,7 @@ import type { SuccessfulRunNotification, TriggerMetadata, } from "@trigger.dev/core"; -import { Logger } from "@trigger.dev/core-backend"; +import { Logger } from "@trigger.dev/core/logger"; import type TypedEmitter from "typed-emitter"; import { z } from "zod"; import { Job } from "./job"; diff --git a/packages/trigger-sdk/tsconfig.json b/packages/trigger-sdk/tsconfig.json index fe6b62de9..c32bd0fe5 100644 --- a/packages/trigger-sdk/tsconfig.json +++ b/packages/trigger-sdk/tsconfig.json @@ -6,9 +6,7 @@ "sourceMap": true, "paths": { "@trigger.dev/core/*": ["../core/src/*"], - "@trigger.dev/core": ["../core/src/index"], - "@trigger.dev/core-backend/*": ["../core-backend/src/*"], - "@trigger.dev/core-backend": ["../core-backend/src/index"] + "@trigger.dev/core": ["../core/src/index"] }, "stripInternal": true },