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

Switched @trigger.dev/billing to @trigger.dev/platform

Browse Source
This commit is contained in:
Matt Aitken
2024-07-05 12:22:17 +01:00
parent fc9a0ddf12
commit 66840a766d
14 changed files with 26 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/webapp/app/components/billing/v2/PricingCalculator.tsx
+1 -1
View File
@@ -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";
apps/webapp/app/components/billing/v2/PricingTiers.tsx
+1 -1
View File
@@ -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";
apps/webapp/app/components/billing/v2/RunsVolumeDiscountTable.tsx
+1 -1
View File
@@ -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";
apps/webapp/app/presenters/OrgUsagePresenter.server.ts
+1 -1
View File
@@ -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";
apps/webapp/app/routes/_app.orgs.$organizationSlug.billing/route.tsx
+1 -1
View File
@@ -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";
apps/webapp/app/routes/_app.orgs.$organizationSlug.v3.billing/route.tsx
+1 -1
View File
@@ -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";
apps/webapp/app/routes/resources.$organizationSlug.subscribe.ts
+1 -1
View File
@@ -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";
apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
+1 -1
View File
@@ -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";
apps/webapp/app/services/billing.v2.server.ts
+1 -1
View File
@@ -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";
apps/webapp/app/services/platform.v3.server.ts
+1 -1
View File
@@ -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";
apps/webapp/app/v3/machinePresets.server.ts
+1 -1
View File
@@ -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";
apps/webapp/package.json
+1 -1
View File
@@ -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:*",
apps/webapp/remix.config.js
+1 -1
View File
@@ -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",
pnpm-lock.yaml
Generated
+13 -43
View File
@@ -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==}