From 8d2428d88b26cd10ea5800c14aa031273977832f Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Thu, 22 Aug 2024 21:04:52 +0100 Subject: [PATCH] Move extensions to a new build package --- .changeset/warm-nails-jump.md | 5 + packages/build/CHANGELOG.md | 1 + packages/build/LICENSE | 21 ++++ packages/build/README.md | 3 + packages/build/package.json | 119 ++++++++++++++++++ .../src}/extensions/audioWaveform.ts | 4 +- packages/build/src/extensions/core.ts | 3 + .../src/extensions/core}/additionalFiles.ts | 2 +- .../extensions/core}/additionalPackages.ts | 2 +- .../src/extensions/core}/syncEnvVars.ts | 2 +- .../src/v3 => build/src}/extensions/prisma.ts | 5 +- .../src/extensions/typescript.ts} | 6 +- packages/build/src/index.ts | 2 + packages/build/src/version.ts | 1 + packages/build/tsconfig.json | 8 ++ packages/build/tsconfig.src.json | 10 ++ packages/cli-v3/package.json | 7 +- packages/cli-v3/src/config.ts | 6 +- packages/core/package.json | 13 -- packages/core/src/v3/extensions/index.ts | 6 - packages/trigger-sdk/package.json | 14 +-- packages/trigger-sdk/src/v3/extensions.ts | 1 - pnpm-lock.yaml | 49 +++++++- references/v3-catalog/package.json | 1 + references/v3-catalog/trigger.config.ts | 12 +- 25 files changed, 242 insertions(+), 61 deletions(-) create mode 100644 .changeset/warm-nails-jump.md create mode 100644 packages/build/CHANGELOG.md create mode 100644 packages/build/LICENSE create mode 100644 packages/build/README.md create mode 100644 packages/build/package.json rename packages/{core/src/v3 => build/src}/extensions/audioWaveform.ts (92%) create mode 100644 packages/build/src/extensions/core.ts rename packages/{core/src/v3/extensions => build/src/extensions/core}/additionalFiles.ts (97%) rename packages/{core/src/v3/extensions => build/src/extensions/core}/additionalPackages.ts (97%) rename packages/{core/src/v3/extensions => build/src/extensions/core}/syncEnvVars.ts (98%) rename packages/{core/src/v3 => build/src}/extensions/prisma.ts (96%) rename packages/{core/src/v3/extensions/emitDecoratorMetadata.ts => build/src/extensions/typescript.ts} (88%) create mode 100644 packages/build/src/index.ts create mode 100644 packages/build/src/version.ts create mode 100644 packages/build/tsconfig.json create mode 100644 packages/build/tsconfig.src.json delete mode 100644 packages/core/src/v3/extensions/index.ts delete mode 100644 packages/trigger-sdk/src/v3/extensions.ts diff --git a/.changeset/warm-nails-jump.md b/.changeset/warm-nails-jump.md new file mode 100644 index 000000000..21f5c19dd --- /dev/null +++ b/.changeset/warm-nails-jump.md @@ -0,0 +1,5 @@ +--- +"@trigger.dev/build": patch +--- + +Added new @trigger.dev/build package that currently has all the build extensions diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md new file mode 100644 index 000000000..a1fa33163 --- /dev/null +++ b/packages/build/CHANGELOG.md @@ -0,0 +1 @@ +# @trigger.dev/build diff --git a/packages/build/LICENSE b/packages/build/LICENSE new file mode 100644 index 000000000..e51e7b10a --- /dev/null +++ b/packages/build/LICENSE @@ -0,0 +1,21 @@ +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/build/README.md b/packages/build/README.md new file mode 100644 index 000000000..d3ea2f35f --- /dev/null +++ b/packages/build/README.md @@ -0,0 +1,3 @@ +# Official TypeScript SDK for Trigger.dev + +View the full documentation for the [here](https://trigger.dev/docs) diff --git a/packages/build/package.json b/packages/build/package.json new file mode 100644 index 000000000..b8758c030 --- /dev/null +++ b/packages/build/package.json @@ -0,0 +1,119 @@ +{ + "name": "@trigger.dev/build", + "version": "3.0.0-beta.55", + "description": "trigger.dev build extensions", + "license": "MIT", + "publishConfig": { + "access": "public" + }, + "repository": { + "type": "git", + "url": "https://github.com/triggerdotdev/trigger.dev", + "directory": "packages/build" + }, + "type": "module", + "files": [ + "dist" + ], + "tshy": { + "selfLink": false, + "main": true, + "module": true, + "project": "./tsconfig.src.json", + "exports": { + "./package.json": "./package.json", + ".": "./src/index.ts", + "./extensions/core": "./src/extensions/core.ts", + "./extensions/prisma": "./src/extensions/prisma.ts", + "./extensions/audioWaveform": "./src/extensions/audioWaveform.ts", + "./extensions/typescript": "./src/extensions/typescript.ts" + }, + "sourceDialects": [ + "@triggerdotdev/source" + ] + }, + "scripts": { + "clean": "rimraf dist", + "build": "tshy && pnpm run update-version", + "dev": "tshy --watch", + "typecheck": "tsc --noEmit", + "update-version": "tsx ../../scripts/updateVersion.ts" + }, + "dependencies": { + "@trigger.dev/core": "workspace:3.0.0-beta.55", + "pkg-types": "^1.1.3", + "tinyglobby": "^0.2.2" + }, + "devDependencies": { + "@types/node": "20.14.14", + "rimraf": "6.0.1", + "tshy": "^3.0.2", + "typescript": "^5.5.4", + "tsx": "4.17.0", + "esbuild": "^0.23.0" + }, + "engines": { + "node": ">=18.20.0" + }, + "exports": { + "./package.json": "./package.json", + ".": { + "import": { + "@triggerdotdev/source": "./src/index.ts", + "types": "./dist/esm/index.d.ts", + "default": "./dist/esm/index.js" + }, + "require": { + "types": "./dist/commonjs/index.d.ts", + "default": "./dist/commonjs/index.js" + } + }, + "./extensions/core": { + "import": { + "@triggerdotdev/source": "./src/extensions/core.ts", + "types": "./dist/esm/extensions/core.d.ts", + "default": "./dist/esm/extensions/core.js" + }, + "require": { + "types": "./dist/commonjs/extensions/core.d.ts", + "default": "./dist/commonjs/extensions/core.js" + } + }, + "./extensions/prisma": { + "import": { + "@triggerdotdev/source": "./src/extensions/prisma.ts", + "types": "./dist/esm/extensions/prisma.d.ts", + "default": "./dist/esm/extensions/prisma.js" + }, + "require": { + "types": "./dist/commonjs/extensions/prisma.d.ts", + "default": "./dist/commonjs/extensions/prisma.js" + } + }, + "./extensions/audioWaveform": { + "import": { + "@triggerdotdev/source": "./src/extensions/audioWaveform.ts", + "types": "./dist/esm/extensions/audioWaveform.d.ts", + "default": "./dist/esm/extensions/audioWaveform.js" + }, + "require": { + "types": "./dist/commonjs/extensions/audioWaveform.d.ts", + "default": "./dist/commonjs/extensions/audioWaveform.js" + } + }, + "./extensions/typescript": { + "import": { + "@triggerdotdev/source": "./src/extensions/typescript.ts", + "types": "./dist/esm/extensions/typescript.d.ts", + "default": "./dist/esm/extensions/typescript.js" + }, + "require": { + "types": "./dist/commonjs/extensions/typescript.d.ts", + "default": "./dist/commonjs/extensions/typescript.js" + } + } + }, + "main": "./dist/commonjs/index.js", + "types": "./dist/commonjs/index.d.ts", + "module": "./dist/esm/index.js" +} diff --git a/packages/core/src/v3/extensions/audioWaveform.ts b/packages/build/src/extensions/audioWaveform.ts similarity index 92% rename from packages/core/src/v3/extensions/audioWaveform.ts rename to packages/build/src/extensions/audioWaveform.ts index 591111e6b..22bd1661e 100644 --- a/packages/core/src/v3/extensions/audioWaveform.ts +++ b/packages/build/src/extensions/audioWaveform.ts @@ -1,5 +1,5 @@ -import { BuildContext, BuildExtension } from "../build/extensions.js"; -import { BuildManifest } from "../schemas/build.js"; +import { BuildManifest } from "@trigger.dev/core/v3"; +import { BuildContext, BuildExtension } from "@trigger.dev/core/v3/build"; export type AudioWaveformOptions = { version?: string; diff --git a/packages/build/src/extensions/core.ts b/packages/build/src/extensions/core.ts new file mode 100644 index 000000000..0abd6c10f --- /dev/null +++ b/packages/build/src/extensions/core.ts @@ -0,0 +1,3 @@ +export * from "./core/additionalFiles.js"; +export * from "./core/additionalPackages.js"; +export * from "./core/syncEnvVars.js"; diff --git a/packages/core/src/v3/extensions/additionalFiles.ts b/packages/build/src/extensions/core/additionalFiles.ts similarity index 97% rename from packages/core/src/v3/extensions/additionalFiles.ts rename to packages/build/src/extensions/core/additionalFiles.ts index 70fc0ec39..0a00a673e 100644 --- a/packages/core/src/v3/extensions/additionalFiles.ts +++ b/packages/build/src/extensions/core/additionalFiles.ts @@ -1,7 +1,7 @@ import { relative, join, posix, dirname } from "node:path"; import { glob } from "tinyglobby"; import { copyFile, mkdir } from "node:fs/promises"; -import { BuildExtension } from "../build/extensions.js"; +import { BuildExtension } from "@trigger.dev/core/v3/build"; export type AdditionalFilesOptions = { files: string[]; diff --git a/packages/core/src/v3/extensions/additionalPackages.ts b/packages/build/src/extensions/core/additionalPackages.ts similarity index 97% rename from packages/core/src/v3/extensions/additionalPackages.ts rename to packages/build/src/extensions/core/additionalPackages.ts index d6491e75c..b61414e59 100644 --- a/packages/core/src/v3/extensions/additionalPackages.ts +++ b/packages/build/src/extensions/core/additionalPackages.ts @@ -1,6 +1,6 @@ +import { BuildExtension } from "@trigger.dev/core/v3/build"; import { dirname } from "node:path"; import { readPackageJSON } from "pkg-types"; -import { BuildExtension } from "../build/extensions.js"; export type AdditionalPackagesOptions = { packages: string[]; diff --git a/packages/core/src/v3/extensions/syncEnvVars.ts b/packages/build/src/extensions/core/syncEnvVars.ts similarity index 98% rename from packages/core/src/v3/extensions/syncEnvVars.ts rename to packages/build/src/extensions/core/syncEnvVars.ts index 50429ee81..f0a0ac5dc 100644 --- a/packages/core/src/v3/extensions/syncEnvVars.ts +++ b/packages/build/src/extensions/core/syncEnvVars.ts @@ -1,4 +1,4 @@ -import { BuildContext, BuildExtension } from "../build/extensions.js"; +import { BuildContext, BuildExtension } from "@trigger.dev/core/v3/build"; export type SyncEnvVarsBody = Record | Array<{ name: string; value: string }>; diff --git a/packages/core/src/v3/extensions/prisma.ts b/packages/build/src/extensions/prisma.ts similarity index 96% rename from packages/core/src/v3/extensions/prisma.ts rename to packages/build/src/extensions/prisma.ts index d362b20d4..8f61436ee 100644 --- a/packages/core/src/v3/extensions/prisma.ts +++ b/packages/build/src/extensions/prisma.ts @@ -1,10 +1,9 @@ +import { BuildManifest, BuildTarget } from "@trigger.dev/core/v3"; +import { binaryForRuntime, BuildContext, BuildExtension } from "@trigger.dev/core/v3/build"; import assert from "node:assert"; import { existsSync } from "node:fs"; import { cp, readdir } from "node:fs/promises"; import { dirname, join, resolve } from "node:path"; -import { BuildContext, BuildExtension } from "../build/extensions.js"; -import { binaryForRuntime } from "../build/runtime.js"; -import { BuildManifest, BuildTarget } from "../schemas/build.js"; export type PrismaExtensionOptions = { schema: string; diff --git a/packages/core/src/v3/extensions/emitDecoratorMetadata.ts b/packages/build/src/extensions/typescript.ts similarity index 88% rename from packages/core/src/v3/extensions/emitDecoratorMetadata.ts rename to packages/build/src/extensions/typescript.ts index 7e42a0271..bfc93eb2f 100644 --- a/packages/core/src/v3/extensions/emitDecoratorMetadata.ts +++ b/packages/build/src/extensions/typescript.ts @@ -1,8 +1,8 @@ -import * as esbuild from "esbuild"; +import { BuildExtension, createExtensionForPlugin } from "@trigger.dev/core/v3/build"; +import type { Plugin } from "esbuild"; import { readFile } from "node:fs/promises"; import { readTSConfig } from "pkg-types"; import typescriptPkg from "typescript"; -import { BuildExtension, createExtensionForPlugin } from "../build/extensions.js"; const { transpileModule, ModuleKind } = typescriptPkg; @@ -16,7 +16,7 @@ export function emitDecoratorMetadata(options: EmitDecoratorMetadataOptions = {} return createExtensionForPlugin(plugin(options)); } -function plugin(options: EmitDecoratorMetadataOptions = {}): esbuild.Plugin { +function plugin(options: EmitDecoratorMetadataOptions = {}): Plugin { return { name: "emitDecoratorMetadata", async setup(build) { diff --git a/packages/build/src/index.ts b/packages/build/src/index.ts new file mode 100644 index 000000000..1471a2bd8 --- /dev/null +++ b/packages/build/src/index.ts @@ -0,0 +1,2 @@ +// Barrel no more +export {}; diff --git a/packages/build/src/version.ts b/packages/build/src/version.ts new file mode 100644 index 000000000..2e47a8868 --- /dev/null +++ b/packages/build/src/version.ts @@ -0,0 +1 @@ +export const VERSION = "0.0.0"; diff --git a/packages/build/tsconfig.json b/packages/build/tsconfig.json new file mode 100644 index 000000000..16881b51b --- /dev/null +++ b/packages/build/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../.configs/tsconfig.base.json", + "references": [ + { + "path": "./tsconfig.src.json" + } + ] +} diff --git a/packages/build/tsconfig.src.json b/packages/build/tsconfig.src.json new file mode 100644 index 000000000..db06c5331 --- /dev/null +++ b/packages/build/tsconfig.src.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "include": ["./src/**/*.ts"], + "compilerOptions": { + "isolatedDeclarations": false, + "composite": true, + "sourceMap": true, + "customConditions": ["@triggerdotdev/source"] + } +} diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json index 50cb0e266..80bfc3796 100644 --- a/packages/cli-v3/package.json +++ b/packages/cli-v3/package.json @@ -58,7 +58,8 @@ "ts-essentials": "10.0.1", "tshy": "^3.0.2", "tsx": "4.17.0", - "vitest": "^1.6.0" + "vitest": "^1.6.0", + "typescript": "^5.5.4" }, "scripts": { "typecheck": "tsc", @@ -83,6 +84,7 @@ "@opentelemetry/sdk-trace-node": "1.25.1", "@opentelemetry/semantic-conventions": "1.25.1", "@trigger.dev/core": "workspace:3.0.0-beta.55", + "@trigger.dev/build": "workspace:3.0.0-beta.55", "c12": "^1.11.1", "chalk": "^5.2.0", "cli-table3": "^0.6.3", @@ -115,8 +117,7 @@ "ws": "^8.18.0", "xdg-app-paths": "^8.3.0", "zod": "3.22.3", - "zod-validation-error": "^1.5.0", - "typescript": "^5.5.4" + "zod-validation-error": "^1.5.0" }, "engines": { "node": ">=18.20.0" diff --git a/packages/cli-v3/src/config.ts b/packages/cli-v3/src/config.ts index 5d3c304e6..a41415e2e 100644 --- a/packages/cli-v3/src/config.ts +++ b/packages/cli-v3/src/config.ts @@ -8,7 +8,11 @@ import { basename, dirname, isAbsolute, join, relative } from "node:path"; import { findWorkspaceDir, resolveLockfile, resolvePackageJSON, resolveTSConfig } from "pkg-types"; import { generateCode, loadFile } from "./imports/magicast.js"; import { logger } from "./utilities/logger.js"; -import { additionalFiles, additionalPackages, syncEnvVars } from "@trigger.dev/core/v3/extensions"; +import { + additionalFiles, + additionalPackages, + syncEnvVars, +} from "@trigger.dev/build/extensions/core"; import { prettyWarning } from "./utilities/cliOutput.js"; export type ResolveConfigOptions = { diff --git a/packages/core/package.json b/packages/core/package.json index c62ff285f..0bcfeca04 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -34,7 +34,6 @@ "./versions": "./src/versions.ts", "./v3": "./src/v3/index.ts", "./v3/build": "./src/v3/build/index.ts", - "./v3/extensions": "./src/v3/extensions/index.ts", "./v3/apps": "./src/v3/apps/index.ts", "./v3/errors": "./src/v3/errors.ts", "./v3/logger-api": "./src/v3/logger-api.ts", @@ -87,7 +86,6 @@ "humanize-duration": "^3.27.3", "socket.io-client": "4.7.5", "superjson": "^2.2.1", - "tinyglobby": "^0.2.2", "zod": "3.22.3", "zod-error": "1.5.0", "zod-validation-error": "^1.5.0" @@ -254,17 +252,6 @@ "default": "./dist/commonjs/v3/build/index.js" } }, - "./v3/extensions": { - "import": { - "@triggerdotdev/source": "./src/v3/extensions/index.ts", - "types": "./dist/esm/v3/extensions/index.d.ts", - "default": "./dist/esm/v3/extensions/index.js" - }, - "require": { - "types": "./dist/commonjs/v3/extensions/index.d.ts", - "default": "./dist/commonjs/v3/extensions/index.js" - } - }, "./v3/apps": { "import": { "@triggerdotdev/source": "./src/v3/apps/index.ts", diff --git a/packages/core/src/v3/extensions/index.ts b/packages/core/src/v3/extensions/index.ts deleted file mode 100644 index a6d0203d3..000000000 --- a/packages/core/src/v3/extensions/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -export * from "./emitDecoratorMetadata.js"; -export * from "./additionalFiles.js"; -export * from "./additionalPackages.js"; -export * from "./prisma.js"; -export * from "./syncEnvVars.js"; -export * from "./audioWaveform.js"; diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json index ff977ea55..8abaf3e97 100644 --- a/packages/trigger-sdk/package.json +++ b/packages/trigger-sdk/package.json @@ -23,8 +23,7 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts", - "./v3": "./src/v3/index.ts", - "./v3/extensions": "./src/v3/extensions.ts" + "./v3": "./src/v3/index.ts" }, "sourceDialects": [ "@triggerdotdev/source" @@ -94,17 +93,6 @@ "types": "./dist/commonjs/v3/index.d.ts", "default": "./dist/commonjs/v3/index.js" } - }, - "./v3/extensions": { - "import": { - "@triggerdotdev/source": "./src/v3/extensions.ts", - "types": "./dist/esm/v3/extensions.d.ts", - "default": "./dist/esm/v3/extensions.js" - }, - "require": { - "types": "./dist/commonjs/v3/extensions.d.ts", - "default": "./dist/commonjs/v3/extensions.js" - } } }, "main": "./dist/commonjs/index.js", diff --git a/packages/trigger-sdk/src/v3/extensions.ts b/packages/trigger-sdk/src/v3/extensions.ts deleted file mode 100644 index 892612ef7..000000000 --- a/packages/trigger-sdk/src/v3/extensions.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "@trigger.dev/core/v3/extensions"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5f59d41ae..b20b0fee7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -808,6 +808,37 @@ importers: docs: {} + packages/build: + dependencies: + '@trigger.dev/core': + specifier: workspace:3.0.0-beta.55 + version: link:../core + pkg-types: + specifier: ^1.1.3 + version: 1.1.3 + tinyglobby: + specifier: ^0.2.2 + version: 0.2.2 + devDependencies: + '@types/node': + specifier: 20.14.14 + version: 20.14.14 + esbuild: + specifier: ^0.23.0 + version: 0.23.0 + rimraf: + specifier: 6.0.1 + version: 6.0.1 + tshy: + specifier: ^3.0.2 + version: 3.0.2 + tsx: + specifier: 4.17.0 + version: 4.17.0 + typescript: + specifier: ^5.5.4 + version: 5.5.4 + packages/cli-v3: dependencies: '@clack/prompts': @@ -852,6 +883,9 @@ importers: '@opentelemetry/semantic-conventions': specifier: 1.25.1 version: 1.25.1 + '@trigger.dev/build': + specifier: workspace:3.0.0-beta.55 + version: link:../build '@trigger.dev/core': specifier: workspace:3.0.0-beta.55 version: link:../core @@ -942,9 +976,6 @@ importers: tinyexec: specifier: ^0.2.0 version: 0.2.0 - typescript: - specifier: ^5.5.4 - version: 5.5.4 ws: specifier: ^8.18.0 version: 8.18.0 @@ -997,6 +1028,9 @@ importers: tsx: specifier: 4.17.0 version: 4.17.0 + typescript: + specifier: ^5.5.4 + version: 5.5.4 vitest: specifier: ^1.6.0 version: 1.6.0(@types/node@20.14.14) @@ -1051,9 +1085,6 @@ importers: superjson: specifier: ^2.2.1 version: 2.2.1 - tinyglobby: - specifier: ^0.2.2 - version: 0.2.2 zod: specifier: 3.22.3 version: 3.22.3 @@ -1394,6 +1425,9 @@ importers: '@opentelemetry/semantic-conventions': specifier: ^1.22.0 version: 1.25.1 + '@trigger.dev/build': + specifier: workspace:* + version: link:../../packages/build '@types/email-reply-parser': specifier: ^1.4.2 version: 1.4.2 @@ -17819,6 +17853,7 @@ packages: /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + deprecated: Glob versions prior to v9 are no longer supported dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 @@ -18310,6 +18345,7 @@ packages: /inflight@1.0.6: resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} + deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. dependencies: once: 1.4.0 wrappy: 1.0.2 @@ -23183,6 +23219,7 @@ packages: /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} + deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true dependencies: glob: 7.2.3 diff --git a/references/v3-catalog/package.json b/references/v3-catalog/package.json index 3b90fb84b..333bca37f 100644 --- a/references/v3-catalog/package.json +++ b/references/v3-catalog/package.json @@ -64,6 +64,7 @@ "@types/react": "^18.3.1", "esbuild": "^0.19.11", "trigger.dev": "workspace:*", + "@trigger.dev/build": "workspace:*", "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.5.4", diff --git a/references/v3-catalog/trigger.config.ts b/references/v3-catalog/trigger.config.ts index ad3d01e16..ba0ee9f36 100644 --- a/references/v3-catalog/trigger.config.ts +++ b/references/v3-catalog/trigger.config.ts @@ -1,11 +1,9 @@ -import { OpenAIInstrumentation } from "@traceloop/instrumentation-openai"; -import { defineConfig, ResolveEnvironmentVariablesFunction } from "@trigger.dev/sdk/v3"; -import { - emitDecoratorMetadata, - audioWaveform, - prismaExtension, -} from "@trigger.dev/sdk/v3/extensions"; import { InfisicalClient } from "@infisical/sdk"; +import { OpenAIInstrumentation } from "@traceloop/instrumentation-openai"; +import { audioWaveform } from "@trigger.dev/build/extensions/audioWaveform"; +import { prismaExtension } from "@trigger.dev/build/extensions/prisma"; +import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript"; +import { defineConfig, ResolveEnvironmentVariablesFunction } from "@trigger.dev/sdk/v3"; export const resolveEnvVars: ResolveEnvironmentVariablesFunction = async (ctx) => { if (