zaid.marzguioui/myeasycms-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:makerkit/next-supabase-saas-kit-turbo

Browse Source
This commit is contained in:
gbuomprisco
2025-06-01 20:11:07 +08:00
parent e724c57261 fc2fda595a
commit bc5ca295f8
18 changed files with 72 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dev-tool/app/translations/lib/server-actions.ts
View File

@@ -37,7 +37,7 @@ export async function updateTranslationAction(props: z.infer<typeof Schema>) {
try {
// Read the current translations file
const translationsFile = readFileSync(filePath, 'utf-8');
const translationsFile = readFileSync(filePath, 'utf8');
const translations = JSON.parse(translationsFile) as Record<string, any>;
// Update the nested key value
@@ -60,7 +60,7 @@ export async function updateTranslationAction(props: z.infer<typeof Schema>) {
current[finalKey] = value;
// Write the updated translations back to the file
writeFileSync(filePath, JSON.stringify(translations, null, 2), 'utf-8');
writeFileSync(filePath, JSON.stringify(translations, null, 2), 'utf8');
revalidatePath(`/translations`);
@@ -95,7 +95,7 @@ export const translateWithAIAction = async (
if (!existsSync(filePath)) {
// create the file if it doesn't exist
writeFileSync(filePath, JSON.stringify({}, null, 2), 'utf-8');
writeFileSync(filePath, JSON.stringify({}, null, 2), 'utf8');
}
const results: Record<string, string> = {};

6
apps/dev-tool/app/variables/lib/env-variables-model.ts
View File

@@ -265,12 +265,12 @@ export const envVariables: EnvVariableModel[] = [
{
name: 'NEXT_PUBLIC_SIDEBAR_COLLAPSIBLE_STYLE',
description:
'Defines sidebar collapse behavior. Options: offscreen, icon, or none.',
'Defines sidebar collapse behavior. Options: offcanvas, icon, or none.',
category: 'Navigation',
type: 'enum',
values: ['offscreen', 'icon', 'none'],
values: ['offcanvas', 'icon', 'none'],
validate: ({ value }) => {
return z.enum(['offscreen', 'icon', 'none']).optional().safeParse(value);
return z.enum(['offcanvas', 'icon', 'none']).optional().safeParse(value);
},
},
{

6
apps/dev-tool/app/variables/lib/server-actions.ts
View File

@@ -53,10 +53,10 @@ export async function updateEnvironmentVariableAction(
const filePath = `${root}/apps/web/${source}`;
if (!existsSync(filePath)) {
writeFileSync(filePath, '', 'utf-8');
writeFileSync(filePath, '', 'utf8');
}
const sourceEnvFile = readFileSync(`${root}apps/web/${source}`, 'utf-8');
const sourceEnvFile = readFileSync(`${root}apps/web/${source}`, 'utf8');
let updatedEnvFile = '';
const isInSourceFile = sourceEnvFile.includes(name);
@@ -73,7 +73,7 @@ export async function updateEnvironmentVariableAction(
}
// write the updated content back to the file
writeFileSync(`${root}/apps/web/${source}`, updatedEnvFile, 'utf-8');
writeFileSync(`${root}/apps/web/${source}`, updatedEnvFile, 'utf8');
revalidatePath(`/variables`);

2
apps/web/config/personal-account-navigation.config.tsx
View File

@@ -43,5 +43,5 @@ export const personalAccountNavigationConfig = NavigationConfigSchema.parse({
routes,
style: process.env.NEXT_PUBLIC_USER_NAVIGATION_STYLE,
sidebarCollapsed: process.env.NEXT_PUBLIC_HOME_SIDEBAR_COLLAPSED,
sidebarCollapsedStyle: process.env.NEXT_PUBLIC_SIDEBAR_COLLAPSED_STYLE,
sidebarCollapsedStyle: process.env.NEXT_PUBLIC_SIDEBAR_COLLAPSIBLE_STYLE,
});

2
apps/web/config/team-account-navigation.config.tsx
View File

@@ -49,7 +49,7 @@ export function getTeamAccountSidebarConfig(account: string) {
routes: getRoutes(account),
style: process.env.NEXT_PUBLIC_TEAM_NAVIGATION_STYLE,
sidebarCollapsed: process.env.NEXT_PUBLIC_TEAM_SIDEBAR_COLLAPSED,
sidebarCollapsedStyle: process.env.NEXT_PUBLIC_SIDEBAR_COLLAPSED_STYLE,
sidebarCollapsedStyle: process.env.NEXT_PUBLIC_SIDEBAR_COLLAPSIBLE_STYLE,
});
}

42
packages/billing/gateway/src/components/current-plan-alert.tsx
View File

@@ -2,43 +2,27 @@ import { Enums } from '@kit/supabase/database';
import { Alert, AlertDescription, AlertTitle } from '@kit/ui/alert';
import { Trans } from '@kit/ui/trans';
const statusBadgeMap: Record<Enums<'subscription_status'>, `success` | `destructive` | `warning`> = {
active: 'success',
trialing: 'success',
past_due: 'destructive',
canceled: 'destructive',
unpaid: 'destructive',
incomplete: 'warning',
incomplete_expired: 'destructive',
paused: 'warning',
};
export function CurrentPlanAlert(
props: React.PropsWithoutRef<{
status: Enums<'subscription_status'>;
}>,
) {
let variant: 'success' | 'warning' | 'destructive';
const prefix = 'billing:status';
const text = `${prefix}.${props.status}.description`;
const title = `${prefix}.${props.status}.heading`;
switch (props.status) {
case 'active':
variant = 'success';
break;
case 'trialing':
variant = 'success';
break;
case 'past_due':
variant = 'destructive';
break;
case 'canceled':
variant = 'destructive';
break;
case 'unpaid':
variant = 'destructive';
break;
case 'incomplete':
variant = 'warning';
break;
case 'incomplete_expired':
variant = 'destructive';
break;
case 'paused':
variant = 'warning';
break;
}
const variant = statusBadgeMap[props.status];
return (
<Alert variant={variant}>
@@ -51,4 +35,4 @@ export function CurrentPlanAlert(
</AlertDescription>
</Alert>
);
}
}

46
packages/billing/gateway/src/components/current-plan-badge.tsx
View File

@@ -4,43 +4,27 @@ import { Trans } from '@kit/ui/trans';
type Status = Enums<'subscription_status'> | Enums<'payment_status'>;
const statusBadgeMap: Record<Status, `success` | `destructive` | `warning`> = {
active: 'success',
succeeded: 'success',
trialing: 'success',
past_due: 'destructive',
failed: 'destructive',
canceled: 'destructive',
unpaid: 'destructive',
incomplete: 'warning',
pending: 'warning',
incomplete_expired: 'destructive',
paused: 'warning',
}
export function CurrentPlanBadge(
props: React.PropsWithoutRef<{
status: Status;
}>,
) {
let variant: 'success' | 'warning' | 'destructive';
const text = `billing:status.${props.status}.badge`;
switch (props.status) {
case 'active':
case 'succeeded':
variant = 'success';
break;
case 'trialing':
variant = 'success';
break;
case 'past_due':
case 'failed':
variant = 'destructive';
break;
case 'canceled':
variant = 'destructive';
break;
case 'unpaid':
variant = 'destructive';
break;
case 'incomplete':
case 'pending':
variant = 'warning';
break;
case 'incomplete_expired':
variant = 'destructive';
break;
case 'paused':
variant = 'warning';
break;
}
const variant = statusBadgeMap[props.status];
return (
<Badge data-test={'current-plan-card-status-badge'} variant={variant}>

2
packages/billing/gateway/src/components/line-item-details.tsx
View File

@@ -258,7 +258,7 @@ function Tiers({
i18nKey={'billing:andAbove'}
values={{
unit,
previousTier: (previousTierFrom as number) - 1,
previousTier: (Number(previousTierFrom) as number) - 1,
}}
/>
</span>

33
packages/billing/lemon-squeezy/src/services/lemon-squeezy-subscription-payload-builder.service.ts
View File

@@ -1,4 +1,3 @@
import { BillingConfig } from '@kit/billing';
import { UpsertSubscriptionParams } from '@kit/billing/types';
type SubscriptionStatus =
@@ -23,8 +22,6 @@ export function createLemonSqueezySubscriptionPayloadBuilderService() {
* @description This class is used to build the subscription payload for Lemon Squeezy
*/
class LemonSqueezySubscriptionPayloadBuilderService {
private config?: BillingConfig;
/**
* @name build
* @description Build the subscription payload for Lemon Squeezy
@@ -103,24 +100,18 @@ class LemonSqueezySubscriptionPayloadBuilderService {
}
private getSubscriptionStatus(status: SubscriptionStatus) {
switch (status) {
case 'active':
return 'active';
case 'cancelled':
return 'canceled';
case 'paused':
return 'paused';
case 'on_trial':
return 'trialing';
case 'past_due':
return 'past_due';
case 'unpaid':
return 'unpaid';
case 'expired':
return 'past_due';
default:
return 'active';
}
const statusMap = {
active: 'active',
cancelled: 'canceled',
paused: 'paused',
on_trial: 'trialing',
past_due: 'past_due',
unpaid: 'unpaid',
expired: 'past_due',
} satisfies Record<SubscriptionStatus, UpsertSubscriptionParams['status']>;
// Default to 'active' if status is unknown
return statusMap[status] || 'active';
}
}

21
packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts
View File

@@ -447,19 +447,16 @@ export class LemonSqueezyWebhookHandlerService
return type;
}
private getOrderStatus(status: OrderStatus) {
switch (status) {
case 'paid':
return 'succeeded';
case 'pending':
return 'pending';
case 'failed':
return 'failed';
case 'refunded':
return 'failed';
default:
return 'pending';
}
const statusMap = {
paid: 'succeeded',
pending: 'pending',
failed: 'failed',
refunded: 'failed',
} satisfies Record<OrderStatus, UpsertOrderParams['status']>
return statusMap[status] ?? 'pending';
}
}

8
packages/features/accounts/src/components/account-selector.tsx
View File

@@ -100,7 +100,7 @@ export function AccountSelector({
role="combobox"
aria-expanded={open}
className={cn(
'dark:shadow-primary/10 group w-full min-w-0 px-2 lg:w-auto lg:max-w-fit',
'dark:shadow-primary/10 group w-full min-w-0 px-2 lg:w-auto lg:max-w-fit mr-1',
{
'justify-start': !collapsed,
'm-auto justify-center px-2 lg:w-full': collapsed,
@@ -114,7 +114,7 @@ export function AccountSelector({
<span
className={cn('flex max-w-full items-center', {
'justify-center gap-x-0': collapsed,
'gap-x-4': !collapsed,
'gap-x-2': !collapsed,
})}
>
<PersonalAccountAvatar />
@@ -133,7 +133,7 @@ export function AccountSelector({
<span
className={cn('flex max-w-full items-center', {
'justify-center gap-x-0': collapsed,
'gap-x-4': !collapsed,
'gap-x-2': !collapsed,
})}
>
<Avatar className={'rounded-xs h-6 w-6'}>
@@ -158,7 +158,7 @@ export function AccountSelector({
</If>
<CaretSortIcon
className={cn('ml-2 h-4 w-4 shrink-0 opacity-50', {
className={cn('ml-1 h-4 w-4 shrink-0 opacity-50', {
hidden: collapsed,
})}
/>

2
packages/features/team-accounts/src/components/members/account-members-table.tsx
View File

@@ -92,7 +92,7 @@ export function AccountMembersTable({
})
.sort((prev, next) => {
if (prev.primary_owner_user_id === prev.user_id) {
return -1;
return 0;
}
if (prev.role_hierarchy_level < next.role_hierarchy_level) {

2
packages/i18n/src/i18n.server.ts
View File

@@ -128,7 +128,7 @@ export function parseAcceptLanguageHeader(
const trimmedLocale = locale.trim();
const numQ = Number(q.replace(/q ?=/, ''));
return [isNaN(numQ) ? 0 : numQ, trimmedLocale];
return [Number.isNaN(numQ) ? 0 : numQ, trimmedLocale];
})
.sort(([q1], [q2]) => q2 - q1) // Sort by quality value in descending order
.flatMap(([_, locale]) => {

2
packages/supabase/src/auth-callback.service.ts
View File

@@ -244,7 +244,7 @@ function onError({
console.error(
{
error,
error: JSON.stringify(error).replace(/["\\]/g, '\\$&'),
name: `auth.callback`,
},
`An error occurred while signing user in`,

2
packages/ui/src/shadcn/sidebar.tsx
View File

@@ -392,7 +392,7 @@ const SidebarHeader: React.FC<React.ComponentPropsWithRef<'div'>> = ({
return (
<div
data-sidebar="header"
className={cn('flex flex-col gap-2 p-2', className)}
className={cn('flex flex-col gap-2 p-2 group-data-[state=collapsed]:group-data-[collapsible=offcanvas]:hidden', className)}
{...props}
/>
);

2
tooling/scripts/src/checks.mjs
View File

@@ -6,7 +6,7 @@ const whitelist = {
STRIPE_WEBHOOK_SECRET: [/whsec_*/],
EMAIL_PASSWORD: ['password'],
SUPABASE_DB_WEBHOOK_SECRET: ['WEBHOOKSECRET'],
SUPABASE_SERVICE_ROLE_KEY: ['eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU'],
SUPABASE_SERVICE_ROLE_KEY: [/qQwv8Hdp7fsn3W0YpN81IU/],
};
// List of sensitive environment variables that should not be in .env files

2
tooling/scripts/src/license.mjs
View File

@@ -48,7 +48,7 @@ async function checkLicense() {
try {
const makerkitConfig =
JSON.parse(
readFileSync(path.resolve(process.cwd(), '../../.makerkitrc'), 'utf-8'),
readFileSync(path.resolve(process.cwd(), '../../.makerkitrc'), 'utf8'),
) || {};
if (makerkitConfig.projectName) {

2
turbo/generators/utils/index.ts
View File

@@ -14,7 +14,7 @@ export namespace generator {
}
export function loadEnvironmentVariables(filePath: string) {
const file = readFileSync(filePath, 'utf-8');
const file = readFileSync(filePath, 'utf8');
const vars = file.split('\n').filter((line) => line.trim() !== '');
const env: Record<string, string> = {};