github-featured/triggerdotdev--trigger.dev
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

move core-backend code into core subpath export

Browse Source
This commit is contained in:
Eric Allam
2024-08-06 11:01:43 +01:00
committed by Eric Allam
parent b2852ab283
commit cc7a438c51
28 changed files with 43 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/pre.json
+2 -30
View File
@@ -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"
]
}
}
apps/webapp/app/services/db/pgListen.server.ts
+1 -1
View File
@@ -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";
apps/webapp/app/services/logger.server.ts
+2 -2
View File
@@ -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";
apps/webapp/app/services/runs/performRunExecutionV3.server.ts
+1 -1
View File
@@ -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";
apps/webapp/app/v3/marqs/concurrencyMonitor.server.ts
+1 -1
View File
@@ -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";
apps/webapp/app/v3/utils/zodPubSub.server.ts
+1 -1
View File
@@ -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";
apps/webapp/package.json
-1
View File
@@ -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",
apps/webapp/tsconfig.json
-2
View File
@@ -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"],
packages/core-backend/CHANGELOG.md
-175
View File
@@ -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
packages/core-backend/LICENSE
-21
View File
@@ -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.
packages/core-backend/jest.config.js
-8
View File
@@ -1,8 +0,0 @@
module.exports = {
moduleFileExtensions: ["ts", "tsx", "js"],
transform: {
"^.+\\.(ts|tsx)$": "ts-jest",
},
testMatch: ["<rootDir>/test/**/*.ts?(x)", "<rootDir>/test/**/?(*.)+(spec|test).ts?(x)"],
testEnvironment: "node",
};
packages/core-backend/package.json
-51
View File
@@ -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"
}
}
packages/core-backend/src/index.ts
-2
View File
@@ -1,2 +0,0 @@
export * from "./bloom";
export * from "./logger";
packages/core-backend/tsconfig.build.json
-11
View File
@@ -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"]
}
packages/core-backend/tsconfig.json
-16
View File
@@ -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"]
}
packages/core-backend/tsup.config.ts
-6
View File
@@ -1,6 +0,0 @@
import { packageOptions, defineConfig } from "@trigger.dev/tsup";
export default defineConfig({
...packageOptions,
config: "tsconfig.build.json",
});
packages/core/package.json
+24
View File
@@ -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",
packages/core-backend/src/bloom.ts → packages/core/src/bloom.ts
+2
View File
@@ -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;
}
packages/core-backend/src/logger.ts → packages/core/src/logger.ts
View File
packages/core-backend/test/bloomFilter.test.ts → packages/core/test/bloomFilter.test.ts
+1 -1
View File
@@ -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", () => {
packages/trigger-sdk/package.json
-1
View File
@@ -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",
packages/trigger-sdk/src/apiClient.ts
+1 -1
View File
@@ -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";
packages/trigger-sdk/src/io.ts
+2 -2
View File
@@ -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";
packages/trigger-sdk/src/job.ts
+1 -1
View File
@@ -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";
packages/trigger-sdk/src/triggerClient.ts
+1 -1
View File
@@ -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";
packages/trigger-sdk/src/triggers/externalSource.ts
+1 -1
View File
@@ -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";
packages/trigger-sdk/src/types.ts
+1 -1
View File
@@ -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";
packages/trigger-sdk/tsconfig.json
+1 -3
View File
@@ -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
},