From 2c7478abff8bcce0a5a25bc325e54d0ab53182b5 Mon Sep 17 00:00:00 2001 From: giancarlo Date: Thu, 11 Apr 2024 13:55:37 +0800 Subject: [PATCH] Update language setting and versions in several packages This commit includes an update of the language setting in the DocsPage and BlogPage functions in the marketing app to make it more dynamic. Additionally, the package versions of next, @makerkit/data-loader-supabase-nextjs, and various Next packages in the Supabase package have been updated. --- apps/web/app/(marketing)/blog/page.tsx | 3 +- apps/web/app/(marketing)/docs/layout.tsx | 3 + apps/web/app/(marketing)/docs/page.tsx | 3 +- apps/web/package.json | 2 +- packages/billing/gateway/package.json | 2 +- packages/cms/core/src/cms-client.ts | 1 + packages/cms/keystatic/src/client.ts | 10 +- .../cms/keystatic/src/keystatic.config.ts | 2 + packages/cms/wordpress/src/wp-client.ts | 9 +- packages/features/accounts/package.json | 2 +- packages/features/admin/package.json | 2 +- ...nhance-admin-action.ts => admin-action.ts} | 6 +- .../src/lib/server/admin-server-actions.ts | 12 +- packages/features/auth/package.json | 2 +- packages/features/team-accounts/package.json | 2 +- packages/next/package.json | 2 +- packages/supabase/package.json | 2 +- packages/ui/package.json | 2 +- pnpm-lock.yaml | 126 +++++++++--------- 19 files changed, 105 insertions(+), 88 deletions(-) rename packages/features/admin/src/lib/server/{enhance-admin-action.ts => admin-action.ts} (79%) diff --git a/apps/web/app/(marketing)/blog/page.tsx b/apps/web/app/(marketing)/blog/page.tsx index 29b5efc26..7925a51d4 100644 --- a/apps/web/app/(marketing)/blog/page.tsx +++ b/apps/web/app/(marketing)/blog/page.tsx @@ -19,7 +19,7 @@ export const generateMetadata = async () => { }; async function BlogPage({ searchParams }: { searchParams: { page: string } }) { - const { t } = await createI18nServerInstance(); + const { t, resolvedLanguage: language } = await createI18nServerInstance(); const cms = await createCmsClient(); const page = searchParams.page ? parseInt(searchParams.page) : 0; @@ -30,6 +30,7 @@ async function BlogPage({ searchParams }: { searchParams: { page: string } }) { collection: 'posts', limit, offset, + language, }); return ( diff --git a/apps/web/app/(marketing)/docs/layout.tsx b/apps/web/app/(marketing)/docs/layout.tsx index 0b6c81515..8fee41ca7 100644 --- a/apps/web/app/(marketing)/docs/layout.tsx +++ b/apps/web/app/(marketing)/docs/layout.tsx @@ -1,12 +1,15 @@ import { Cms, createCmsClient } from '@kit/cms'; import { DocsNavigation } from '~/(marketing)/docs/_components/docs-navigation'; +import { createI18nServerInstance } from '~/lib/i18n/i18n.server'; async function DocsLayout({ children }: React.PropsWithChildren) { const cms = await createCmsClient(); + const { resolvedLanguage } = await createI18nServerInstance(); const { items: pages } = await cms.getContentItems({ collection: 'documentation', + language: resolvedLanguage, }); return ( diff --git a/apps/web/app/(marketing)/docs/page.tsx b/apps/web/app/(marketing)/docs/page.tsx index 6681350fe..902091dcd 100644 --- a/apps/web/app/(marketing)/docs/page.tsx +++ b/apps/web/app/(marketing)/docs/page.tsx @@ -16,10 +16,11 @@ export const generateMetadata = async () => { async function DocsPage() { const client = await createCmsClient(); - const { t } = await createI18nServerInstance(); + const { t, resolvedLanguage } = await createI18nServerInstance(); const { items } = await client.getContentItems({ collection: 'documentation', + language: resolvedLanguage, }); // Filter out any docs that have a parentId, as these are children of other docs diff --git a/apps/web/package.json b/apps/web/package.json index 77747c0ec..724711f02 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -57,7 +57,7 @@ "i18next": "^23.11.0", "i18next-resources-to-backend": "^1.2.0", "lucide-react": "^0.363.0", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "next-sitemap": "^4.2.3", "next-themes": "0.3.0", "react": "18.2.0", diff --git a/packages/billing/gateway/package.json b/packages/billing/gateway/package.json index 662a1c13b..e3d02233b 100644 --- a/packages/billing/gateway/package.json +++ b/packages/billing/gateway/package.json @@ -45,7 +45,7 @@ "@types/react": "^18.2.75", "date-fns": "^3.6.0", "lucide-react": "^0.363.0", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "react": "18.2.0", "react-hook-form": "^7.51.2", "react-i18next": "^14.1.0", diff --git a/packages/cms/core/src/cms-client.ts b/packages/cms/core/src/cms-client.ts index 0fd56bcea..2dfb8dee2 100644 --- a/packages/cms/core/src/cms-client.ts +++ b/packages/cms/core/src/cms-client.ts @@ -35,6 +35,7 @@ export namespace Cms { categories?: string[]; tags?: string[]; parentIds?: string[]; + language?: string | undefined; } export interface GetCategoriesOptions { diff --git a/packages/cms/keystatic/src/client.ts b/packages/cms/keystatic/src/client.ts index 30011b590..be7c3576a 100644 --- a/packages/cms/keystatic/src/client.ts +++ b/packages/cms/keystatic/src/client.ts @@ -23,7 +23,7 @@ export class KeystaticClient implements CmsClient { const endOffset = startOffset + (options?.limit ?? 10); const filtered = docs.filter((item) => { - const categoryMatch = options?.categories + const categoryMatch = options?.categories?.length ? options.categories.find((category) => item.entry.categories.includes(category), ) @@ -33,7 +33,13 @@ export class KeystaticClient implements CmsClient { return false; } - const tagMatch = options?.tags + if (options.language) { + if (item.entry.language && item.entry.language !== options.language) { + return false; + } + } + + const tagMatch = options?.tags?.length ? options.tags.find((tag) => item.entry.tags.includes(tag)) : true; diff --git a/packages/cms/keystatic/src/keystatic.config.ts b/packages/cms/keystatic/src/keystatic.config.ts index 45bfe8438..55ac0fb2a 100644 --- a/packages/cms/keystatic/src/keystatic.config.ts +++ b/packages/cms/keystatic/src/keystatic.config.ts @@ -31,6 +31,7 @@ function createKeyStaticConfig(path: string) { label: 'Parent', collection: 'posts', }), + language: fields.text({ label: 'Language' }), order: fields.number({ label: 'Order' }), content: fields.document({ label: 'Content', @@ -83,6 +84,7 @@ function createKeyStaticConfig(path: string) { description: fields.text({ label: 'Description' }), publishedAt: fields.date({ label: 'Published At' }), order: fields.number({ label: 'Order' }), + language: fields.text({ label: 'Language' }), parent: fields.relationship({ label: 'Parent', collection: 'documentation', diff --git a/packages/cms/wordpress/src/wp-client.ts b/packages/cms/wordpress/src/wp-client.ts index 1428ef965..30a9bb014 100644 --- a/packages/cms/wordpress/src/wp-client.ts +++ b/packages/cms/wordpress/src/wp-client.ts @@ -54,8 +54,13 @@ export class WordpressClient implements CmsClient { } if (options?.tags) { - const ids = await this.getCategories({ - slugs: options.tags, + const allTags = [ + ...options.tags, + options.language ? options.language : '', + ].filter(Boolean); + + const ids = await this.getTags({ + slugs: allTags, }).then((tags) => tags.map((tag) => tag.id)); if (ids.length) { diff --git a/packages/features/accounts/package.json b/packages/features/accounts/package.json index c85c955e6..66497bd78 100644 --- a/packages/features/accounts/package.json +++ b/packages/features/accounts/package.json @@ -35,7 +35,7 @@ "@types/react": "^18.2.75", "@types/react-dom": "^18.2.22", "lucide-react": "^0.363.0", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "next-themes": "0.3.0", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/features/admin/package.json b/packages/features/admin/package.json index f9bcec374..b0c07a573 100644 --- a/packages/features/admin/package.json +++ b/packages/features/admin/package.json @@ -40,7 +40,7 @@ "@tanstack/react-table": "^8.15.3", "@types/react": "^18.2.75", "lucide-react": "^0.363.0", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "react": "18.2.0", "react-hook-form": "^7.51.2", "zod": "^3.22.4" diff --git a/packages/features/admin/src/lib/server/enhance-admin-action.ts b/packages/features/admin/src/lib/server/admin-action.ts similarity index 79% rename from packages/features/admin/src/lib/server/enhance-admin-action.ts rename to packages/features/admin/src/lib/server/admin-action.ts index 3c4b59c5f..9d4120919 100644 --- a/packages/features/admin/src/lib/server/enhance-admin-action.ts +++ b/packages/features/admin/src/lib/server/admin-action.ts @@ -5,13 +5,11 @@ import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-clie import { isSuperAdmin } from './is-super-admin'; /** - * @name enhanceAdminAction + * @name adminAction * @description Wrap a server action to ensure the user is a super admin. * @param fn */ -export function enhanceAdminAction( - fn: (params: Args) => Response, -) { +export function adminAction(fn: (params: Args) => Response) { return async (params: Args) => { const isAdmin = await isSuperAdmin(getSupabaseServerActionClient()); diff --git a/packages/features/admin/src/lib/server/admin-server-actions.ts b/packages/features/admin/src/lib/server/admin-server-actions.ts index a4c82d16e..ec5dab20f 100644 --- a/packages/features/admin/src/lib/server/admin-server-actions.ts +++ b/packages/features/admin/src/lib/server/admin-server-actions.ts @@ -6,7 +6,7 @@ import { redirect } from 'next/navigation'; import { enhanceAction } from '@kit/next/actions'; import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client'; -import { enhanceAdminAction } from './enhance-admin-action'; +import { adminAction } from './admin-action'; import { BanUserSchema, DeleteAccountSchema, @@ -21,7 +21,7 @@ import { AdminAuthUserService } from './services/admin-auth-user.service'; * @name banUserAction * @description Ban a user from the system. */ -export const banUserAction = enhanceAdminAction( +export const banUserAction = adminAction( enhanceAction( async ({ userId }) => { const service = getAdminAuthService(); @@ -44,7 +44,7 @@ export const banUserAction = enhanceAdminAction( * @name reactivateUserAction * @description Reactivate a user in the system. */ -export const reactivateUserAction = enhanceAdminAction( +export const reactivateUserAction = adminAction( enhanceAction( async ({ userId }) => { const service = getAdminAuthService(); @@ -67,7 +67,7 @@ export const reactivateUserAction = enhanceAdminAction( * @name impersonateUserAction * @description Impersonate a user in the system. */ -export const impersonateUserAction = enhanceAdminAction( +export const impersonateUserAction = adminAction( enhanceAction( async ({ userId }) => { const service = getAdminAuthService(); @@ -84,7 +84,7 @@ export const impersonateUserAction = enhanceAdminAction( * @name deleteUserAction * @description Delete a user from the system. */ -export const deleteUserAction = enhanceAdminAction( +export const deleteUserAction = adminAction( enhanceAction( async ({ userId }) => { const service = getAdminAuthService(); @@ -105,7 +105,7 @@ export const deleteUserAction = enhanceAdminAction( * @name deleteAccountAction * @description Delete an account from the system. */ -export const deleteAccountAction = enhanceAdminAction( +export const deleteAccountAction = adminAction( enhanceAction( async ({ accountId }) => { const service = getAdminAccountsService(); diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json index d1a062dd5..23bb6a272 100644 --- a/packages/features/auth/package.json +++ b/packages/features/auth/package.json @@ -32,7 +32,7 @@ "@tanstack/react-query": "5.28.6", "@types/react": "^18.2.75", "lucide-react": "^0.363.0", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "react-hook-form": "^7.51.2", "react-i18next": "^14.1.0", "sonner": "^1.4.41", diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json index 93128d56c..9123a8d9f 100644 --- a/packages/features/team-accounts/package.json +++ b/packages/features/team-accounts/package.json @@ -36,7 +36,7 @@ "class-variance-authority": "^0.7.0", "date-fns": "^3.6.0", "lucide-react": "^0.363.0", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "react": "18.2.0", "react-dom": "18.2.0", "react-hook-form": "^7.51.2", diff --git a/packages/next/package.json b/packages/next/package.json index 7829b5c2b..b6ade4dc3 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -28,7 +28,7 @@ "@kit/tailwind-config": "workspace:*", "@kit/tsconfig": "workspace:*", "@supabase/supabase-js": "^2.42.0", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "zod": "^3.22.4" }, "eslintConfig": { diff --git a/packages/supabase/package.json b/packages/supabase/package.json index 77a9b062d..c2e69cbb9 100644 --- a/packages/supabase/package.json +++ b/packages/supabase/package.json @@ -33,7 +33,7 @@ "@supabase/supabase-js": "^2.42.0", "@tanstack/react-query": "5.28.6", "@types/react": "^18.2.75", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "react": "18.2.0", "zod": "^3.22.4" }, diff --git a/packages/ui/package.json b/packages/ui/package.json index 0f4864603..b2a4fd84c 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -59,7 +59,7 @@ "date-fns": "^3.6.0", "eslint": "^8.57.0", "lucide-react": "^0.363.0", - "next": "14.2.0-canary.64", + "next": "14.2.0-canary.65", "next-themes": "0.3.0", "prettier": "^3.2.5", "react-day-picker": "^8.10.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dbbe7ec34..90db77488 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -94,7 +94,7 @@ importers: 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.64)(react@18.2.0)(swr@2.2.5) + version: 0.0.9(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.2.0-canary.65)(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) @@ -109,7 +109,7 @@ importers: version: 5.28.6(react@18.2.0) '@tanstack/react-query-next-experimental': specifier: ^5.29.0 - version: 5.29.0(@tanstack/react-query@5.28.6)(next@14.2.0-canary.64)(react@18.2.0) + version: 5.29.0(@tanstack/react-query@5.28.6)(next@14.2.0-canary.65)(react@18.2.0) '@tanstack/react-table': specifier: ^8.15.3 version: 8.15.3(react-dom@18.2.0)(react@18.2.0) @@ -118,7 +118,7 @@ importers: version: 3.6.0 edge-csrf: specifier: ^1.0.9 - version: 1.0.9(next@14.2.0-canary.64) + version: 1.0.9(next@14.2.0-canary.65) i18next: specifier: ^23.11.0 version: 23.11.0 @@ -129,11 +129,11 @@ importers: specifier: ^0.363.0 version: 0.363.0(react@18.2.0) next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) next-sitemap: specifier: ^4.2.3 - version: 4.2.3(next@14.2.0-canary.64) + version: 4.2.3(next@14.2.0-canary.65) next-themes: specifier: 0.3.0 version: 0.3.0(react-dom@18.2.0)(react@18.2.0) @@ -283,8 +283,8 @@ importers: specifier: ^0.363.0 version: 0.363.0(react@18.2.0) next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -579,8 +579,8 @@ importers: specifier: ^0.363.0 version: 0.363.0(react@18.2.0) next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) next-themes: specifier: 0.3.0 version: 0.3.0(react-dom@18.2.0)(react@18.2.0) @@ -634,7 +634,7 @@ importers: 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.64)(react@18.2.0)(swr@2.2.5) + version: 0.0.9(@supabase/postgrest-js@1.15.0)(@supabase/supabase-js@2.42.0)(next@14.2.0-canary.65)(react@18.2.0)(swr@2.2.5) '@supabase/supabase-js': specifier: ^2.42.0 version: 2.42.0 @@ -651,8 +651,8 @@ importers: specifier: ^0.363.0 version: 0.363.0(react@18.2.0) next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -708,8 +708,8 @@ importers: specifier: ^0.363.0 version: 0.363.0(react@18.2.0) next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) react-hook-form: specifier: ^7.51.2 version: 7.51.2(react@18.2.0) @@ -790,8 +790,8 @@ importers: specifier: ^0.363.0 version: 0.363.0(react@18.2.0) next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -964,8 +964,8 @@ importers: specifier: ^2.42.0 version: 2.42.0 next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) zod: specifier: ^3.22.4 version: 3.22.4 @@ -1022,8 +1022,8 @@ importers: specifier: ^18.2.75 version: 18.2.75 next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -1140,8 +1140,8 @@ importers: specifier: ^0.363.0 version: 0.363.0(react@18.2.0) next: - specifier: 14.2.0-canary.64 - version: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.0-canary.65 + version: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) next-themes: specifier: 0.3.0 version: 0.3.0(react-dom@18.2.0)(react@18.2.0) @@ -2366,7 +2366,7 @@ packages: '@supabase/supabase-js': 2.42.0 ts-case-convert: 2.0.7 - /@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.64)(react@18.2.0)(swr@2.2.5): + /@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.65)(react@18.2.0)(swr@2.2.5): resolution: {integrity: sha512-FNn0Z3zlV0W6+GVoWAkokMC4Mzx29lByCGbYBi9F11VBkmxuEH8i4KbYYbImW+r8uvs6sdth+cqjx6Jo+VuTCw==} peerDependencies: '@supabase/supabase-js': '>=2.0.0' @@ -2376,7 +2376,7 @@ packages: dependencies: '@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.64(react-dom@18.2.0)(react@18.2.0) + next: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 swr: 2.2.5(react@18.2.0) transitivePeerDependencies: @@ -2477,8 +2477,8 @@ packages: resolution: {integrity: sha512-e7X7bbn3Z6DWnDi75UWn+REgAbLEqxI8Tq2pkFOFAMpWAWApz/YCUhtWMWn410h8Q2fYiYL7Yg5OlxMOCfFjJQ==} dev: false - /@next/env@14.2.0-canary.64: - resolution: {integrity: sha512-+wcKyLnzLw4Li5EOlDr0I4Y+KwjStwqaQ9i/sCv8ZnZSaOisRDh8CwjBBnZoxTwVwUk3u/5Gj8EuNsLhfHHUPQ==} + /@next/env@14.2.0-canary.65: + resolution: {integrity: sha512-rV3RAowh7nxYHG1LvhUk9VBIGpdu9nJ55GSX/cZOP2+qR/4U0qhGLFaGtIv3iFigiZED7YuIAdCS9+5UKWSf0w==} /@next/eslint-plugin-next@14.1.4: resolution: {integrity: sha512-n4zYNLSyCo0Ln5b7qxqQeQ34OZKXwgbdcx6kmkQbywr+0k6M3Vinft0T72R6CDAcDrne2IAgSud4uWCzFgc5HA==} @@ -2504,8 +2504,8 @@ packages: dev: false optional: true - /@next/swc-darwin-arm64@14.2.0-canary.64: - resolution: {integrity: sha512-TFGdehG97x0EAU0nUsoNAZ1/qRB7E00X7b9xlO9X8FpEFXNFRmvOf0dK3FR6lOy18DM8oU59kKurDTXt3LwhXw==} + /@next/swc-darwin-arm64@14.2.0-canary.65: + resolution: {integrity: sha512-AXB/+LyWjYDIZW6ejxDbsBZo6bfC/gA7257lcqtcZgGFwW0v65FwcQzpYid0sxWi2wfAOFBGvfqSODVAblyMRg==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -2530,8 +2530,8 @@ packages: dev: false optional: true - /@next/swc-darwin-x64@14.2.0-canary.64: - resolution: {integrity: sha512-dxRGpOIwCeA0Vr7/q7lIpQDN7caDc/ax6pc3IRlxCU7MBoepTuCUweIM0cUrjBw1/zHNPvm/W7dxIAglVwqRmQ==} + /@next/swc-darwin-x64@14.2.0-canary.65: + resolution: {integrity: sha512-OabDpl+uwe0mQYDNw5vbsu1ZyDEnK6w3yo09SS1Kyo8d8yDeWFKAZEZ4AZY2aumcWCXSPPZ2iDAo/l0zIKFIkQ==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -2556,8 +2556,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-gnu@14.2.0-canary.64: - resolution: {integrity: sha512-26RmJj3ETjdq4PL9yQ28nzpMaa7cZPeHqwNm3EuWSIcH0Ybs2S8wJHUWWYMyUXciyn+pMSNNkmzDwb2asmEoug==} + /@next/swc-linux-arm64-gnu@14.2.0-canary.65: + resolution: {integrity: sha512-1dZvO6vlLobtfdtd3xlh7Jt4/dzU+FjdBpSIlTZl4z0R4RIO/UTOowSuRGP7Eruxu8GbJwlLn7yOhBIRFKaxlQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -2582,8 +2582,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-musl@14.2.0-canary.64: - resolution: {integrity: sha512-GO3HlEglhPOb6W/3skJGZZEfTjLKV5U5qeRp40/bcWbExCMSWPZhja5aGCEdozCxVDr7R+IqBlSNW0yrKJzBOg==} + /@next/swc-linux-arm64-musl@14.2.0-canary.65: + resolution: {integrity: sha512-l8lgH66NBglvJ6ONDtfoYWZDwm6VpGTBwiJuWHmFUEIEPl5AarCwR3KGgl7cALBCj5sasXfcYPKb0CTrwShVMw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -2608,8 +2608,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-gnu@14.2.0-canary.64: - resolution: {integrity: sha512-lxM3AIQd/cz9GQlXBqML9DdYj4jM3x9QgoD79WegriJ6Zb1KaHsUexOcG29BpPQub9MNm+X9RrvWcvWSfRQPJg==} + /@next/swc-linux-x64-gnu@14.2.0-canary.65: + resolution: {integrity: sha512-V1g3XD6ecxHUtUG38xnS1Iyv9MMapD/ixWa+ujpH+vJT7mduLVSZX+yzzxJ4gP4CaIXlfzS35HCzfA8S/VFeTA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -2634,8 +2634,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-musl@14.2.0-canary.64: - resolution: {integrity: sha512-vG66fQz+BlQUuc8LEqyfW/1JrLnmBMsp3NXcjCFBF4BD19eDOXeyponOpfsZYNnPf9Ex8wWauy3lhowk4levUg==} + /@next/swc-linux-x64-musl@14.2.0-canary.65: + resolution: {integrity: sha512-8QEny7bJ0PqBKlkdnM5VEJoL81iiC7vJd4z43iPoUAPJ+kWuaWxKtnPKC3QEPP1TyNmr5xc2EQ/AeJePJDeJFg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -2660,8 +2660,8 @@ packages: dev: false optional: true - /@next/swc-win32-arm64-msvc@14.2.0-canary.64: - resolution: {integrity: sha512-lXgX67oanH+Ek6/V3iUX/B/u057jyszYON8rdWYBYnCl+Z4MYiLh3FgBDWXoKLE1Xqp53ILPTLrP07c3TfhtCg==} + /@next/swc-win32-arm64-msvc@14.2.0-canary.65: + resolution: {integrity: sha512-TlZNesjSfKr8VAWbX/QhzuuvKSBm2wRKutSeGX4/yAb1svGuIVmvKHlLg+f1MXcrJ/c1ioWZBuJ97aVL2vYKFQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -2686,8 +2686,8 @@ packages: dev: false optional: true - /@next/swc-win32-ia32-msvc@14.2.0-canary.64: - resolution: {integrity: sha512-5Cx33kU7zcJg0GZD7fJOfmePyfwt414Tnf45VjQYuaMytFFp+zcxAu/1TLLYziHQ/+p5JW9zodfLGnkNbMZeDg==} + /@next/swc-win32-ia32-msvc@14.2.0-canary.65: + resolution: {integrity: sha512-wIhPgGpobT0t68bVZhscwqgx+fmzlJmeLbQ1f0lK4O3oVnaa/MkPv/K6Jq/hEMzgivztupKqAS9bC09IEqSYkA==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -2712,8 +2712,8 @@ packages: dev: false optional: true - /@next/swc-win32-x64-msvc@14.2.0-canary.64: - resolution: {integrity: sha512-l0qkK2hTcN1t3z6KOlTOEQV1xqtu2IuqvjOJpcMtZGS6Z4deSkw1vKzwvz3AQMs6xStOcQBujd7lfRscE76hUg==} + /@next/swc-win32-x64-msvc@14.2.0-canary.65: + resolution: {integrity: sha512-eZwJHdSMrfvkWHD1VFP0lMWWHQ971E+V2HHr8zW3nyV3XRmmA3zChB+w4sA+aFH+ypaknPI6IdEkNtjQ7ezFtQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -6628,7 +6628,7 @@ packages: /@tanstack/query-core@5.28.6: resolution: {integrity: sha512-hnhotV+DnQtvtR3jPvbQMPNMW4KEK0J4k7c609zJ8muiNknm+yoDyMHmxTWM5ZnlZpsz0zOxYFr+mzRJNHWJsA==} - /@tanstack/react-query-next-experimental@5.29.0(@tanstack/react-query@5.28.6)(next@14.2.0-canary.64)(react@18.2.0): + /@tanstack/react-query-next-experimental@5.29.0(@tanstack/react-query@5.28.6)(next@14.2.0-canary.65)(react@18.2.0): resolution: {integrity: sha512-PgzDSM7m1ppEsLm2uPw/Tnv8PfFDi/c5CfP2UyJq9eRZu3J50l7bHt3v6W6QaAZdJUPxum8uS9zpKx+OdgkpVA==} peerDependencies: '@tanstack/react-query': ^5.29.0 @@ -6636,7 +6636,7 @@ packages: react: ^18.0.0 dependencies: '@tanstack/react-query': 5.28.6(react@18.2.0) - next: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + next: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 dev: false @@ -8512,12 +8512,12 @@ packages: /eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} - /edge-csrf@1.0.9(next@14.2.0-canary.64): + /edge-csrf@1.0.9(next@14.2.0-canary.65): resolution: {integrity: sha512-3F89YTh42UDdISr3s9AEcgJDLi4ysgjGfnybzF0LuZGaG2W31h1ZwgWwEQBLMj04lAklcP4XHZYi7vk9o8zcbg==} peerDependencies: next: ^13.0.0 || ^14.0.0 dependencies: - next: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + next: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) dev: false /editorconfig@1.0.4: @@ -11176,7 +11176,7 @@ packages: engines: {node: '>= 0.4.0'} dev: false - /next-sitemap@4.2.3(next@14.2.0-canary.64): + /next-sitemap@4.2.3(next@14.2.0-canary.65): resolution: {integrity: sha512-vjdCxeDuWDzldhCnyFCQipw5bfpl4HmZA7uoo3GAaYGjGgfL4Cxb1CiztPuWGmS+auYs7/8OekRS8C2cjdAsjQ==} engines: {node: '>=14.18'} hasBin: true @@ -11187,7 +11187,7 @@ packages: '@next/env': 13.5.6 fast-glob: 3.3.2 minimist: 1.2.8 - next: 14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0) + next: 14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0) dev: false /next-themes@0.3.0(react-dom@18.2.0)(react@18.2.0): @@ -11278,8 +11278,8 @@ packages: - babel-plugin-macros dev: false - /next@14.2.0-canary.64(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-VoyjSuui2SactVw3yizNg4eM6ts803mrFm+i1nXCgb3bK4w6zb5GA/WKv5NZrOg50+EAhLjj3NEsFc0hMRp1Cw==} + /next@14.2.0-canary.65(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-cB0/5sZEKMLU2IzyONSkrY8pQqFlQfTlvvLdcgT80c86E2672nz0RBnGoAydxVw7U8Lk/NKbbQ6gZ4OrAK8blA==} engines: {node: '>=18.17.0'} hasBin: true peerDependencies: @@ -11296,7 +11296,7 @@ packages: sass: optional: true dependencies: - '@next/env': 14.2.0-canary.64 + '@next/env': 14.2.0-canary.65 '@swc/helpers': 0.5.5 busboy: 1.6.0 caniuse-lite: 1.0.30001607 @@ -11306,15 +11306,15 @@ packages: react-dom: 18.2.0(react@18.2.0) styled-jsx: 5.1.1(react@18.2.0) optionalDependencies: - '@next/swc-darwin-arm64': 14.2.0-canary.64 - '@next/swc-darwin-x64': 14.2.0-canary.64 - '@next/swc-linux-arm64-gnu': 14.2.0-canary.64 - '@next/swc-linux-arm64-musl': 14.2.0-canary.64 - '@next/swc-linux-x64-gnu': 14.2.0-canary.64 - '@next/swc-linux-x64-musl': 14.2.0-canary.64 - '@next/swc-win32-arm64-msvc': 14.2.0-canary.64 - '@next/swc-win32-ia32-msvc': 14.2.0-canary.64 - '@next/swc-win32-x64-msvc': 14.2.0-canary.64 + '@next/swc-darwin-arm64': 14.2.0-canary.65 + '@next/swc-darwin-x64': 14.2.0-canary.65 + '@next/swc-linux-arm64-gnu': 14.2.0-canary.65 + '@next/swc-linux-arm64-musl': 14.2.0-canary.65 + '@next/swc-linux-x64-gnu': 14.2.0-canary.65 + '@next/swc-linux-x64-musl': 14.2.0-canary.65 + '@next/swc-win32-arm64-msvc': 14.2.0-canary.65 + '@next/swc-win32-ia32-msvc': 14.2.0-canary.65 + '@next/swc-win32-x64-msvc': 14.2.0-canary.65 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros