Fixed issue with one-time payments; Updated packages

apps/e2e/package.json

@@ -13,7 +13,7 @@
   "license": "ISC",
   "devDependencies": {
     "@playwright/test": "^1.44.0",
-    "@types/node": "^20.12.10",
+    "@types/node": "^20.12.12",
     "node-html-parser": "^6.1.13"
   }
 }

apps/web/package.json

@@ -55,7 +55,7 @@
     "@marsidev/react-turnstile": "^0.6.1",
     "@radix-ui/react-icons": "^1.3.0",
     "@supabase/supabase-js": "^2.43.2",
-    "@tanstack/react-query": "5.36.2",
+    "@tanstack/react-query": "5.37.1",
     "@tanstack/react-query-next-experimental": "^5.36.2",
     "@tanstack/react-table": "^8.17.3",
     "date-fns": "^3.6.0",
@@ -79,8 +79,8 @@
     "@kit/tsconfig": "workspace:^",
     "@next/bundle-analyzer": "14.2.3",
     "@types/mdx": "^2.0.13",
-    "@types/node": "^20.12.10",
+    "@types/node": "^20.12.12",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "@types/react-dom": "^18.3.0",
     "autoprefixer": "^10.4.19",
     "dotenv-cli": "^7.4.2",

apps/web/public/locales/en/billing.json

@@ -49,6 +49,8 @@
   "planPickerAlertErrorDescription": "There was an error requesting checkout. Please try again later.",
   "subscriptionCancelled": "Subscription Cancelled",
   "cancelSubscriptionDate": "Your subscription will be cancelled at the end of the period",
+  "noPlanChosen": "Please choose a plan",
+  "noIntervalPlanChosen": "Please choose a billing interval",
   "status": {
     "free": {
       "badge": "Free Plan",

packages/billing/gateway/package.json

@@ -28,7 +28,7 @@
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:^",
     "@supabase/supabase-js": "^2.43.2",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "date-fns": "^3.6.0",
     "lucide-react": "^0.378.0",
     "next": "14.2.3",

packages/billing/gateway/src/components/plan-picker.tsx

@@ -48,6 +48,8 @@ export function PlanPicker(
     pending?: boolean;
   }>,
 ) {
+  const { t } = useTranslation(`billing`);
+
   const intervals = useMemo(
     () => getPlanIntervals(props.config),
     [props.config],
@@ -61,7 +63,7 @@ export function PlanPicker(
         .object({
           planId: z.string(),
           productId: z.string(),
-          interval: z.string(),
+          interval: z.string().optional(),
         })
         .refine(
           (data) => {
@@ -76,7 +78,22 @@ export function PlanPicker(
               return false;
             }
           },
-          { message: `Please pick a plan to continue`, path: ['planId'] },
+          { message: t('noPlanChosen'), path: ['planId'] },
+        )
+        .refine(
+          (data) => {
+            try {
+              const { plan } = getProductPlanPair(props.config, data.planId);
+
+              return !(plan.paymentType === 'recurring' && !data.interval);
+            } catch {
+              return false;
+            }
+          },
+          {
+            message: t('noIntervalPlanChosen'),
+            path: ['interval'],
+          },
         ),
     ),
     defaultValues: {
@@ -100,8 +117,6 @@ export function PlanPicker(
     }
   }, [props.config, planId]);
 
-  const { t } = useTranslation(`billing`);
-
   // display the period picker if the selected plan is recurring or if no plan is selected
   const isRecurringPlan =
     selectedPlan?.paymentType === 'recurring' || !selectedPlan;
@@ -117,6 +132,7 @@ export function PlanPicker(
           className={'flex w-full max-w-xl flex-col space-y-4'}
           onSubmit={form.handleSubmit(props.onSubmit)}
         >
+          <If condition={intervals.length}>
             <div
               className={cn('transition-all', {
                 ['pointer-events-none opacity-50']: !isRecurringPlan,
@@ -162,11 +178,15 @@ export function PlanPicker(
                                           (item) => item.interval === interval,
                                         );
 
-                                      form.setValue('planId', plan?.id ?? '', {
+                                        form.setValue(
+                                          'planId',
+                                          plan?.id ?? '',
+                                          {
                                             shouldValidate: true,
                                             shouldDirty: true,
                                             shouldTouch: true,
-                                      });
+                                          },
+                                        );
                                       }
                                     }}
                                   />
@@ -193,6 +213,7 @@ export function PlanPicker(
                 }}
               />
             </div>
+          </If>
 
           <FormField
             name={'planId'}

packages/billing/lemon-squeezy/package.json

@@ -14,7 +14,7 @@
     "./components": "./src/components/index.ts"
   },
   "dependencies": {
-    "@lemonsqueezy/lemonsqueezy.js": "2.2.0"
+    "@lemonsqueezy/lemonsqueezy.js": "3.0.0"
   },
   "devDependencies": {
     "@kit/billing": "workspace:^",
@@ -25,7 +25,7 @@
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:^",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "next": "14.2.3",
     "react": "18.3.1",
     "zod": "^3.23.8"

packages/billing/stripe/package.json

@@ -28,7 +28,7 @@
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:^",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "date-fns": "^3.6.0",
     "next": "14.2.3",
     "react": "18.3.1",

packages/billing/stripe/src/services/create-stripe-checkout.ts

@@ -55,7 +55,8 @@ export async function createStripeCheckout(
         customer_email: params.customerEmail,
       };
 
-  const customerCreation = isSubscription
+  const customerCreation =
+    isSubscription || customer
       ? ({} as Record<string, string>)
       : { customer_creation: 'always' };
 

packages/cms/core/package.json

@@ -16,7 +16,7 @@
     "@kit/eslint-config": "workspace:*",
     "@kit/prettier-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
-    "@types/node": "^20.12.10"
+    "@types/node": "^20.12.12"
   },
   "eslintConfig": {
     "root": true,

packages/cms/keystatic/package.json

@@ -25,8 +25,8 @@
     "@kit/prettier-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:^",
-    "@types/node": "^20.12.10",
+    "@types/node": "^20.12.12",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "react": "18.3.1",
     "zod": "^3.23.8"
   },

packages/cms/wordpress/package.json

@@ -19,7 +19,7 @@
     "@kit/prettier-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:^",
-    "@types/node": "^20.12.10",
+    "@types/node": "^20.12.12",
     "wp-types": "^3.65.0"
   },
   "eslintConfig": {

packages/features/accounts/package.json

@@ -34,8 +34,8 @@
     "@kit/ui": "workspace:^",
     "@radix-ui/react-icons": "^1.3.0",
     "@supabase/supabase-js": "^2.43.2",
-    "@tanstack/react-query": "5.36.2",
+    "@tanstack/react-query": "5.37.1",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "@types/react-dom": "^18.3.0",
     "lucide-react": "^0.378.0",
     "next": "14.2.3",

packages/features/admin/package.json

@@ -21,9 +21,9 @@
     "@makerkit/data-loader-supabase-core": "^0.0.8",
     "@makerkit/data-loader-supabase-nextjs": "^1.2.3",
     "@supabase/supabase-js": "^2.43.2",
-    "@tanstack/react-query": "5.36.2",
+    "@tanstack/react-query": "5.37.1",
     "@tanstack/react-table": "^8.17.3",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "lucide-react": "^0.378.0",
     "next": "14.2.3",
     "react": "18.3.1",

packages/features/auth/package.json

@@ -29,8 +29,8 @@
     "@marsidev/react-turnstile": "^0.6.1",
     "@radix-ui/react-icons": "^1.3.0",
     "@supabase/supabase-js": "^2.43.2",
-    "@tanstack/react-query": "5.36.2",
+    "@tanstack/react-query": "5.37.1",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "lucide-react": "^0.378.0",
     "next": "14.2.3",
     "react-hook-form": "^7.51.4",

packages/features/notifications/package.json

@@ -21,8 +21,8 @@
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:*",
     "@supabase/supabase-js": "^2.43.2",
-    "@tanstack/react-query": "5.36.2",
+    "@tanstack/react-query": "5.37.1",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "lucide-react": "^0.378.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",

packages/features/team-accounts/package.json

@@ -32,9 +32,9 @@
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:^",
     "@supabase/supabase-js": "^2.43.2",
-    "@tanstack/react-query": "5.36.2",
+    "@tanstack/react-query": "5.37.1",
     "@tanstack/react-table": "^8.17.3",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "@types/react-dom": "^18.3.0",
     "class-variance-authority": "^0.7.0",
     "date-fns": "^3.6.0",

packages/i18n/package.json

@@ -21,7 +21,7 @@
     "@kit/shared": "workspace:^",
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
-    "@tanstack/react-query": "5.36.2",
+    "@tanstack/react-query": "5.37.1",
     "react-i18next": "^14.1.1"
   },
   "dependencies": {

packages/monitoring/api/package.json

@@ -24,7 +24,7 @@
     "@kit/sentry": "workspace:*",
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "react": "18.3.1"
   },
   "eslintConfig": {

packages/monitoring/baselime/package.json

@@ -25,7 +25,7 @@
     "@kit/prettier-config": "workspace:*",
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "react": "18.3.1",
     "zod": "^3.23.8"
   },

