From 66840a766d6f3dbc794eb434ac2a1d7719d46f32 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Fri, 5 Jul 2024 12:22:17 +0100 Subject: [PATCH] Switched @trigger.dev/billing to @trigger.dev/platform --- .../billing/v2/PricingCalculator.tsx | 2 +- .../components/billing/v2/PricingTiers.tsx | 2 +- .../billing/v2/RunsVolumeDiscountTable.tsx | 2 +- .../presenters/OrgUsagePresenter.server.ts | 2 +- .../route.tsx | 2 +- .../route.tsx | 2 +- .../resources.$organizationSlug.subscribe.ts | 2 +- ...ces.orgs.$organizationSlug.select-plan.tsx | 2 +- apps/webapp/app/services/billing.v2.server.ts | 2 +- .../webapp/app/services/platform.v3.server.ts | 2 +- apps/webapp/app/v3/machinePresets.server.ts | 2 +- apps/webapp/package.json | 2 +- apps/webapp/remix.config.js | 2 +- pnpm-lock.yaml | 56 +++++-------------- 14 files changed, 26 insertions(+), 56 deletions(-) diff --git a/apps/webapp/app/components/billing/v2/PricingCalculator.tsx b/apps/webapp/app/components/billing/v2/PricingCalculator.tsx index ed4331f51..7ec7bc8cd 100644 --- a/apps/webapp/app/components/billing/v2/PricingCalculator.tsx +++ b/apps/webapp/app/components/billing/v2/PricingCalculator.tsx @@ -1,5 +1,5 @@ import * as Slider from "@radix-ui/react-slider"; -import { Plans, estimate } from "@trigger.dev/billing/v2"; +import { Plans, estimate } from "@trigger.dev/platform/v2"; import { useCallback, useState } from "react"; import { DefinitionTip } from "../../DefinitionTooltip"; import { Header2 } from "../../primitives/Headers"; diff --git a/apps/webapp/app/components/billing/v2/PricingTiers.tsx b/apps/webapp/app/components/billing/v2/PricingTiers.tsx index e86279f94..54e4aedd6 100644 --- a/apps/webapp/app/components/billing/v2/PricingTiers.tsx +++ b/apps/webapp/app/components/billing/v2/PricingTiers.tsx @@ -2,7 +2,7 @@ import { useForm } from "@conform-to/react"; import { parse } from "@conform-to/zod"; import { CheckIcon, XMarkIcon } from "@heroicons/react/24/solid"; import { Form, useActionData, useNavigation } from "@remix-run/react"; -import { ActiveSubscription, Plan, Plans, SetPlanBodySchema } from "@trigger.dev/billing/v2"; +import { ActiveSubscription, Plan, Plans, SetPlanBodySchema } from "@trigger.dev/platform/v2"; import { useState } from "react"; import { useCurrentPlan } from "~/routes/_app.orgs.$organizationSlug/route"; import { cn } from "~/utils/cn"; diff --git a/apps/webapp/app/components/billing/v2/RunsVolumeDiscountTable.tsx b/apps/webapp/app/components/billing/v2/RunsVolumeDiscountTable.tsx index 5c556e929..d8215a409 100644 --- a/apps/webapp/app/components/billing/v2/RunsVolumeDiscountTable.tsx +++ b/apps/webapp/app/components/billing/v2/RunsVolumeDiscountTable.tsx @@ -1,4 +1,4 @@ -import { RunPriceBracket } from "@trigger.dev/billing/v2"; +import { RunPriceBracket } from "@trigger.dev/platform/v2"; import { Header2 } from "../../primitives/Headers"; import { Paragraph } from "../../primitives/Paragraph"; import { formatNumberCompact } from "~/utils/numberFormatter"; diff --git a/apps/webapp/app/presenters/OrgUsagePresenter.server.ts b/apps/webapp/app/presenters/OrgUsagePresenter.server.ts index 7b8abb698..4c64c520e 100644 --- a/apps/webapp/app/presenters/OrgUsagePresenter.server.ts +++ b/apps/webapp/app/presenters/OrgUsagePresenter.server.ts @@ -1,4 +1,4 @@ -import { estimate } from "@trigger.dev/billing/v2"; +import { estimate } from "@trigger.dev/platform/v2"; import { sqlDatabaseSchema } from "~/db.server"; import { featuresForRequest } from "~/features.server"; import { BillingService } from "~/services/billing.v2.server"; diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing/route.tsx index 70cbf9442..96109fe17 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing/route.tsx @@ -1,7 +1,7 @@ import { CalendarDaysIcon, ReceiptRefundIcon } from "@heroicons/react/20/solid"; import { ArrowUpCircleIcon } from "@heroicons/react/24/outline"; import { Outlet } from "@remix-run/react"; -import { ActiveSubscription } from "@trigger.dev/billing/v2"; +import { ActiveSubscription } from "@trigger.dev/platform/v2"; import { formatDurationInDays } from "@trigger.dev/core/v3"; import { PageBody, PageContainer } from "~/components/layout/AppLayout"; import { LinkButton } from "~/components/primitives/Buttons"; diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.v3.billing/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.v3.billing/route.tsx index fdfb204a9..4818a12ad 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.v3.billing/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.v3.billing/route.tsx @@ -12,7 +12,7 @@ import { v3StripePortalPath, } from "~/utils/pathBuilder"; import { PricingPlans } from "../resources.orgs.$organizationSlug.select-plan"; -import { PlanDefinition } from "@trigger.dev/billing/v3"; +import { PlanDefinition } from "@trigger.dev/platform/v3"; import { CalendarDaysIcon, StarIcon } from "@heroicons/react/20/solid"; import { DateTime } from "~/components/primitives/DateTime"; import { getCurrentPlan, getPlans } from "~/services/platform.v3.server"; diff --git a/apps/webapp/app/routes/resources.$organizationSlug.subscribe.ts b/apps/webapp/app/routes/resources.$organizationSlug.subscribe.ts index dc92131bf..cc67dea11 100644 --- a/apps/webapp/app/routes/resources.$organizationSlug.subscribe.ts +++ b/apps/webapp/app/routes/resources.$organizationSlug.subscribe.ts @@ -1,6 +1,6 @@ import { parse } from "@conform-to/zod"; import { ActionFunctionArgs, json } from "@remix-run/server-runtime"; -import { SetPlanBodySchema } from "@trigger.dev/billing/v2"; +import { SetPlanBodySchema } from "@trigger.dev/platform/v2"; import { redirect } from "remix-typedjson"; import { prisma } from "~/db.server"; import { redirectWithSuccessMessage } from "~/models/message.server"; diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx index 34e27985a..2cdb1e2ea 100644 --- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx +++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx @@ -13,7 +13,7 @@ import { Plans, SetPlanBody, SubscriptionResult, -} from "@trigger.dev/billing/v3"; +} from "@trigger.dev/platform/v3"; import { GitHubLightIcon } from "@trigger.dev/companyicons"; import { z } from "zod"; import { DefinitionTip } from "~/components/DefinitionTooltip"; diff --git a/apps/webapp/app/services/billing.v2.server.ts b/apps/webapp/app/services/billing.v2.server.ts index 7c86e6c53..8ec3e1518 100644 --- a/apps/webapp/app/services/billing.v2.server.ts +++ b/apps/webapp/app/services/billing.v2.server.ts @@ -1,4 +1,4 @@ -import { BillingClient, SetPlanBody } from "@trigger.dev/billing/v2"; +import { BillingClient, SetPlanBody } from "@trigger.dev/platform/v2"; import { $replica, PrismaClient, PrismaReplicaClient, prisma } from "~/db.server"; import { env } from "~/env.server"; import { logger } from "~/services/logger.server"; diff --git a/apps/webapp/app/services/platform.v3.server.ts b/apps/webapp/app/services/platform.v3.server.ts index dbb0d6564..4f4c5d24b 100644 --- a/apps/webapp/app/services/platform.v3.server.ts +++ b/apps/webapp/app/services/platform.v3.server.ts @@ -1,4 +1,4 @@ -import { BillingClient, Limits, SetPlanBody, UsageSeriesParams } from "@trigger.dev/billing/v3"; +import { BillingClient, Limits, SetPlanBody, UsageSeriesParams } from "@trigger.dev/platform/v3"; import { Organization, Project } from "@trigger.dev/database"; import { redirect } from "remix-typedjson"; import { $replica } from "~/db.server"; diff --git a/apps/webapp/app/v3/machinePresets.server.ts b/apps/webapp/app/v3/machinePresets.server.ts index 80475505f..ce824eb3d 100644 --- a/apps/webapp/app/v3/machinePresets.server.ts +++ b/apps/webapp/app/v3/machinePresets.server.ts @@ -1,4 +1,4 @@ -import { machineDefinition } from "@trigger.dev/billing/v3"; +import { machineDefinition } from "@trigger.dev/platform/v3"; import { MachineConfig, MachinePreset, MachinePresetName } from "@trigger.dev/core/v3"; import { env } from "~/env.server"; import { logger } from "~/services/logger.server"; diff --git a/apps/webapp/package.json b/apps/webapp/package.json index 703e812a3..543279c2a 100644 --- a/apps/webapp/package.json +++ b/apps/webapp/package.json @@ -91,7 +91,7 @@ "@tailwindcss/container-queries": "^0.1.1", "@tanstack/react-virtual": "^3.0.4", "@team-plain/typescript-sdk": "^3.5.0", - "@trigger.dev/billing": "link:../../../cloud/packages/billing", + "@trigger.dev/platform": "link:../../../cloud/packages/platform", "@trigger.dev/companyicons": "^1.5.35", "@trigger.dev/core": "workspace:*", "@trigger.dev/core-backend": "workspace:*", diff --git a/apps/webapp/remix.config.js b/apps/webapp/remix.config.js index ea4bf3037..ee2aee289 100644 --- a/apps/webapp/remix.config.js +++ b/apps/webapp/remix.config.js @@ -14,7 +14,7 @@ module.exports = { "@trigger.dev/core", "@trigger.dev/core-backend", "@trigger.dev/sdk", - "@trigger.dev/billing", + "@trigger.dev/platform", "@trigger.dev/yalt", "emails", "highlight.run", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7d56359cd..8bcbc9b01 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -375,9 +375,6 @@ importers: '@team-plain/typescript-sdk': specifier: ^3.5.0 version: 3.5.0 - '@trigger.dev/billing': - specifier: link:../../../cloud/packages/billing - version: link:../../../cloud/packages/billing '@trigger.dev/companyicons': specifier: ^1.5.35 version: 1.5.35(react-dom@18.2.0)(react@18.2.0) @@ -393,6 +390,9 @@ importers: '@trigger.dev/otlp-importer': specifier: workspace:* version: link:../../packages/otlp-importer + '@trigger.dev/platform': + specifier: link:../../../cloud/packages/platform + version: link:../../../cloud/packages/platform '@trigger.dev/sdk': specifier: workspace:* version: link:../../packages/trigger-sdk @@ -13793,7 +13793,7 @@ packages: eslint: 8.45.0 eslint-import-resolver-node: 0.3.7 eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5)(eslint@8.45.0) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.6)(eslint@8.45.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0) eslint-plugin-jest: 26.9.0(@typescript-eslint/eslint-plugin@5.59.6)(eslint@8.45.0)(typescript@4.9.5) eslint-plugin-jest-dom: 4.0.3(eslint@8.45.0) eslint-plugin-jsx-a11y: 6.7.1(eslint@8.45.0) @@ -16509,7 +16509,6 @@ packages: typescript: 4.9.5 transitivePeerDependencies: - supports-color - dev: true /@typescript-eslint/parser@5.59.6(eslint@8.45.0)(typescript@5.1.6): resolution: {integrity: sha512-7pCa6al03Pv1yf/dUg/s1pXz/yGMUBAw5EeWqNTFiSueKvRNonze3hma3lhdsOrQcaOXhbk5gKu2Fludiho9VA==} @@ -16529,6 +16528,7 @@ packages: typescript: 5.1.6 transitivePeerDependencies: - supports-color + dev: false /@typescript-eslint/parser@5.59.6(eslint@8.45.0)(typescript@5.2.2): resolution: {integrity: sha512-7pCa6al03Pv1yf/dUg/s1pXz/yGMUBAw5EeWqNTFiSueKvRNonze3hma3lhdsOrQcaOXhbk5gKu2Fludiho9VA==} @@ -16694,7 +16694,6 @@ packages: typescript: 4.9.5 transitivePeerDependencies: - supports-color - dev: true /@typescript-eslint/typescript-estree@5.59.6(typescript@5.0.4): resolution: {integrity: sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA==} @@ -16736,6 +16735,7 @@ packages: typescript: 5.1.6 transitivePeerDependencies: - supports-color + dev: false /@typescript-eslint/typescript-estree@5.59.6(typescript@5.2.2): resolution: {integrity: sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA==} @@ -21116,7 +21116,7 @@ packages: eslint: 8.45.0 eslint-import-resolver-node: 0.3.7 eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5)(eslint@8.45.0) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0) + eslint-plugin-import: 2.27.5(eslint@8.45.0) eslint-plugin-jsx-a11y: 6.7.1(eslint@8.45.0) eslint-plugin-react: 7.32.2(eslint@8.45.0) eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705(eslint@8.45.0) @@ -21406,7 +21406,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.59.6(eslint@8.45.0)(typescript@5.1.6) + '@typescript-eslint/parser': 5.59.6(eslint@8.45.0)(typescript@4.9.5) debug: 3.2.7(supports-color@5.5.0) eslint: 8.45.0 eslint-import-resolver-node: 0.3.7 @@ -21414,35 +21414,6 @@ packages: transitivePeerDependencies: - supports-color - /eslint-module-utils@2.7.4(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint@8.45.0): - resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==} - engines: {node: '>=4'} - peerDependencies: - '@typescript-eslint/parser': '*' - eslint: '*' - eslint-import-resolver-node: '*' - eslint-import-resolver-typescript: '*' - eslint-import-resolver-webpack: '*' - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true - eslint: - optional: true - eslint-import-resolver-node: - optional: true - eslint-import-resolver-typescript: - optional: true - eslint-import-resolver-webpack: - optional: true - dependencies: - '@typescript-eslint/parser': 5.59.6(eslint@8.45.0)(typescript@4.9.5) - debug: 3.2.7(supports-color@5.5.0) - eslint: 8.45.0 - eslint-import-resolver-node: 0.3.7 - transitivePeerDependencies: - - supports-color - dev: true - /eslint-plugin-es@3.0.1(eslint@8.31.0): resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==} engines: {node: '>=8.10.0'} @@ -21552,7 +21523,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.59.6(eslint@8.45.0)(typescript@5.1.6) + '@typescript-eslint/parser': 5.59.6(eslint@8.45.0)(typescript@4.9.5) array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 @@ -21574,7 +21545,7 @@ packages: - eslint-import-resolver-webpack - supports-color - /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.59.6)(eslint@8.45.0): + /eslint-plugin-import@2.27.5(eslint@8.45.0): resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==} engines: {node: '>=4'} peerDependencies: @@ -21584,7 +21555,6 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.59.6(eslint@8.45.0)(typescript@4.9.5) array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 @@ -21592,7 +21562,7 @@ packages: doctrine: 2.1.0 eslint: 8.45.0 eslint-import-resolver-node: 0.3.7 - eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint@8.45.0) + eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0) has: 1.0.3 is-core-module: 2.13.0 is-glob: 4.0.3 @@ -21605,7 +21575,7 @@ packages: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color - dev: true + dev: false /eslint-plugin-jest-dom@4.0.3(eslint@8.31.0): resolution: {integrity: sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==} @@ -34211,7 +34181,6 @@ packages: dependencies: tslib: 1.14.1 typescript: 4.9.5 - dev: true /tsutils@3.21.0(typescript@5.0.4): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} @@ -34231,6 +34200,7 @@ packages: dependencies: tslib: 1.14.1 typescript: 5.1.6 + dev: false /tsutils@3.21.0(typescript@5.2.2): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}