Update packages and refactor logging in diverse services

This commit updates diverse packages such as "@makerkit/data-loader-supabase-core" and "@makerkit/data-loader-supabase-nextjs" to the new versions in the package.json files. Also, several refactorings were done in logging within services and loaders by progressing 'server-only' imports and improving context handling. Additionally, type annotations have been added to several exported functions for better code readability and maintainability.
This commit is contained in:
giancarlo
2024-04-09 17:23:48 +08:00
parent 5adfb3edac
commit a9eaaafd3d
45 changed files with 159 additions and 128 deletions

View File

@@ -1,7 +1,7 @@
import { cache } from 'react';
import 'server-only';
import { cache } from 'react';
import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
export const loadPersonalAccountBillingPageData = cache((userId: string) => {

View File

@@ -1,6 +1,7 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import 'server-only';
import { z } from 'zod';
import { getProductPlanPair } from '@kit/billing';

View File

@@ -1,7 +1,7 @@
import { cache } from 'react';
import 'server-only';
import { cache } from 'react';
import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
export const loadTeamAccountBillingPage = cache((accountId: string) => {

View File

@@ -1,9 +1,9 @@
import 'server-only';
import { cache } from 'react';
import { redirect } from 'next/navigation';
import 'server-only';
import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
import pathsConfig from '~/config/paths.config';

View File

@@ -1,6 +1,7 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import 'server-only';
import { z } from 'zod';
import { LineItemSchema } from '@kit/billing';

View File

@@ -5,11 +5,11 @@ import { notFound } from 'next/navigation';
import { ContentRenderer, createCmsClient } from '@kit/cms';
import { If } from '@kit/ui/if';
import { SitePageHeader } from '~/(marketing)/_components/site-page-header';
import { DocsCards } from '~/(marketing)/docs/_components/docs-cards';
import { withI18n } from '~/lib/i18n/with-i18n';
import { SitePageHeader } from '../../_components/site-page-header';
import styles from '../../blog/_components/html-renderer.module.css';
import { DocsCards } from '../_components/docs-cards';
const getPageBySlug = cache(async (slug: string) => {
const client = await createCmsClient();
@@ -48,18 +48,10 @@ async function DocumentationPage({ params }: PageParams) {
const description = page?.description ?? '';
return (
<div>
<SitePageHeader
title={page.title}
subtitle={description}
className={'items-start'}
/>
<div className={'flex flex-1 flex-col'}>
<SitePageHeader title={page.title} subtitle={description} />
<div
className={
'container relative mx-auto flex max-w-4xl grow flex-col space-y-4 py-6'
}
>
<div className={'container flex max-w-5xl flex-col space-y-4 py-6'}>
<article className={styles.HTML}>
<ContentRenderer content={page.content} />
</article>

View File

@@ -57,12 +57,13 @@ function AccountsPage({ searchParams }: { searchParams: SearchParams }) {
}
function getFilters(params: SearchParams) {
const filters: {
[key: string]: {
const filters: Record<
string,
{
eq?: boolean | string;
like?: string;
};
} = {};
}
> = {};
if (params.account_type && params.account_type !== 'all') {
filters.is_personal_account = {

View File

@@ -18,7 +18,7 @@ const INTERNAL_PACKAGES = [
'@kit/database-webhooks',
'@kit/cms',
'@kit/monitoring',
'@kit/next'
'@kit/next',
];
/** @type {import('next').NextConfig} */

View File

@@ -34,8 +34,8 @@
"@kit/supabase": "workspace:^",
"@kit/team-accounts": "workspace:^",
"@kit/ui": "workspace:^",
"@makerkit/data-loader-supabase-core": "0.0.5",
"@makerkit/data-loader-supabase-nextjs": "^0.0.7",
"@makerkit/data-loader-supabase-core": "^0.0.7",
"@makerkit/data-loader-supabase-nextjs": "^0.0.9",
"@marsidev/react-turnstile": "^0.5.4",
"@radix-ui/react-icons": "^1.3.0",
"@supabase/ssr": "^0.1.0",

View File

@@ -15,7 +15,6 @@ import {
getPrimaryLineItem,
getProductPlanPair,
} from '@kit/billing';
import config from '@kit/prettier-config/index.mjs';
import { formatCurrency } from '@kit/shared/utils';
import { Badge } from '@kit/ui/badge';
import { Button } from '@kit/ui/button';

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { BillingWebhookHandlerService } from '@kit/billing';

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { z } from 'zod';
import {

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { BillingConfig } from '@kit/billing';
import { Database } from '@kit/supabase/database';
import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { z } from 'zod';
import {

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
import { BillingGatewayService } from './billing-gateway.service';

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { z } from 'zod';
import { BillingProviderSchema } from '@kit/billing';

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { Database } from '@kit/supabase/database';
import { BillingGatewayService } from '../billing-gateway/billing-gateway.service';

View File

@@ -1,10 +1,11 @@
import 'server-only';
import {
cancelSubscription,
createUsageRecord,
getCheckout,
updateSubscriptionItem,
} from '@lemonsqueezy/lemonsqueezy.js';
import 'server-only';
import { z } from 'zod';
import { BillingStrategyProviderService } from '@kit/billing';

View File

@@ -1,4 +1,5 @@
import 'server-only';
import type { Stripe } from 'stripe';
import { z } from 'zod';

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { getLogger } from '@kit/shared/logger';
@@ -35,11 +37,9 @@ export class DeletePersonalAccountService {
}) {
const userId = params.userId;
const logger = await getLogger();
const ctx = { userId, name: this.namespace };
logger.info(
{ name: this.namespace, userId },
'User requested deletion. Processing...',
);
logger.info(ctx, 'User requested deletion. Processing...');
// execute the deletion of the user
try {
@@ -47,8 +47,7 @@ export class DeletePersonalAccountService {
} catch (error) {
logger.error(
{
name: this.namespace,
userId,
...ctx,
error,
},
'Error deleting user',
@@ -57,6 +56,6 @@ export class DeletePersonalAccountService {
throw new Error('Error deleting user');
}
logger.info({ name: this.namespace, userId }, 'User deleted successfully');
logger.info(ctx, 'User deleted successfully');
}
}

View File

@@ -14,8 +14,8 @@
"@kit/next": "workspace:*",
"@kit/supabase": "workspace:*",
"@kit/ui": "workspace:*",
"@makerkit/data-loader-supabase-core": "0.0.5",
"@makerkit/data-loader-supabase-nextjs": "^0.0.7",
"@makerkit/data-loader-supabase-core": "^0.0.7",
"@makerkit/data-loader-supabase-nextjs": "^0.0.9",
"lucide-react": "^0.363.0",
"react-hook-form": "^7.51.2",
"zod": "^3.22.4"
@@ -29,8 +29,8 @@
"@kit/tailwind-config": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@kit/ui": "workspace:^",
"@makerkit/data-loader-supabase-core": "0.0.5",
"@makerkit/data-loader-supabase-nextjs": "^0.0.7",
"@makerkit/data-loader-supabase-core": "^0.0.7",
"@makerkit/data-loader-supabase-nextjs": "^0.0.9",
"@supabase/supabase-js": "^2.42.0",
"lucide-react": "^0.363.0",
"react-hook-form": "^7.51.2",

View File

@@ -1,4 +1,4 @@
import { BadgeX, Ban, ShieldPlus, Trash, VenetianMask } from 'lucide-react';
import { BadgeX, Ban, ShieldPlus, VenetianMask } from 'lucide-react';
import { Database } from '@kit/supabase/database';
import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';

View File

@@ -4,6 +4,11 @@ import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-clie
import { isSuperAdmin } from './is-super-admin';
/**
* @name enhanceAdminAction
* @description Wrap a server action to ensure the user is a super admin.
* @param fn
*/
export function enhanceAdminAction<Args, Response>(
fn: (params: Args) => Response,
) {

View File

@@ -2,6 +2,11 @@ import { SupabaseClient } from '@supabase/supabase-js';
import { Database } from '@kit/supabase/database';
/**
* @name isSuperAdmin
* @description Check if the current user is a super admin.
* @param client
*/
export async function isSuperAdmin(client: SupabaseClient<Database>) {
const { data, error } = await client.auth.getUser();

View File

@@ -1,5 +1,12 @@
import 'server-only';
import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
/**
* @name loadAdminDashboard
* @description Load the admin dashboard data.
* @param params
*/
export async function loadAdminDashboard(params?: {
count: 'exact' | 'estimated' | 'planned';
}) {

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { Database } from '@kit/supabase/database';

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { Database } from '@kit/supabase/database';

View File

@@ -50,7 +50,7 @@ export function EmailPasswordSignUpContainer({
console.error(error);
}
},
[emailRedirectTo, loading, onSignUp, signUpMutation],
[captchaToken, emailRedirectTo, loading, onSignUp, signUpMutation],
);
return (

View File

@@ -1,7 +1,8 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { addDays, formatISO } from 'date-fns';
import 'server-only';
import { z } from 'zod';
import { getLogger } from '@kit/shared/logger';

View File

@@ -1,6 +1,7 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import 'server-only';
import { z } from 'zod';
import { getLogger } from '@kit/shared/logger';

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { BillingGatewayService } from '@kit/billing-gateway';
@@ -11,12 +13,10 @@ export class AccountPerSeatBillingService {
async getPerSeatSubscriptionItem(accountId: string) {
const logger = await getLogger();
const ctx = { accountId, name: this.namespace };
logger.info(
{
name: this.namespace,
accountId,
},
ctx,
`Getting per-seat subscription item for account ${accountId}...`,
);
@@ -40,8 +40,7 @@ export class AccountPerSeatBillingService {
if (error) {
logger.error(
{
name: this.namespace,
accountId,
...ctx,
error,
},
`Failed to get per-seat subscription item for account ${accountId}`,
@@ -52,7 +51,7 @@ export class AccountPerSeatBillingService {
if (!data?.subscription_items) {
logger.info(
{ name: this.namespace, accountId },
ctx,
`No per-seat subscription item found for account ${accountId}. Exiting...`,
);
@@ -60,10 +59,7 @@ export class AccountPerSeatBillingService {
}
logger.info(
{
name: this.namespace,
accountId,
},
ctx,
`Per-seat subscription item found for account ${accountId}. Will update...`,
);
@@ -88,14 +84,13 @@ export class AccountPerSeatBillingService {
const billingGateway = new BillingGatewayService(subscription.provider);
logger.info(
{
name: this.namespace,
accountId,
subscriptionItems,
},
`Increasing seats for account ${accountId}...`,
);
const ctx = {
name: this.namespace,
accountId,
subscriptionItems,
};
logger.info(ctx, `Increasing seats for account ${accountId}...`);
const promises = subscriptionItems.map(async (item) => {
try {
@@ -127,8 +122,7 @@ export class AccountPerSeatBillingService {
} catch (error) {
logger.error(
{
name: this.namespace,
accountId,
...ctx,
error,
},
`Failed to increase seats for account ${accountId}`,
@@ -155,14 +149,13 @@ export class AccountPerSeatBillingService {
return;
}
logger.info(
{
name: this.namespace,
accountId,
subscriptionItems,
},
`Decreasing seats for account ${accountId}...`,
);
const ctx = {
name: this.namespace,
accountId,
subscriptionItems,
};
logger.info(ctx, `Decreasing seats for account ${accountId}...`);
const billingGateway = new BillingGatewayService(subscription.provider);
@@ -196,8 +189,7 @@ export class AccountPerSeatBillingService {
} catch (error) {
logger.error(
{
name: this.namespace,
accountId,
...ctx,
error,
},
`Failed to decrease seats for account ${accountId}`,

View File

@@ -1,3 +1,5 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { getLogger } from '@kit/shared/logger';
@@ -10,11 +12,9 @@ export class CreateTeamAccountService {
async createNewOrganizationAccount(params: { name: string; userId: string }) {
const logger = await getLogger();
const ctx = { ...params, namespace: this.namespace };
logger.info(
{ ...params, namespace: this.namespace },
`Creating new team account...`,
);
logger.info(ctx, `Creating new team account...`);
return await this.client.rpc('create_account', {
account_name: params.name,

View File

@@ -1,7 +1,7 @@
import { SupabaseClient } from '@supabase/supabase-js';
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { getLogger } from '@kit/shared/logger';
import { Database } from '@kit/supabase/database';
@@ -26,14 +26,13 @@ export class DeleteTeamAccountService {
) {
const logger = await getLogger();
logger.info(
{
name: this.namespace,
accountId: params.accountId,
userId: params.userId,
},
`Requested team account deletion. Processing...`,
);
const ctx = {
accountId: params.accountId,
userId: params.userId,
name: this.namespace,
};
logger.info(ctx, `Requested team account deletion. Processing...`);
// we can use the admin client to delete the account.
const { error } = await adminClient
@@ -44,9 +43,7 @@ export class DeleteTeamAccountService {
if (error) {
logger.error(
{
name: this.namespace,
accountId: params.accountId,
userId: params.userId,
...ctx,
error,
},
'Failed to delete team account',
@@ -55,13 +52,6 @@ export class DeleteTeamAccountService {
throw new Error('Failed to delete team account');
}
logger.info(
{
name: this.namespace,
accountId: params.accountId,
userId: params.userId,
},
'Successfully deleted team account',
);
logger.info(ctx, 'Successfully deleted team account');
}
}

View File

@@ -1,6 +1,7 @@
import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import 'server-only';
import { z } from 'zod';
import { getLogger } from '@kit/shared/logger';

View File

@@ -1,4 +1,5 @@
import 'server-only';
import { z } from 'zod';
import { Mailer } from '../../mailer';

View File

@@ -1,4 +1,5 @@
import 'server-only';
import { z } from 'zod';
import { Mailer } from '../../mailer';

View File

@@ -1,8 +1,9 @@
import 'server-only';
import { redirect } from 'next/navigation';
import type { User } from '@supabase/supabase-js';
import 'server-only';
import { z } from 'zod';
import { verifyCaptchaToken } from '@kit/auth/captcha/server';

View File

@@ -1,9 +1,10 @@
import 'server-only';
import { redirect } from 'next/navigation';
import { NextRequest, NextResponse } from 'next/server';
import { User } from '@supabase/supabase-js';
import 'server-only';
import { z } from 'zod';
import { verifyCaptchaToken } from '@kit/auth/captcha/server';

View File

@@ -4,11 +4,11 @@ export const zodParseFactory =
<T extends z.ZodTypeAny>(schema: T) =>
(data: unknown): z.infer<T> => {
try {
return schema.parse(data);
return schema.parse(data) as unknown;
} catch (err) {
console.error(err);
// handle error
throw new Error(`Invalid data: ${err}`);
throw new Error(`Invalid data: ${err as string}`);
}
};

View File

@@ -1,8 +1,9 @@
import 'server-only';
import { cookies } from 'next/headers';
import type { CookieOptions } from '@supabase/ssr';
import { createServerClient } from '@supabase/ssr';
import 'server-only';
import { Database } from '../database.types';
import { getSupabaseClientKeys } from '../get-supabase-client-keys';

View File

@@ -1,7 +1,8 @@
import 'server-only';
import { cookies } from 'next/headers';
import { createServerClient } from '@supabase/ssr';
import 'server-only';
import { Database } from '../database.types';
import { getSupabaseClientKeys } from '../get-supabase-client-keys';

View File

@@ -1,7 +1,8 @@
import 'server-only';
import { cookies } from 'next/headers';
import { createServerClient } from '@supabase/ssr';
import 'server-only';
import { Database } from '../database.types';
import { getSupabaseClientKeys } from '../get-supabase-client-keys';

View File

@@ -38,7 +38,7 @@
"@tanstack/react-table": "^8.10.7",
"class-variance-authority": "^0.7.0",
"date-fns": "^3.2.0",
"lucide-react": "^0.364.0",
"lucide-react": "^0.366.0",
"react-hook-form": "^7.51.2",
"react-i18next": "^14.1.0",
"sonner": "^1.4.41",

44
pnpm-lock.yaml generated
View File

@@ -87,11 +87,11 @@ importers:
specifier: workspace:^
version: link:../../packages/ui
'@makerkit/data-loader-supabase-core':
specifier: 0.0.5
version: 0.0.5(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)
'@makerkit/data-loader-supabase-nextjs':
specifier: ^0.0.7
version: 0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.2.0-canary.62)(react@18.2.0)(swr@2.2.5)
version: 0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)
'@makerkit/data-loader-supabase-nextjs':
specifier: ^0.0.9
version: 0.0.9(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.2.0-canary.62)(react@18.2.0)(swr@2.2.5)
'@marsidev/react-turnstile':
specifier: ^0.5.4
version: 0.5.4(react-dom@18.2.0)(react@18.2.0)
@@ -563,11 +563,11 @@ importers:
specifier: workspace:^
version: link:../../ui
'@makerkit/data-loader-supabase-core':
specifier: 0.0.5
version: 0.0.5(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)
'@makerkit/data-loader-supabase-nextjs':
specifier: ^0.0.7
version: 0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.1.4)(react@18.2.0)(swr@2.2.5)
version: 0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)
'@makerkit/data-loader-supabase-nextjs':
specifier: ^0.0.9
version: 0.0.9(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.1.4)(react@18.2.0)(swr@2.2.5)
'@supabase/supabase-js':
specifier: ^2.42.0
version: 2.42.0
@@ -967,8 +967,8 @@ importers:
specifier: ^8.57.0
version: 8.57.0
lucide-react:
specifier: ^0.363.0
version: 0.363.0(react@18.2.0)
specifier: ^0.366.0
version: 0.366.0(react@18.2.0)
prettier:
specifier: ^3.2.5
version: 3.2.5
@@ -2226,8 +2226,8 @@ packages:
engines: {node: '>=18'}
dev: false
/@makerkit/data-loader-supabase-core@0.0.5(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0):
resolution: {integrity: sha512-J68TcXACZpbBhFPwNX4AP8O37iPHpcqpT8PLTLeMvoCpm2HI2MK+KGV5uj2zJydHKClRi44KkNa0BUHJzg9myw==}
/@makerkit/data-loader-supabase-core@0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0):
resolution: {integrity: sha512-9Zi7GmBZaedHl9x+LnasUL3ztx2oLInwI1uzdw4E830gSNQr/hx5/Sodd1A9cXECn51Ub5HWEJ8kfBZwX0qCKQ==}
peerDependencies:
'@supabase/postgrest-js': '>1.0.0'
'@supabase/supabase-js': '>=2.0.0'
@@ -2236,15 +2236,15 @@ packages:
'@supabase/supabase-js': 2.42.0
ts-case-convert: 2.0.7
/@makerkit/data-loader-supabase-nextjs@0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.1.4)(react@18.2.0)(swr@2.2.5):
resolution: {integrity: sha512-iPi4dWkZnv3awtlJaQIVLo7nca8XEjSMTE1HHZg1PtBAYRyLbq6vJYzhez0XVu/OSncw5QyhTzCzB1dxzOHxhw==}
/@makerkit/data-loader-supabase-nextjs@0.0.9(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.1.4)(react@18.2.0)(swr@2.2.5):
resolution: {integrity: sha512-FNn0Z3zlV0W6+GVoWAkokMC4Mzx29lByCGbYBi9F11VBkmxuEH8i4KbYYbImW+r8uvs6sdth+cqjx6Jo+VuTCw==}
peerDependencies:
'@supabase/supabase-js': '>=2.0.0'
next: '>=13.4.0'
react: '>=18.0.0'
swr: '>=2.0.0'
dependencies:
'@makerkit/data-loader-supabase-core': 0.0.5(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)
'@makerkit/data-loader-supabase-core': 0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)
'@supabase/supabase-js': 2.42.0
next: 14.1.4(@opentelemetry/api@1.8.0)(react-dom@18.2.0)(react@18.2.0)
react: 18.2.0
@@ -2253,15 +2253,15 @@ packages:
- '@supabase/postgrest-js'
dev: true
/@makerkit/data-loader-supabase-nextjs@0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.2.0-canary.62)(react@18.2.0)(swr@2.2.5):
resolution: {integrity: sha512-iPi4dWkZnv3awtlJaQIVLo7nca8XEjSMTE1HHZg1PtBAYRyLbq6vJYzhez0XVu/OSncw5QyhTzCzB1dxzOHxhw==}
/@makerkit/data-loader-supabase-nextjs@0.0.9(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.2.0-canary.62)(react@18.2.0)(swr@2.2.5):
resolution: {integrity: sha512-FNn0Z3zlV0W6+GVoWAkokMC4Mzx29lByCGbYBi9F11VBkmxuEH8i4KbYYbImW+r8uvs6sdth+cqjx6Jo+VuTCw==}
peerDependencies:
'@supabase/supabase-js': '>=2.0.0'
next: '>=13.4.0'
react: '>=18.0.0'
swr: '>=2.0.0'
dependencies:
'@makerkit/data-loader-supabase-core': 0.0.5(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)
'@makerkit/data-loader-supabase-core': 0.0.7(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)
'@supabase/supabase-js': 2.42.0
next: 14.2.0-canary.62(react-dom@18.2.0)(react@18.2.0)
react: 18.2.0
@@ -9721,6 +9721,14 @@ packages:
dependencies:
react: 18.2.0
/lucide-react@0.366.0(react@18.2.0):
resolution: {integrity: sha512-iUOsp/35wOkrgEzigZlZI/OhVxQZ8CmxjebdIjfSDzNBmrNYjQfKSpeKderaEFfGt3OycF1BE+wLlaqWRuoh4w==}
peerDependencies:
react: ^16.5.1 || ^17.0.0 || ^18.0.0
dependencies:
react: 18.2.0
dev: true
/magic-string@0.27.0:
resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
engines: {node: '>=12'}

View File

@@ -12,6 +12,7 @@ const config = {
arrowParens: 'always',
importOrder: [
'/^(?!.*\\.css).*/',
'^server-only$',
'^react$',
'^react-dom$',
'^next$',