packages/monitoring/core/package.json

@@ -18,7 +18,7 @@
     "@kit/prettier-config": "workspace:*",
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "react": "18.3.1"
   },
   "eslintConfig": {

packages/monitoring/sentry/package.json

@@ -31,7 +31,7 @@
     "@kit/prettier-config": "workspace:*",
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "react": "18.3.1"
   },
   "eslintConfig": {

packages/supabase/package.json

@@ -28,8 +28,8 @@
     "@supabase/gotrue-js": "2.62.2",
     "@supabase/ssr": "^0.3.0",
     "@supabase/supabase-js": "^2.43.2",
-    "@tanstack/react-query": "5.36.2",
+    "@tanstack/react-query": "5.37.1",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "next": "14.2.3",
     "react": "18.3.1",
     "zod": "^3.23.8"

packages/ui/package.json

@@ -42,7 +42,7 @@
     "@kit/tsconfig": "workspace:*",
     "@radix-ui/react-icons": "^1.3.0",
     "@tanstack/react-table": "^8.17.3",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "@types/react-dom": "^18.3.0",
     "class-variance-authority": "^0.7.0",
     "date-fns": "^3.6.0",

packages/ui/src/makerkit/sidebar.tsx

@@ -193,9 +193,7 @@ export function SidebarItem({
 
 function getClassNameBuilder() {
   return cva(
-    [
+    ['flex box-content h-screen flex-col relative shadow-sm border-r'],
-      'flex box-content h-screen flex-col relative bg-muted/20 shadow-sm dark:shadow-primary/20',
-    ],
     {
       variants: {
         collapsed: {