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

Update dependencies and refactor loading components

Browse Source 
- Removed `react-is` and `require-in-the-middle` overrides from `package.json` and `pnpm-lock.yaml`.
- Updated various dependencies across multiple packages, including `@types/node` to `^24.5.2`, `react-hook-form` to `^7.63.0`, and `@ai-sdk/openai` to `^2.0.32`.
- Deleted the `loading.tsx` component from the admin accounts directory, streamlining the codebase.
- Adjusted `playwright.config.ts` to use a configurable number of workers for CI environments, enhancing test performance.
- Improved error handling in user ban and reactivation dialogs to provide clearer feedback to the admin user.
This commit is contained in:
gbuomprisco
2025-09-21 09:44:41 +08:00
parent 9712e2354b
commit f157cc7f3e
26 changed files with 1031 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/dev-tool/package.json
View File

@@ -8,11 +8,11 @@
"format": "prettier --check --write \"**/*.{js,cjs,mjs,ts,tsx,md,json}\""
},
"dependencies": {
"@ai-sdk/openai": "^2.0.30",
"@ai-sdk/openai": "^2.0.32",
"@faker-js/faker": "^10.0.0",
"@hookform/resolvers": "^5.2.2",
"@tanstack/react-query": "5.89.0",
"ai": "5.0.44",
"ai": "5.0.48",
"lucide-react": "^0.544.0",
"next": "15.5.3",
"nodemailer": "^7.0.6",
@@ -28,13 +28,13 @@
"@kit/tsconfig": "workspace:*",
"@kit/ui": "workspace:*",
"@tailwindcss/postcss": "^4.1.13",
"@types/node": "^24.5.0",
"@types/node": "^24.5.2",
"@types/nodemailer": "7.0.1",
"@types/react": "19.1.13",
"@types/react-dom": "19.1.9",
"babel-plugin-react-compiler": "19.1.0-rc.3",
"pino-pretty": "13.0.0",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"recharts": "2.15.3",
"tailwindcss": "4.1.13",
"tailwindcss-animate": "^1.0.7",

2
apps/e2e/package.json
View File

@@ -13,7 +13,7 @@
"license": "ISC",
"devDependencies": {
"@playwright/test": "^1.55.0",
"@types/node": "^24.5.0",
"@types/node": "^24.5.2",
"dotenv": "17.2.2",
"node-html-parser": "^7.0.1",
"totp-generator": "^2.0.0"

7
apps/e2e/playwright.config.ts
View File

@@ -4,6 +4,11 @@ import { config as dotenvConfig } from 'dotenv';
dotenvConfig();
dotenvConfig({ path: '.env.local' });
/**
* Number of workers to use in CI. Tweak based on your CI provider's resources.
*/
const CI_WORKERS = 3;
const enableBillingTests = process.env.ENABLE_BILLING_TESTS === 'true';
const enableTeamAccountTests =
(process.env.ENABLE_TEAM_ACCOUNT_TESTS ?? 'true') === 'true';
@@ -47,7 +52,7 @@ export default defineConfig({
forbidOnly: !!process.env.CI,
retries: 3,
/* Limit parallel tests on CI. */
workers: process.env.CI ? 1 : undefined,
workers: process.env.CI ? CI_WORKERS : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: 'html',
/* Ignore billing tests if the environment variable is not set. */

3
apps/web/app/admin/accounts/[id]/loading.tsx
View File

@@ -1,3 +0,0 @@
import { GlobalLoader } from '@kit/ui/global-loader';
export default GlobalLoader;

4
apps/web/package.json
View File

@@ -66,7 +66,7 @@
"next-themes": "0.4.6",
"react": "19.1.1",
"react-dom": "19.1.1",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"react-i18next": "^15.7.3",
"recharts": "2.15.3",
"tailwind-merge": "^3.3.1",
@@ -78,7 +78,7 @@
"@kit/tsconfig": "workspace:*",
"@next/bundle-analyzer": "15.5.3",
"@tailwindcss/postcss": "^4.1.13",
"@types/node": "^24.5.0",
"@types/node": "^24.5.2",
"@types/react": "19.1.13",
"@types/react-dom": "19.1.9",
"babel-plugin-react-compiler": "19.1.0-rc.3",

6
package.json
View File

@@ -38,12 +38,6 @@
},
"prettier": "@kit/prettier-config",
"packageManager": "pnpm@10.14.0",
"pnpm": {
"overrides": {
"react-is": "19.0.0",
"require-in-the-middle": "7.5.2"
}
},
"devDependencies": {
"@manypkg/cli": "^0.25.1",
"@turbo/gen": "^2.5.6",

2
packages/analytics/package.json
View File

@@ -17,7 +17,7 @@
"@kit/eslint-config": "workspace:*",
"@kit/prettier-config": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@types/node": "^24.5.0"
"@types/node": "^24.5.2"
},
"typesVersions": {
"*": {

2
packages/billing/gateway/package.json
View File

@@ -32,7 +32,7 @@
"lucide-react": "^0.544.0",
"next": "15.5.3",
"react": "19.1.1",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"react-i18next": "^15.7.3",
"zod": "^3.25.74"
},

2
packages/cms/core/package.json
View File

@@ -20,7 +20,7 @@
"@kit/shared": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@kit/wordpress": "workspace:*",
"@types/node": "^24.5.0"
"@types/node": "^24.5.2"
},
"typesVersions": {
"*": {

2
packages/cms/keystatic/package.json
View File

@@ -26,7 +26,7 @@
"@kit/prettier-config": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@kit/ui": "workspace:*",
"@types/node": "^24.5.0",
"@types/node": "^24.5.2",
"@types/react": "19.1.13",
"react": "19.1.1",
"zod": "^3.25.74"

2
packages/cms/wordpress/package.json
View File

@@ -20,7 +20,7 @@
"@kit/prettier-config": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@kit/ui": "workspace:*",
"@types/node": "^24.5.0",
"@types/node": "^24.5.2",
"@types/react": "19.1.13",
"wp-types": "^4.68.1"
},

2
packages/features/accounts/package.json
View File

@@ -43,7 +43,7 @@
"next-themes": "0.4.6",
"react": "19.1.1",
"react-dom": "19.1.1",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"react-i18next": "^15.7.3",
"zod": "^3.25.74"
},

2
packages/features/admin/package.json
View File

@@ -28,7 +28,7 @@
"next": "15.5.3",
"react": "19.1.1",
"react-dom": "19.1.1",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"zod": "^3.25.74"
},
"exports": {

6
packages/features/admin/src/components/admin-ban-user-dialog.tsx
View File

@@ -2,8 +2,6 @@
import { useState, useTransition } from 'react';
import { isRedirectError } from 'next/dist/client/components/redirect-error';
import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
@@ -80,8 +78,8 @@ function BanUserForm(props: { userId: string }) {
startTransition(async () => {
try {
await banUserAction(data);
} catch (error) {
setError(!isRedirectError(error));
} catch {
setError(true);
}
});
})}

6
packages/features/admin/src/components/admin-reactivate-user-dialog.tsx
View File

@@ -2,8 +2,6 @@
import { useState, useTransition } from 'react';
import { isRedirectError } from 'next/dist/client/components/redirect-error';
import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
@@ -79,8 +77,8 @@ function ReactivateUserForm(props: { userId: string }) {
startTransition(async () => {
try {
await reactivateUserAction(data);
} catch (error) {
setError(!isRedirectError(error));
} catch {
setError(true);
}
});
})}

6
packages/features/admin/src/lib/server/admin-server-actions.ts
View File

@@ -43,11 +43,9 @@ export const banUserAction = adminAction(
};
}
logger.info({ userId }, `Super Admin has successfully banned user`);
revalidateAdmin();
return redirect(`/admin/accounts/${userId}`);
logger.info({ userId }, `Super Admin has successfully banned user`);
},
{
schema: BanUserSchema,
@@ -80,8 +78,6 @@ export const reactivateUserAction = adminAction(
revalidateAdmin();
logger.info({ userId }, `Super Admin has successfully reactivated user`);
return redirect(`/admin/accounts/${userId}`);
},
{
schema: ReactivateUserSchema,

2
packages/features/auth/package.json
View File

@@ -34,7 +34,7 @@
"@types/react": "19.1.13",
"lucide-react": "^0.544.0",
"next": "15.5.3",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"react-i18next": "^15.7.3",
"sonner": "^2.0.7",
"zod": "^3.25.74"

2
packages/features/team-accounts/package.json
View File

@@ -43,7 +43,7 @@
"next": "15.5.3",
"react": "19.1.1",
"react-dom": "19.1.1",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"react-i18next": "^15.7.3",
"zod": "^3.25.74"
},

2
packages/mailers/core/package.json
View File

@@ -20,7 +20,7 @@
"@kit/resend": "workspace:*",
"@kit/shared": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@types/node": "^24.5.0",
"@types/node": "^24.5.2",
"zod": "^3.25.74"
},
"typesVersions": {

2
packages/mailers/resend/package.json
View File

@@ -17,7 +17,7 @@
"@kit/mailers-shared": "workspace:*",
"@kit/prettier-config": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@types/node": "^24.5.0",
"@types/node": "^24.5.2",
"zod": "^3.25.74"
},
"typesVersions": {

4
packages/mcp-server/package.json
View File

@@ -25,8 +25,8 @@
"@kit/eslint-config": "workspace:*",
"@kit/prettier-config": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@modelcontextprotocol/sdk": "1.18.0",
"@types/node": "^24.5.0",
"@modelcontextprotocol/sdk": "1.18.1",
"@types/node": "^24.5.2",
"postgres": "3.4.7",
"zod": "^3.25.74"
},

2
packages/monitoring/sentry/package.json
View File

@@ -16,7 +16,7 @@
"./config/server": "./src/sentry.client.server.ts"
},
"dependencies": {
"@sentry/nextjs": "^10.11.0",
"@sentry/nextjs": "^10.12.0",
"import-in-the-middle": "1.14.2"
},
"devDependencies": {

2
packages/otp/package.json
View File

@@ -30,7 +30,7 @@
"@types/react-dom": "19.1.9",
"react": "19.1.1",
"react-dom": "19.1.1",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"zod": "^3.25.74"
},
"typesVersions": {

2
packages/shared/package.json
View File

@@ -23,7 +23,7 @@
"@types/react": "19.1.13"
},
"dependencies": {
"pino": "^9.9.5"
"pino": "^9.11.0"
},
"typesVersions": {
"*": {

4
packages/ui/package.json
View File

@@ -36,8 +36,8 @@
"next": "15.5.3",
"next-themes": "0.4.6",
"prettier": "^3.6.2",
"react-day-picker": "^9.10.0",
"react-hook-form": "^7.62.0",
"react-day-picker": "^9.11.0",
"react-hook-form": "^7.63.0",
"react-i18next": "^15.7.3",
"sonner": "^2.0.7",
"tailwindcss": "4.1.13",

2337
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff