From 09c24346a61749b22f22e0a228140c6b4d5c35d9 Mon Sep 17 00:00:00 2001 From: giancarlo Date: Wed, 15 May 2024 11:28:37 +0700 Subject: [PATCH] Update logging and return statements in billing services The commit modifies the logging level in the billing services from 'error' to 'info'. Moreover, the error statement has been modified to clarify that the subscription cancellation has possibly been done by the user. Also, it reduces redundant imports and beefs up the return structure in stripe-billing-strategy.service. --- apps/web/package.json | 6 +- packages/billing/gateway/package.json | 2 +- .../billing-gateway.service.ts | 2 - .../lemon-squeezy-billing-strategy.service.ts | 4 +- .../stripe-billing-strategy.service.ts | 12 +- packages/features/accounts/package.json | 2 +- packages/features/admin/package.json | 4 +- packages/features/auth/package.json | 2 +- packages/features/team-accounts/package.json | 4 +- packages/shared/package.json | 2 +- packages/ui/package.json | 4 +- pnpm-lock.yaml | 247 +++++++++++------- tooling/eslint/package.json | 2 +- tooling/prettier/package.json | 2 +- 14 files changed, 182 insertions(+), 113 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 38cbb833f..f3ef6f3b6 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@edge-csrf/nextjs": "2.0.0", - "@hookform/resolvers": "^3.3.4", + "@hookform/resolvers": "^3.4.0", "@kit/accounts": "workspace:^", "@kit/admin": "workspace:^", "@kit/auth": "workspace:^", @@ -57,7 +57,7 @@ "@supabase/supabase-js": "^2.43.1", "@tanstack/react-query": "5.36.0", "@tanstack/react-query-next-experimental": "^5.36.0", - "@tanstack/react-table": "^8.17.0", + "@tanstack/react-table": "^8.17.3", "date-fns": "^3.6.0", "lucide-react": "^0.378.0", "next": "14.2.3", @@ -86,7 +86,7 @@ "dotenv-cli": "^7.4.2", "eslint": "^8.57.0", "prettier": "^3.2.5", - "supabase": "^1.165.0", + "supabase": "^1.167.4", "tailwindcss": "3.4.3", "typescript": "^5.4.5" }, diff --git a/packages/billing/gateway/package.json b/packages/billing/gateway/package.json index e2d2fc695..03bc086ba 100644 --- a/packages/billing/gateway/package.json +++ b/packages/billing/gateway/package.json @@ -16,7 +16,7 @@ "./marketing": "./src/components/marketing.tsx" }, "devDependencies": { - "@hookform/resolvers": "^3.3.4", + "@hookform/resolvers": "^3.4.0", "@kit/billing": "workspace:^", "@kit/eslint-config": "workspace:*", "@kit/lemon-squeezy": "workspace:^", diff --git a/packages/billing/gateway/src/server/services/billing-gateway/billing-gateway.service.ts b/packages/billing/gateway/src/server/services/billing-gateway/billing-gateway.service.ts index aaa82216f..b02e1c041 100644 --- a/packages/billing/gateway/src/server/services/billing-gateway/billing-gateway.service.ts +++ b/packages/billing/gateway/src/server/services/billing-gateway/billing-gateway.service.ts @@ -1,5 +1,3 @@ -import 'server-only'; - import { z } from 'zod'; import { BillingProviderSchema } from '@kit/billing'; diff --git a/packages/billing/lemon-squeezy/src/services/lemon-squeezy-billing-strategy.service.ts b/packages/billing/lemon-squeezy/src/services/lemon-squeezy-billing-strategy.service.ts index bf95e41ff..8db513deb 100644 --- a/packages/billing/lemon-squeezy/src/services/lemon-squeezy-billing-strategy.service.ts +++ b/packages/billing/lemon-squeezy/src/services/lemon-squeezy-billing-strategy.service.ts @@ -143,12 +143,12 @@ export class LemonSqueezyBillingStrategyService return { success: true }; } catch (error) { - logger.error( + logger.info( { ...ctx, error: (error as Error)?.message, }, - 'Failed to cancel subscription. It may have already been cancelled.', + `Failed to cancel subscription. It may have already been cancelled on the user's end.`, ); return { success: false }; diff --git a/packages/billing/stripe/src/services/stripe-billing-strategy.service.ts b/packages/billing/stripe/src/services/stripe-billing-strategy.service.ts index 331c23607..7fb8781be 100644 --- a/packages/billing/stripe/src/services/stripe-billing-strategy.service.ts +++ b/packages/billing/stripe/src/services/stripe-billing-strategy.service.ts @@ -116,17 +116,21 @@ export class StripeBillingStrategyService logger.info(ctx, 'Subscription cancelled successfully'); - return { success: true }; + return { + success: true, + }; } catch (error) { - logger.error( + logger.info( { ...ctx, error, }, - 'Failed to cancel subscription. It may have already been cancelled.', + `Failed to cancel subscription. It may have already been cancelled on the user's end.`, ); - return { success: false }; + return { + success: false, + }; } } diff --git a/packages/features/accounts/package.json b/packages/features/accounts/package.json index dab31c6f8..49e7b4526 100644 --- a/packages/features/accounts/package.json +++ b/packages/features/accounts/package.json @@ -19,7 +19,7 @@ "nanoid": "^5.0.7" }, "devDependencies": { - "@hookform/resolvers": "^3.3.4", + "@hookform/resolvers": "^3.4.0", "@kit/billing-gateway": "workspace:^", "@kit/email-templates": "workspace:^", "@kit/eslint-config": "workspace:*", diff --git a/packages/features/admin/package.json b/packages/features/admin/package.json index 88dd43776..5e9af9407 100644 --- a/packages/features/admin/package.json +++ b/packages/features/admin/package.json @@ -10,7 +10,7 @@ }, "prettier": "@kit/prettier-config", "devDependencies": { - "@hookform/resolvers": "^3.3.4", + "@hookform/resolvers": "^3.4.0", "@kit/eslint-config": "workspace:*", "@kit/next": "workspace:^", "@kit/prettier-config": "workspace:*", @@ -22,7 +22,7 @@ "@makerkit/data-loader-supabase-nextjs": "^1.2.3", "@supabase/supabase-js": "^2.43.1", "@tanstack/react-query": "5.36.0", - "@tanstack/react-table": "^8.17.0", + "@tanstack/react-table": "^8.17.3", "@types/react": "^18.3.1", "lucide-react": "^0.378.0", "next": "14.2.3", diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json index c369bd3ea..1287cf662 100644 --- a/packages/features/auth/package.json +++ b/packages/features/auth/package.json @@ -18,7 +18,7 @@ "./captcha/server": "./src/captcha/server/index.ts" }, "devDependencies": { - "@hookform/resolvers": "^3.3.4", + "@hookform/resolvers": "^3.4.0", "@kit/eslint-config": "workspace:*", "@kit/prettier-config": "workspace:*", "@kit/shared": "workspace:^", diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json index b66725229..5ecb7888a 100644 --- a/packages/features/team-accounts/package.json +++ b/packages/features/team-accounts/package.json @@ -17,7 +17,7 @@ "nanoid": "^5.0.7" }, "devDependencies": { - "@hookform/resolvers": "^3.3.4", + "@hookform/resolvers": "^3.4.0", "@kit/accounts": "workspace:^", "@kit/billing-gateway": "workspace:*", "@kit/email-templates": "workspace:^", @@ -33,7 +33,7 @@ "@kit/ui": "workspace:^", "@supabase/supabase-js": "^2.43.1", "@tanstack/react-query": "5.36.0", - "@tanstack/react-table": "^8.17.0", + "@tanstack/react-table": "^8.17.3", "@types/react": "^18.3.1", "@types/react-dom": "^18.3.0", "class-variance-authority": "^0.7.0", diff --git a/packages/shared/package.json b/packages/shared/package.json index 70684645d..4c39851e9 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -19,7 +19,7 @@ "@kit/prettier-config": "workspace:*", "@kit/tailwind-config": "workspace:*", "@kit/tsconfig": "workspace:*", - "@tanstack/react-table": "^8.17.0" + "@tanstack/react-table": "^8.17.3" }, "dependencies": { "pino": "^9.1.0" diff --git a/packages/ui/package.json b/packages/ui/package.json index 95c666831..a86df43cc 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -9,7 +9,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@hookform/resolvers": "^3.3.4", + "@hookform/resolvers": "^3.4.0", "@radix-ui/react-accordion": "1.1.2", "@radix-ui/react-alert-dialog": "^1.0.5", "@radix-ui/react-avatar": "^1.0.4", @@ -41,7 +41,7 @@ "@kit/tailwind-config": "workspace:*", "@kit/tsconfig": "workspace:*", "@radix-ui/react-icons": "^1.3.0", - "@tanstack/react-table": "^8.17.0", + "@tanstack/react-table": "^8.17.3", "@types/react": "^18.3.1", "@types/react-dom": "^18.3.0", "class-variance-authority": "^0.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eba30c56a..1ae361817 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,8 +55,8 @@ importers: specifier: 2.0.0 version: 2.0.0(next@14.2.3(@opentelemetry/api@1.8.0)(@playwright/test@1.44.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)) '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.4(react@18.3.1)) + specifier: ^3.4.0 + version: 3.4.0(react-hook-form@7.51.4(react@18.3.1)) '@kit/accounts': specifier: workspace:^ version: link:../../packages/features/accounts @@ -130,8 +130,8 @@ importers: specifier: ^5.36.0 version: 5.36.0(@tanstack/react-query@5.36.0(react@18.3.1))(next@14.2.3(@opentelemetry/api@1.8.0)(@playwright/test@1.44.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@tanstack/react-table': - specifier: ^8.17.0 - version: 8.17.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^8.17.3 + version: 8.17.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) date-fns: specifier: ^3.6.0 version: 3.6.0 @@ -212,8 +212,8 @@ importers: specifier: ^3.2.5 version: 3.2.5 supabase: - specifier: ^1.165.0 - version: 1.165.0 + specifier: ^1.167.4 + version: 1.167.4 tailwindcss: specifier: 3.4.3 version: 3.4.3(ts-node@10.9.2(@types/node@20.12.10)(typescript@5.4.5)) @@ -248,8 +248,8 @@ importers: packages/billing/gateway: devDependencies: '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.4(react@18.3.1)) + specifier: ^3.4.0 + version: 3.4.0(react-hook-form@7.51.4(react@18.3.1)) '@kit/billing': specifier: workspace:^ version: link:../core @@ -550,8 +550,8 @@ importers: version: 5.0.7 devDependencies: '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.4(react@18.3.1)) + specifier: ^3.4.0 + version: 3.4.0(react-hook-form@7.51.4(react@18.3.1)) '@kit/billing-gateway': specifier: workspace:^ version: link:../../billing/gateway @@ -634,8 +634,8 @@ importers: packages/features/admin: devDependencies: '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.4(react@18.3.1)) + specifier: ^3.4.0 + version: 3.4.0(react-hook-form@7.51.4(react@18.3.1)) '@kit/eslint-config': specifier: workspace:* version: link:../../../tooling/eslint @@ -670,8 +670,8 @@ importers: specifier: 5.36.0 version: 5.36.0(react@18.3.1) '@tanstack/react-table': - specifier: ^8.17.0 - version: 8.17.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^8.17.3 + version: 8.17.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/react': specifier: ^18.3.1 version: 18.3.1 @@ -697,8 +697,8 @@ importers: packages/features/auth: devDependencies: '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.4(react@18.3.1)) + specifier: ^3.4.0 + version: 3.4.0(react-hook-form@7.51.4(react@18.3.1)) '@kit/eslint-config': specifier: workspace:* version: link:../../../tooling/eslint @@ -803,8 +803,8 @@ importers: version: 5.0.7 devDependencies: '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.4(react@18.3.1)) + specifier: ^3.4.0 + version: 3.4.0(react-hook-form@7.51.4(react@18.3.1)) '@kit/accounts': specifier: workspace:^ version: link:../accounts @@ -851,8 +851,8 @@ importers: specifier: 5.36.0 version: 5.36.0(react@18.3.1) '@tanstack/react-table': - specifier: ^8.17.0 - version: 8.17.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^8.17.3 + version: 8.17.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/react': specifier: ^18.3.1 version: 18.3.1 @@ -1129,8 +1129,8 @@ importers: specifier: workspace:* version: link:../../tooling/typescript '@tanstack/react-table': - specifier: ^8.17.0 - version: 8.17.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^8.17.3 + version: 8.17.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) packages/supabase: devDependencies: @@ -1174,8 +1174,8 @@ importers: packages/ui: dependencies: '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.4(react@18.3.1)) + specifier: ^3.4.0 + version: 3.4.0(react-hook-form@7.51.4(react@18.3.1)) '@radix-ui/react-accordion': specifier: 1.1.2 version: 1.1.2(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1265,8 +1265,8 @@ importers: specifier: ^1.3.0 version: 1.3.0(react@18.3.1) '@tanstack/react-table': - specifier: ^8.17.0 - version: 8.17.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^8.17.3 + version: 8.17.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/react': specifier: ^18.3.1 version: 18.3.1 @@ -1328,8 +1328,8 @@ importers: specifier: ^8.56.10 version: 8.56.10 '@typescript-eslint/eslint-plugin': - specifier: ^7.8.0 - version: 7.8.0(@typescript-eslint/parser@7.8.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) + specifier: ^7.9.0 + version: 7.9.0(@typescript-eslint/parser@7.8.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/parser': specifier: ^7.8.0 version: 7.8.0(eslint@8.57.0)(typescript@5.4.5) @@ -1368,8 +1368,8 @@ importers: specifier: ^4.2.1 version: 4.2.1(prettier@3.2.5) '@tanstack/react-table': - specifier: ^8.17.0 - version: 8.17.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^8.17.3 + version: 8.17.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) next: specifier: 14.2.3 version: 14.2.3(@babel/core@7.24.5)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1678,8 +1678,8 @@ packages: engines: {node: '>=6'} hasBin: true - '@hookform/resolvers@3.3.4': - resolution: {integrity: sha512-o5cgpGOuJYrd+iMKvkttOclgwRW86EsWJZZRC23prf0uU2i48Htq4PuT73AVb9ionFyZrwYEITuOFGF+BydEtQ==} + '@hookform/resolvers@3.4.0': + resolution: {integrity: sha512-+oAqK3okmoEDnvUkJ3N/mvNMeeMv5Apgy1jkoRmlaaAF4vBgcJs9tHvtXU7VE4DvPosvAUUkPOaNFunzt1dbgA==} peerDependencies: react-hook-form: ^7.0.0 @@ -3577,15 +3577,15 @@ packages: peerDependencies: react: 18.3.1 - '@tanstack/react-table@8.17.0': - resolution: {integrity: sha512-LSJxTDzlKGs8EN7/UHB1l3yLR9HUIxoHFkTbTjHaUUGL4kgYZFYhsQsdDJSIykG86qpIA/6gSWmtwNfy5Iprhw==} + '@tanstack/react-table@8.17.3': + resolution: {integrity: sha512-5gwg5SvPD3lNAXPuJJz1fOCEZYk9/GeBFH3w/hCgnfyszOIzwkwgp5I7Q4MJtn0WECp84b5STQUDdmvGi8m3nA==} engines: {node: '>=12'} peerDependencies: react: 18.3.1 react-dom: 18.3.1 - '@tanstack/table-core@8.16.0': - resolution: {integrity: sha512-dCG8vQGk4js5v88/k83tTedWOwjGnIyONrKpHpfmSJB8jwFHl8GSu1sBBxbtACVAPtAQgwNxl0rw1d3RqRM1Tg==} + '@tanstack/table-core@8.17.3': + resolution: {integrity: sha512-mPBodDGVL+fl6d90wUREepHa/7lhsghg2A3vFpakEhrhtbIlgNAZiMr7ccTgak5qbHqF14Fwy+W1yFWQt+WmYQ==} engines: {node: '>=12'} '@toeverything/y-indexeddb@0.10.0-canary.9': @@ -3756,9 +3756,6 @@ packages: '@types/semver@6.2.7': resolution: {integrity: sha512-blctEWbzUFzQx799RZjzzIdBJOXmE37YYEyDtKkx5Dg+V7o/zyyAxLPiI98A2jdTtDgxZleMdfV+7p8WbRJ1OQ==} - '@types/semver@7.5.8': - resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - '@types/shimmer@1.0.5': resolution: {integrity: sha512-9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww==} @@ -3777,8 +3774,8 @@ packages: '@types/ws@8.5.10': resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==} - '@typescript-eslint/eslint-plugin@7.8.0': - resolution: {integrity: sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==} + '@typescript-eslint/eslint-plugin@7.9.0': + resolution: {integrity: sha512-6e+X0X3sFe/G/54aC3jt0txuMTURqLyekmEHViqyA2VnxhLMpvA6nqmcjIy+Cr9tLDHPssA74BP5Mx9HQIxBEA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: '@typescript-eslint/parser': ^7.0.0 @@ -3802,8 +3799,12 @@ packages: resolution: {integrity: sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/type-utils@7.8.0': - resolution: {integrity: sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==} + '@typescript-eslint/scope-manager@7.9.0': + resolution: {integrity: sha512-ZwPK4DeCDxr3GJltRz5iZejPFAAr4Wk3+2WIBaj1L5PYK5RgxExu/Y68FFVclN0y6GGwH8q+KgKRCvaTmFBbgQ==} + engines: {node: ^18.18.0 || >=20.0.0} + + '@typescript-eslint/type-utils@7.9.0': + resolution: {integrity: sha512-6Qy8dfut0PFrFRAZsGzuLoM4hre4gjzWJB6sUvdunCYZsYemTkzZNwF1rnGea326PHPT3zn5Lmg32M/xfJfByA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -3816,6 +3817,10 @@ packages: resolution: {integrity: sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==} engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/types@7.9.0': + resolution: {integrity: sha512-oZQD9HEWQanl9UfsbGVcZ2cGaR0YT5476xfWE0oE5kQa2sNK2frxOlkeacLOTh9po4AlUT5rtkGyYM5kew0z5w==} + engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/typescript-estree@7.8.0': resolution: {integrity: sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==} engines: {node: ^18.18.0 || >=20.0.0} @@ -3825,8 +3830,17 @@ packages: typescript: optional: true - '@typescript-eslint/utils@7.8.0': - resolution: {integrity: sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==} + '@typescript-eslint/typescript-estree@7.9.0': + resolution: {integrity: sha512-zBCMCkrb2YjpKV3LA0ZJubtKCDxLttxfdGmwZvTqqWevUPN0FZvSI26FalGFFUZU/9YQK/A4xcQF9o/VVaCKAg==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/utils@7.9.0': + resolution: {integrity: sha512-5KVRQCzZajmT4Ep+NEgjXCvjuypVvYHUW7RHlXzNPuak2oWpVoD1jf5xCP0dPAuNIchjC7uQyvbdaSTFaLqSdA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -3835,6 +3849,10 @@ packages: resolution: {integrity: sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==} engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/visitor-keys@7.9.0': + resolution: {integrity: sha512-iESPx2TNLDNGQLyjKhUvIKprlP49XNEK+MvIf9nIO7ZZaZdbnfWKHnXAgufpxqfA0YryH8XToi4+CjBgVnFTSQ==} + engines: {node: ^18.18.0 || >=20.0.0} + '@ungap/structured-clone@1.2.0': resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -4887,6 +4905,11 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true + glob@10.3.15: + resolution: {integrity: sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==} + engines: {node: '>=16 || 14 >=14.18'} + hasBin: true + glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} @@ -5701,14 +5724,14 @@ packages: minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - minipass@5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} - engines: {node: '>=8'} - minipass@7.1.0: resolution: {integrity: sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==} engines: {node: '>=16 || 14 >=14.17'} + minipass@7.1.1: + resolution: {integrity: sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==} + engines: {node: '>=16 || 14 >=14.17'} + minizlib@3.0.1: resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} engines: {node: '>= 18'} @@ -6017,6 +6040,10 @@ packages: resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==} engines: {node: '>=16 || 14 >=14.17'} + path-scurry@1.11.1: + resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} + engines: {node: '>=16 || 14 >=14.18'} + path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} @@ -6457,9 +6484,9 @@ packages: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} hasBin: true - rimraf@5.0.5: - resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==} - engines: {node: '>=14'} + rimraf@5.0.7: + resolution: {integrity: sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==} + engines: {node: '>=14.18'} hasBin: true rollup@2.78.0: @@ -6531,6 +6558,11 @@ packages: engines: {node: '>=10'} hasBin: true + semver@7.6.2: + resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} + engines: {node: '>=10'} + hasBin: true + sentence-case@2.1.1: resolution: {integrity: sha512-ENl7cYHaK/Ktwk5OTD+aDbQ3uC8IByu/6Bkg+HDv8Mm+XnBnppVNalcfJTNsp1ibstKh030/JKQQWglDvtKwEQ==} @@ -6733,8 +6765,8 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true - supabase@1.165.0: - resolution: {integrity: sha512-bN1TSR6p4POxCQqb3OsO6vo2H9yKIUB2HW44SiLAV9leBIjdm4AsrJJ1hmc/YecqjtuBooAr7RXz/uGKQEQbEQ==} + supabase@1.167.4: + resolution: {integrity: sha512-DTaTsYQ48FdOPvTTl3H1cQnGDHvm4kQdBakeI5qbs7BFZgu2SRJDYRrCcSgH9sbZReOKrQdJCPfNpoy/Z359gA==} engines: {npm: '>=8'} hasBin: true @@ -6769,8 +6801,8 @@ packages: engines: {node: '>=14.0.0'} hasBin: true - tar@7.0.1: - resolution: {integrity: sha512-IjMhdQMZFpKsHEQT3woZVxBtCQY+0wk3CVxdRkGXEgyGa0dNS/ehPvOMr2nmfC7x5Zj2N+l6yZUpmICjLGS35w==} + tar@7.1.0: + resolution: {integrity: sha512-ENhg4W6BmjYxl8GTaE7/h99f0aXiSWv4kikRZ9n2/JRxypZniE84ILZqimAhxxX7Zb8Px6pFdheW3EeHfhnXQQ==} engines: {node: '>=18'} text-table@0.2.0: @@ -7585,7 +7617,7 @@ snapshots: protobufjs: 7.2.6 yargs: 17.7.2 - '@hookform/resolvers@3.3.4(react-hook-form@7.51.4(react@18.3.1))': + '@hookform/resolvers@3.4.0(react-hook-form@7.51.4(react@18.3.1))': dependencies: react-hook-form: 7.51.4(react@18.3.1) @@ -7641,7 +7673,7 @@ snapshots: '@isaacs/fs-minipass@4.0.1': dependencies: - minipass: 7.1.0 + minipass: 7.1.1 '@jridgewell/gen-mapping@0.3.5': dependencies: @@ -10264,13 +10296,13 @@ snapshots: '@tanstack/query-core': 5.36.0 react: 18.3.1 - '@tanstack/react-table@8.17.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@tanstack/react-table@8.17.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@tanstack/table-core': 8.16.0 + '@tanstack/table-core': 8.17.3 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@tanstack/table-core@8.16.0': {} + '@tanstack/table-core@8.17.3': {} '@toeverything/y-indexeddb@0.10.0-canary.9(yjs@13.6.15)': dependencies: @@ -10472,8 +10504,6 @@ snapshots: '@types/semver@6.2.7': {} - '@types/semver@7.5.8': {} - '@types/shimmer@1.0.5': {} '@types/through@0.0.33': @@ -10490,20 +10520,18 @@ snapshots: dependencies: '@types/node': 20.12.10 - '@typescript-eslint/eslint-plugin@7.8.0(@typescript-eslint/parser@7.8.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/eslint-plugin@7.9.0(@typescript-eslint/parser@7.8.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': dependencies: '@eslint-community/regexpp': 4.10.0 '@typescript-eslint/parser': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/scope-manager': 7.8.0 - '@typescript-eslint/type-utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/visitor-keys': 7.8.0 - debug: 4.3.4 + '@typescript-eslint/scope-manager': 7.9.0 + '@typescript-eslint/type-utils': 7.9.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/utils': 7.9.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.9.0 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 - semver: 7.6.0 ts-api-utils: 1.3.0(typescript@5.4.5) optionalDependencies: typescript: 5.4.5 @@ -10528,10 +10556,15 @@ snapshots: '@typescript-eslint/types': 7.8.0 '@typescript-eslint/visitor-keys': 7.8.0 - '@typescript-eslint/type-utils@7.8.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/scope-manager@7.9.0': dependencies: - '@typescript-eslint/typescript-estree': 7.8.0(typescript@5.4.5) - '@typescript-eslint/utils': 7.8.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/types': 7.9.0 + '@typescript-eslint/visitor-keys': 7.9.0 + + '@typescript-eslint/type-utils@7.9.0(eslint@8.57.0)(typescript@5.4.5)': + dependencies: + '@typescript-eslint/typescript-estree': 7.9.0(typescript@5.4.5) + '@typescript-eslint/utils': 7.9.0(eslint@8.57.0)(typescript@5.4.5) debug: 4.3.4 eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.4.5) @@ -10542,6 +10575,8 @@ snapshots: '@typescript-eslint/types@7.8.0': {} + '@typescript-eslint/types@7.9.0': {} + '@typescript-eslint/typescript-estree@7.8.0(typescript@5.4.5)': dependencies: '@typescript-eslint/types': 7.8.0 @@ -10557,16 +10592,28 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.8.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/typescript-estree@7.9.0(typescript@5.4.5)': + dependencies: + '@typescript-eslint/types': 7.9.0 + '@typescript-eslint/visitor-keys': 7.9.0 + debug: 4.3.4 + globby: 11.1.0 + is-glob: 4.0.3 + minimatch: 9.0.4 + semver: 7.6.2 + ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: + typescript: 5.4.5 + transitivePeerDependencies: + - supports-color + + '@typescript-eslint/utils@7.9.0(eslint@8.57.0)(typescript@5.4.5)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@types/json-schema': 7.0.15 - '@types/semver': 7.5.8 - '@typescript-eslint/scope-manager': 7.8.0 - '@typescript-eslint/types': 7.8.0 - '@typescript-eslint/typescript-estree': 7.8.0(typescript@5.4.5) + '@typescript-eslint/scope-manager': 7.9.0 + '@typescript-eslint/types': 7.9.0 + '@typescript-eslint/typescript-estree': 7.9.0(typescript@5.4.5) eslint: 8.57.0 - semver: 7.6.0 transitivePeerDependencies: - supports-color - typescript @@ -10576,6 +10623,11 @@ snapshots: '@typescript-eslint/types': 7.8.0 eslint-visitor-keys: 3.4.3 + '@typescript-eslint/visitor-keys@7.9.0': + dependencies: + '@typescript-eslint/types': 7.9.0 + eslint-visitor-keys: 3.4.3 + '@ungap/structured-clone@1.2.0': {} '@urql/core@4.3.0(graphql@16.8.1)': @@ -11794,6 +11846,14 @@ snapshots: minipass: 7.1.0 path-scurry: 1.10.2 + glob@10.3.15: + dependencies: + foreground-child: 3.1.1 + jackspeak: 2.3.6 + minimatch: 9.0.4 + minipass: 7.1.1 + path-scurry: 1.11.1 + glob@7.2.3: dependencies: fs.realpath: 1.0.0 @@ -12890,14 +12950,14 @@ snapshots: minimist@1.2.8: {} - minipass@5.0.0: {} - minipass@7.1.0: {} + minipass@7.1.1: {} + minizlib@3.0.1: dependencies: - minipass: 7.1.0 - rimraf: 5.0.5 + minipass: 7.1.1 + rimraf: 5.0.7 mkdirp@0.5.6: dependencies: @@ -13232,6 +13292,11 @@ snapshots: lru-cache: 10.2.2 minipass: 7.1.0 + path-scurry@1.11.1: + dependencies: + lru-cache: 10.2.2 + minipass: 7.1.1 + path-type@4.0.0: {} peberminta@0.9.0: {} @@ -13670,9 +13735,9 @@ snapshots: dependencies: glob: 7.2.3 - rimraf@5.0.5: + rimraf@5.0.7: dependencies: - glob: 10.3.12 + glob: 10.3.15 rollup@2.78.0: optionalDependencies: @@ -13742,6 +13807,8 @@ snapshots: semver@7.6.1: {} + semver@7.6.2: {} + sentence-case@2.1.1: dependencies: no-case: 2.3.2 @@ -13970,12 +14037,12 @@ snapshots: pirates: 4.0.6 ts-interface-checker: 0.1.13 - supabase@1.165.0: + supabase@1.167.4: dependencies: bin-links: 4.0.4 https-proxy-agent: 7.0.4 node-fetch: 3.3.2 - tar: 7.0.1 + tar: 7.1.0 transitivePeerDependencies: - supports-color @@ -14058,11 +14125,11 @@ snapshots: transitivePeerDependencies: - ts-node - tar@7.0.1: + tar@7.1.0: dependencies: '@isaacs/fs-minipass': 4.0.1 chownr: 3.0.0 - minipass: 5.0.0 + minipass: 7.1.1 minizlib: 3.0.1 mkdirp: 3.0.1 yallist: 5.0.0 diff --git a/tooling/eslint/package.json b/tooling/eslint/package.json index c83653443..ca3b3fbaf 100644 --- a/tooling/eslint/package.json +++ b/tooling/eslint/package.json @@ -16,7 +16,7 @@ "@next/eslint-plugin-next": "^14.2.3", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/eslint": "^8.56.10", - "@typescript-eslint/eslint-plugin": "^7.8.0", + "@typescript-eslint/eslint-plugin": "^7.9.0", "@typescript-eslint/parser": "^7.8.0", "eslint-config-prettier": "^9.1.0", "eslint-config-turbo": "^1.13.3", diff --git a/tooling/prettier/package.json b/tooling/prettier/package.json index 707b49ca8..335d6d30a 100644 --- a/tooling/prettier/package.json +++ b/tooling/prettier/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@ianvs/prettier-plugin-sort-imports": "^4.2.1", - "@tanstack/react-table": "^8.17.0", + "@tanstack/react-table": "^8.17.3", "next": "14.2.3", "prettier": "^3.2.5", "prettier-plugin-tailwindcss": "^0.5.14"