diff --git a/packages/internal-bridge/package.json b/packages/internal-bridge/package.json index 1ed25a012..88adf2b5c 100644 --- a/packages/internal-bridge/package.json +++ b/packages/internal-bridge/package.json @@ -6,13 +6,12 @@ "main": "./src/index.ts", "types": "./src/index.ts", "devDependencies": { - "@trigger.dev/common-schemas": "workspace:*", "@trigger.dev/tsconfig": "workspace:*", + "@trigger.dev/common-schemas": "workspace:*", "@types/debug": "^4.1.7", "@types/node": "16", "@types/uuid": "^9.0.0", "@types/ws": "^8.5.3", - "tslib": "^2.4.1", "tsx": "^3.12.1" }, "scripts": {}, diff --git a/packages/trigger-integrations/package.json b/packages/trigger-integrations/package.json index 87171a412..883f27bba 100644 --- a/packages/trigger-integrations/package.json +++ b/packages/trigger-integrations/package.json @@ -4,7 +4,6 @@ "description": "trigger.dev integrations", "main": "./dist/index.js", "types": "./dist/index.d.ts", - "module": "dist/index.es.js", "publishConfig": { "access": "public" }, @@ -12,28 +11,20 @@ "dist" ], "devDependencies": { - "@rollup/plugin-commonjs": "^24.0.0", - "@rollup/plugin-json": "^6.0.0", - "@rollup/plugin-node-resolve": "^15.0.1", "@trigger.dev/tsconfig": "workspace:*", - "@types/node": "16", "internal-providers": "workspace:*", + "@types/node": "16", "rimraf": "^3.0.2", - "rollup": "^3.10.0", - "rollup-plugin-dts": "^5.1.1", - "rollup-plugin-peer-deps-external": "^2.2.4", - "rollup-plugin-typescript2": "^0.34.1", - "tslib": "^2.4.1", "tsup": "^6.5.0" }, "scripts": { - "clean": "rm -rf ./dist", - "build": "npm run clean && npm run build:rollup", - "build:rollup": "rollup -c", - "dev": "npm run clean && rollup -c --watch" + "clean": "rimraf dist", + "build": "npm run clean && npm run build:tsup", + "build:tsup": "tsup", + "dev": "tsup --watch" }, "dependencies": { - "@trigger.dev/sdk": "workspace:*", - "zod": "^3.20.2" + "zod": "^3.20.2", + "@trigger.dev/sdk": "workspace:*" } } diff --git a/packages/trigger-integrations/rollup.config.mjs b/packages/trigger-integrations/rollup.config.mjs deleted file mode 100644 index b80c07ba8..000000000 --- a/packages/trigger-integrations/rollup.config.mjs +++ /dev/null @@ -1,49 +0,0 @@ -import peerDepsExternal from "rollup-plugin-peer-deps-external"; -import resolve from "@rollup/plugin-node-resolve"; -import commonjs from "@rollup/plugin-commonjs"; -import typescript from "rollup-plugin-typescript2"; -import json from "@rollup/plugin-json"; -import dts from "rollup-plugin-dts"; -import * as fs from "fs"; - -const loadJSON = (path) => - JSON.parse(fs.readFileSync(new URL(path, import.meta.url))); -const packageJson = loadJSON("./package.json"); - -export default [ - { - input: "src/index.ts", - output: [ - { - file: packageJson.main, - format: "cjs", - exports: "named", - sourcemap: true, - }, - { - file: packageJson.module, - format: "es", - exports: "named", - sourcemap: true, - }, - ], - plugins: [ - peerDepsExternal(), - resolve({ browser: false, preferBuiltins: true }), - commonjs(), - json(), - typescript({ - useTsconfigDeclarationDir: true, - rollupCommonJSResolveHack: false, - clean: true, - useTsconfigDeclarationDir: true, - }), - ], - external: Object.keys(packageJson.dependencies), - }, - // { - // input: "./dist/dts/@trigger.dev/integrations/src/index.d.ts", - // output: [{ file: "dist/index.d.ts", format: "es" }], - // plugins: [dts()], - // }, -]; diff --git a/packages/trigger-integrations/tsconfig.json b/packages/trigger-integrations/tsconfig.json index 06254d785..ec329884d 100644 --- a/packages/trigger-integrations/tsconfig.json +++ b/packages/trigger-integrations/tsconfig.json @@ -2,13 +2,8 @@ "extends": "@trigger.dev/tsconfig/node16.json", "include": ["./src/**/*.ts", "tsup.config.ts"], "compilerOptions": { - "module": "ESNext", - "moduleResolution": "node", "experimentalDecorators": true, "emitDecoratorMetadata": true, - "declaration": true, - "declarationDir": "dist", - "outDir": "dist/esm", "paths": { "@trigger.dev/sdk/*": ["../trigger-sdk/src/*"], "@trigger.dev/sdk": ["../trigger-sdk/src/index"] diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json index ef8f85d47..ff61ed03d 100644 --- a/packages/trigger-sdk/package.json +++ b/packages/trigger-sdk/package.json @@ -26,7 +26,6 @@ "@types/ws": "^8.5.3", "internal-bridge": "workspace:*", "rimraf": "^3.0.2", - "tslib": "^2.4.1", "tsup": "^6.5.0", "tsx": "^3.12.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 479e0ab9d..836565841 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -558,7 +558,6 @@ importers: '@types/ws': ^8.5.3 debug: ^4.3.4 evt: ^2.4.13 - tslib: ^2.4.1 tsx: ^3.12.1 uuid: ^9.0.0 ws: ^8.11.0 @@ -576,7 +575,6 @@ importers: '@types/node': 16.18.11 '@types/uuid': 9.0.0 '@types/ws': 8.5.4 - tslib: 2.4.1 tsx: 3.12.2 packages/internal-cli: @@ -691,38 +689,22 @@ importers: packages/trigger-integrations: specifiers: - '@rollup/plugin-commonjs': ^24.0.0 - '@rollup/plugin-json': ^6.0.0 - '@rollup/plugin-node-resolve': ^15.0.1 '@trigger.dev/sdk': workspace:* '@trigger.dev/tsconfig': workspace:* '@types/node': '16' internal-providers: workspace:* rimraf: ^3.0.2 - rollup: ^3.10.0 - rollup-plugin-dts: ^5.1.1 - rollup-plugin-peer-deps-external: ^2.2.4 - rollup-plugin-typescript2: ^0.34.1 - tslib: ^2.4.1 tsup: ^6.5.0 zod: ^3.20.2 dependencies: '@trigger.dev/sdk': link:../trigger-sdk zod: 3.20.2 devDependencies: - '@rollup/plugin-commonjs': 24.0.0_rollup@3.10.0 - '@rollup/plugin-json': 6.0.0_rollup@3.10.0 - '@rollup/plugin-node-resolve': 15.0.1_rollup@3.10.0 '@trigger.dev/tsconfig': link:../../config-packages/tsconfig '@types/node': 16.18.11 internal-providers: link:../internal-providers rimraf: 3.0.2 - rollup: 3.10.0 - rollup-plugin-dts: 5.1.1_eymahajmafh3u7vrzmo7ylp2pa - rollup-plugin-peer-deps-external: 2.2.4_rollup@3.10.0 - rollup-plugin-typescript2: 0.34.1_eymahajmafh3u7vrzmo7ylp2pa - tslib: 2.4.1 - tsup: 6.5.0_typescript@4.9.4 + tsup: 6.5.0 packages/trigger-sdk: specifiers: @@ -736,7 +718,6 @@ importers: evt: ^2.4.13 internal-bridge: workspace:* rimraf: ^3.0.2 - tslib: ^2.4.1 tsup: ^6.5.0 tsx: ^3.12.1 ulid: ^2.3.0 @@ -759,7 +740,6 @@ importers: '@types/ws': 8.5.4 internal-bridge: link:../internal-bridge rimraf: 3.0.2 - tslib: 2.4.1 tsup: 6.5.0 tsx: 3.12.2 @@ -4771,55 +4751,6 @@ packages: web-streams-polyfill: 3.2.1 dev: false - /@rollup/plugin-commonjs/24.0.0_rollup@3.10.0: - resolution: {integrity: sha512-0w0wyykzdyRRPHOb0cQt14mIBLujfAv6GgP6g8nvg/iBxEm112t3YPPq+Buqe2+imvElTka+bjNlJ/gB56TD8g==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.68.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2_rollup@3.10.0 - commondir: 1.0.1 - estree-walker: 2.0.2 - glob: 8.0.3 - is-reference: 1.2.1 - magic-string: 0.27.0 - rollup: 3.10.0 - dev: true - - /@rollup/plugin-json/6.0.0_rollup@3.10.0: - resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2_rollup@3.10.0 - rollup: 3.10.0 - dev: true - - /@rollup/plugin-node-resolve/15.0.1_rollup@3.10.0: - resolution: {integrity: sha512-ReY88T7JhJjeRVbfCyNj+NXAG3IIsVMsX9b5/9jC98dRP8/yxlZdz7mHZbHk5zHr24wZZICS5AcXsFZAXYUQEg==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.78.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2_rollup@3.10.0 - '@types/resolve': 1.20.2 - deepmerge: 4.2.2 - is-builtin-module: 3.2.0 - is-module: 1.0.0 - resolve: 1.22.1 - rollup: 3.10.0 - dev: true - /@rollup/pluginutils/4.2.1: resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} engines: {node: '>= 8.0.0'} @@ -4828,21 +4759,6 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/pluginutils/5.0.2_rollup@3.10.0: - resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@types/estree': 1.0.0 - estree-walker: 2.0.2 - picomatch: 2.3.1 - rollup: 3.10.0 - dev: true - /@rushstack/eslint-patch/1.2.0: resolution: {integrity: sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==} dev: true @@ -5622,10 +5538,6 @@ packages: csstype: 3.1.1 dev: true - /@types/resolve/1.20.2: - resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} - dev: true - /@types/responselike/1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: @@ -6734,11 +6646,6 @@ packages: engines: {node: '>=0.2.0'} dev: false - /builtin-modules/3.3.0: - resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} - engines: {node: '>=6'} - dev: true - /builtins/1.0.3: resolution: {integrity: sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==} dev: true @@ -7822,6 +7729,7 @@ packages: /deepmerge/4.2.2: resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==} engines: {node: '>=0.10.0'} + dev: false /defaults/1.0.4: resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} @@ -9513,15 +9421,6 @@ packages: pkg-dir: 3.0.0 dev: true - /find-cache-dir/3.3.2: - resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==} - engines: {node: '>=8'} - dependencies: - commondir: 1.0.1 - make-dir: 3.1.0 - pkg-dir: 4.2.0 - dev: true - /find-up/3.0.0: resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==} engines: {node: '>=6'} @@ -10625,13 +10524,6 @@ packages: engines: {node: '>=4'} dev: true - /is-builtin-module/3.2.0: - resolution: {integrity: sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==} - engines: {node: '>=6'} - dependencies: - builtin-modules: 3.3.0 - dev: true - /is-callable/1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} @@ -10782,10 +10674,6 @@ packages: resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==} dev: true - /is-module/1.0.0: - resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} - dev: true - /is-negative-zero/2.0.2: resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==} engines: {node: '>= 0.4'} @@ -10848,12 +10736,6 @@ packages: dependencies: isobject: 3.0.1 - /is-reference/1.2.1: - resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==} - dependencies: - '@types/estree': 1.0.0 - dev: true - /is-reference/3.0.1: resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==} dependencies: @@ -11642,13 +11524,6 @@ packages: sourcemap-codec: 1.4.8 dev: true - /magic-string/0.27.0: - resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.14 - dev: true - /make-dir/2.1.0: resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} engines: {node: '>=6'} @@ -13254,6 +13129,7 @@ packages: engines: {node: '>=8'} dependencies: find-up: 4.1.0 + dev: false /posix-character-classes/0.1.1: resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==} @@ -14349,20 +14225,6 @@ packages: dependencies: glob: 7.2.3 - /rollup-plugin-dts/5.1.1_eymahajmafh3u7vrzmo7ylp2pa: - resolution: {integrity: sha512-zpgo52XmnLg8w4k3MScinFHZK1+ro6r7uVe34fJ0Ee8AM45FvgvTuvfWWaRgIpA4pQ1BHJuu2ospncZhkcJVeA==} - engines: {node: '>=v14'} - peerDependencies: - rollup: ^3.0.0 - typescript: ^4.1 - dependencies: - magic-string: 0.27.0 - rollup: 3.10.0 - typescript: 4.9.4 - optionalDependencies: - '@babel/code-frame': 7.18.6 - dev: true - /rollup-plugin-inject/3.0.2: resolution: {integrity: sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==} deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject. @@ -14378,29 +14240,6 @@ packages: rollup-plugin-inject: 3.0.2 dev: true - /rollup-plugin-peer-deps-external/2.2.4_rollup@3.10.0: - resolution: {integrity: sha512-AWdukIM1+k5JDdAqV/Cxd+nejvno2FVLVeZ74NKggm3Q5s9cbbcOgUPGdbxPi4BXu7xGaZ8HG12F+thImYu/0g==} - peerDependencies: - rollup: '*' - dependencies: - rollup: 3.10.0 - dev: true - - /rollup-plugin-typescript2/0.34.1_eymahajmafh3u7vrzmo7ylp2pa: - resolution: {integrity: sha512-P4cHLtGikESmqi1CA+tdMDUv8WbQV48mzPYt77TSTOPJpERyZ9TXdDgjSDix8Fkqce6soYz3+fa4lrC93IEkcw==} - peerDependencies: - rollup: '>=1.26.3' - typescript: '>=2.4.0' - dependencies: - '@rollup/pluginutils': 4.2.1 - find-cache-dir: 3.3.2 - fs-extra: 10.1.0 - rollup: 3.10.0 - semver: 7.3.8 - tslib: 2.4.1 - typescript: 4.9.4 - dev: true - /rollup-pluginutils/2.8.2: resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==} dependencies: