Connect, collaborate, and grow with a community of TypeScript developers
feat(web): add i18n (#593)
Tom Lienard5e54f0eb75b7
diff --git a/apps/web/package.json b/apps/web/package.jsonindex cbd4be9e..2e3f3594 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -47,6 +47,7 @@"million": "2.6.0-beta.12","monaco-vim": "^0.4.0","next": "^13.4.19",+ "next-international": "1.0.0-rc.4","next-themes": "^0.2.1","react": "^18.2.0","react-day-picker": "^8.8.0",diff --git a/apps/web/src/app/[username]/page.tsx b/apps/web/src/app/[locale]/[username]/page.tsxsimilarity index 100%rename from apps/web/src/app/[username]/page.tsxrename to apps/web/src/app/[locale]/[username]/page.tsxdiff --git a/apps/web/src/app/_components/community/community.module.css b/apps/web/src/app/[locale]/_components/community/community.module.csssimilarity index 91%rename from apps/web/src/app/_components/community/community.module.cssrename to apps/web/src/app/[locale]/_components/community/community.module.cssindex b3a2128e..24f4ed12 100644--- a/apps/web/src/app/_components/community/community.module.css+++ b/apps/web/src/app/[locale]/_components/community/community.module.css@@ -14,7 +14,7 @@hsla(var(--background) / 0.95) 33%,hsl(var(--background)) 50%),- url('../../../assets/images/background_pattern.webp');+ url('../../../../assets/images/background_pattern.webp');background-size: cover;background-position-y: top;background-position-x: center;@@ -50,7 +50,7 @@hsla(var(--background) / 0.95) 15%,hsl(var(--background)) 30%),- url('../../../assets/images/background_pattern.webp');+ url('../../../../assets/images/background_pattern.webp');background-size: 1800px;background-position-y: top;diff --git a/apps/web/src/app/_components/community/community.tsx b/apps/web/src/app/[locale]/_components/community/community.tsxsimilarity index 99%rename from apps/web/src/app/_components/community/community.tsxrename to apps/web/src/app/[locale]/_components/community/community.tsxindex 5344fec9..5f16148c 100644--- a/apps/web/src/app/_components/community/community.tsx+++ b/apps/web/src/app/[locale]/_components/community/community.tsx@@ -4,7 +4,7 @@ import { GitBranch } from '@repo/ui/icons';import { clsx } from 'clsx';import { type CSSProperties } from 'react';import { useInView } from 'react-intersection-observer';-import { contributors } from '../../../../public/contributors';+import { contributors } from '../../../../../public/contributors';import styles from './community.module.css';import Image from 'next/image';diff --git a/apps/web/src/app/_components/feature-card.tsx b/apps/web/src/app/[locale]/_components/feature-card.tsxsimilarity index 99%rename from apps/web/src/app/_components/feature-card.tsxrename to apps/web/src/app/[locale]/_components/feature-card.tsxindex 3c7dc8c5..bd456a40 100644--- a/apps/web/src/app/_components/feature-card.tsx+++ b/apps/web/src/app/[locale]/_components/feature-card.tsx@@ -16,9 +16,9 @@ import Image, { type StaticImageData } from 'next/image';import { useEffect, useState, type MouseEvent } from 'react';import { useInView } from 'react-intersection-observer';import { z } from 'zod';-import { TrackChallenge } from '~/app/tracks/_components/track-challenge-card';import { Steps } from '~/components/wizard/Steps';import { useIsMobile } from '~/utils/useIsMobile';+import { TrackChallenge } from '../tracks/_components/track-challenge-card';type WrapperStyle = MotionStyle & {'--x': MotionValue<string>;diff --git a/apps/web/src/app/_components/features.tsx b/apps/web/src/app/[locale]/_components/features.tsxsimilarity index 100%rename from apps/web/src/app/_components/features.tsxrename to apps/web/src/app/[locale]/_components/features.tsxdiff --git a/apps/web/src/app/_components/hero-challenge-card.tsx b/apps/web/src/app/[locale]/_components/hero-challenge-card.tsxsimilarity index 100%rename from apps/web/src/app/_components/hero-challenge-card.tsxrename to apps/web/src/app/[locale]/_components/hero-challenge-card.tsxdiff --git a/apps/web/src/app/_components/hero-illustration.tsx b/apps/web/src/app/[locale]/_components/hero-illustration.tsxsimilarity index 100%rename from apps/web/src/app/_components/hero-illustration.tsxrename to apps/web/src/app/[locale]/_components/hero-illustration.tsxdiff --git a/apps/web/src/app/_components/hero.tsx b/apps/web/src/app/[locale]/_components/hero.tsxsimilarity index 93%rename from apps/web/src/app/_components/hero.tsxrename to apps/web/src/app/[locale]/_components/hero.tsxindex c799bcc1..a439bf83 100644--- a/apps/web/src/app/_components/hero.tsx+++ b/apps/web/src/app/[locale]/_components/hero.tsx@@ -3,6 +3,7 @@ import Link from 'next/link';import { Balancer } from 'react-wrap-balancer';import { Button } from '@repo/ui';import { HeroIllustration } from './hero-illustration';+import { getScopedI18n } from '~/locales/server';function TypeHeroLogo() {return (@@ -30,7 +31,9 @@ function TypeHeroLogo() {);}-function Hero() {+async function Hero() {+ const t = await getScopedI18n('landing.hero');+return (<section className="-mt-[56px] min-h-[calc(100vh)] overflow-hidden lg:min-h-0 lg:pt-[56px]"><div className="container grid min-h-screen items-center justify-center lg:min-h-0 lg:grid-cols-2">@@ -47,10 +50,7 @@ function Hero() {</div><p className="max-w-[55ch] bg-transparent px-8 text-center font-medium leading-8 text-black/60 dark:text-white/50 lg:px-0 lg:text-left">- <Balancer>- Connect, collaborate, and grow with a community of TypeScript developers. Elevate your- skills through interactive coding challenges, discussions, and knowledge sharing- </Balancer>+ <Balancer>{t('description')}</Balancer></p><div className="flex flex-col gap-3 md:flex-row"><Button@@ -60,7 +60,7 @@ function Hero() {<Link href="/waitlist"><span className="inline-flex h-full w-fit items-center gap-1 rounded-[10px] bg-white px-4 py-2 text-[#3178c6] transition-all duration-300"><Mail className="mr-1 h-4 w-4 stroke-[3]" />- Join the Waitlist+ {t('buttons.waitlist')}</span></Link></Button>@@ -71,7 +71,7 @@ function Hero() {<Link href="/waitlist"><span className="inline-flex h-full w-fit items-center gap-1 rounded-xl px-4 py-2 transition-all duration-300 dark:bg-neutral-900 dark:text-white group-hover:dark:bg-black"><Mail className="mr-1 h-4 w-4 stroke-[3]" />- Join the Waitlist+ {t('buttons.waitlist')}</span></Link></Button>diff --git a/apps/web/src/app/_components/waitlist-banner.tsx b/apps/web/src/app/[locale]/_components/waitlist-banner.tsxsimilarity index 100%rename from apps/web/src/app/_components/waitlist-banner.tsxrename to apps/web/src/app/[locale]/_components/waitlist-banner.tsxdiff --git a/apps/web/src/app/_components/waitlist.module.css b/apps/web/src/app/[locale]/_components/waitlist.module.csssimilarity index 94%rename from apps/web/src/app/_components/waitlist.module.cssrename to apps/web/src/app/[locale]/_components/waitlist.module.cssindex adc18965..9ef9be16 100644--- a/apps/web/src/app/_components/waitlist.module.css+++ b/apps/web/src/app/[locale]/_components/waitlist.module.css@@ -13,7 +13,7 @@rgba(59, 131, 199, 0.17) 75.5%,rgba(49, 120, 198, 0.3) 100%),- url('../../assets/images/background_pattern.webp');+ url('../../../assets/images/background_pattern.webp');background-size: cover;background-position-x: center;background-repeat: no-repeat;diff --git a/apps/web/src/app/challenge/.vercel.approvers b/apps/web/src/app/[locale]/challenge/.vercel.approverssimilarity index 100%rename from apps/web/src/app/challenge/.vercel.approversrename to apps/web/src/app/[locale]/challenge/.vercel.approversdiff --git a/apps/web/src/app/challenge/[id]/getChallengeRouteData.ts b/apps/web/src/app/[locale]/challenge/[id]/getChallengeRouteData.tssimilarity index 100%rename from apps/web/src/app/challenge/[id]/getChallengeRouteData.tsrename to apps/web/src/app/[locale]/challenge/[id]/getChallengeRouteData.tsdiff --git a/apps/web/src/app/challenge/[id]/layout.tsx b/apps/web/src/app/[locale]/challenge/[id]/layout.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/layout.tsxrename to apps/web/src/app/[locale]/challenge/[id]/layout.tsxdiff --git a/apps/web/src/app/challenge/[id]/left-wrapper.tsx b/apps/web/src/app/[locale]/challenge/[id]/left-wrapper.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/left-wrapper.tsxrename to apps/web/src/app/[locale]/challenge/[id]/left-wrapper.tsxdiff --git a/apps/web/src/app/challenge/[id]/loading.tsx b/apps/web/src/app/[locale]/challenge/[id]/loading.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/loading.tsxrename to apps/web/src/app/[locale]/challenge/[id]/loading.tsxdiff --git a/apps/web/src/app/challenge/[id]/page.tsx b/apps/web/src/app/[locale]/challenge/[id]/page.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/page.tsxrename to apps/web/src/app/[locale]/challenge/[id]/page.tsxdiff --git a/apps/web/src/app/challenge/[id]/solutions/[solutionId]/page.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/[solutionId]/page.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/solutions/[solutionId]/page.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/[solutionId]/page.tsxdiff --git a/apps/web/src/app/challenge/[id]/solutions/_components/index.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/index.tsxsimilarity index 97%rename from apps/web/src/app/challenge/[id]/solutions/_components/index.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/_components/index.tsxindex 048b6fbd..90cb8664 100644--- a/apps/web/src/app/challenge/[id]/solutions/_components/index.tsx+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/index.tsx@@ -7,7 +7,7 @@ import { Button } from '@repo/ui';import { SolutionEditor } from './solution-editor';import NoSolutions from './nosolutions';import SubmitSolution from './submit-solution';-import type { ChallengeSolutionsRouteData } from '~/app/challenge/[id]/solutions/page';+import type { ChallengeSolutionsRouteData } from '~/app/[locale]/challenge/[id]/solutions/page';import { getRelativeTime } from '~/utils/relativeTime';interface Props {diff --git a/apps/web/src/app/challenge/[id]/solutions/_components/nosolutions.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/nosolutions.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/solutions/_components/nosolutions.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/_components/nosolutions.tsxdiff --git a/apps/web/src/app/challenge/[id]/solutions/_components/post-solution.action.ts b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/post-solution.action.tssimilarity index 100%rename from apps/web/src/app/challenge/[id]/solutions/_components/post-solution.action.tsrename to apps/web/src/app/[locale]/challenge/[id]/solutions/_components/post-solution.action.tsdiff --git a/apps/web/src/app/challenge/[id]/solutions/_components/solution-detail.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-detail.tsxsimilarity index 95%rename from apps/web/src/app/challenge/[id]/solutions/_components/solution-detail.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-detail.tsxindex 45b28f14..a9cc0bb5 100644--- a/apps/web/src/app/challenge/[id]/solutions/_components/solution-detail.tsx+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-detail.tsx@@ -16,8 +16,8 @@ import {TooltipTrigger,Markdown,} from '@repo/ui';-import { Comments } from '~/app/challenge/_components/comments';-import type { ChallengeSolution } from '~/app/challenge/[id]/solutions/[solutionId]/page';+import { Comments } from '~/app/[locale]/challenge/_components/comments';+import type { ChallengeSolution } from '~/app/[locale]/challenge/[id]/solutions/[solutionId]/page';import { ReportDialog } from '~/components/ReportDialog';interface Props {diff --git a/apps/web/src/app/challenge/[id]/solutions/_components/solution-editor.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsxsimilarity index 97%rename from apps/web/src/app/challenge/[id]/solutions/_components/solution-editor.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsxindex 9651b99f..6e55eacc 100644--- a/apps/web/src/app/challenge/[id]/solutions/_components/solution-editor.tsx+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx@@ -16,7 +16,7 @@ import {} from '@repo/ui';import { postSolution } from './post-solution.action';import { RichMarkdownEditor } from '~/components/ui/rich-markdown-editor';-import type { ChallengeSolutionsRouteData } from '~/app/challenge/[id]/solutions/page';+import type { ChallengeSolutionsRouteData } from '~/app/[locale]/challenge/[id]/solutions/page';const getDefaultMarkdown = (solution: string) => `## Thoughtsdiff --git a/apps/web/src/app/challenge/[id]/solutions/_components/solution-skeleton.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-skeleton.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/solutions/_components/solution-skeleton.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-skeleton.tsxdiff --git a/apps/web/src/app/challenge/[id]/solutions/_components/submit-solution.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/submit-solution.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/solutions/_components/submit-solution.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/_components/submit-solution.tsxdiff --git a/apps/web/src/app/challenge/[id]/solutions/loading.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/loading.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/solutions/loading.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/loading.tsxdiff --git a/apps/web/src/app/challenge/[id]/solutions/page.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/page.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/solutions/page.tsxrename to apps/web/src/app/[locale]/challenge/[id]/solutions/page.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/[submissionId]/error.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/[submissionId]/error.tsxrename to apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/[submissionId]/page.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/page.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/[submissionId]/page.tsxrename to apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/page.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/_components/index.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/index.tsxsimilarity index 97%rename from apps/web/src/app/challenge/[id]/submissions/_components/index.tsxrename to apps/web/src/app/[locale]/challenge/[id]/submissions/_components/index.tsxindex 046f2e2b..19c0206c 100644--- a/apps/web/src/app/challenge/[id]/submissions/_components/index.tsx+++ b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/index.tsx@@ -5,7 +5,7 @@ import clsx from 'clsx';import Link from 'next/link';import { useMemo, useState } from 'react';import NoSubmissions from './nosubmissions';-import type { ChallengeSubmissions } from '~/app/challenge/[id]/submissions/getChallengeSubmissions';+import type { ChallengeSubmissions } from '~/app/[locale]/challenge/[id]/submissions/getChallengeSubmissions';import { getRelativeTime } from '~/utils/relativeTime';interface Props {diff --git a/apps/web/src/app/challenge/[id]/submissions/_components/nosubmissions.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/nosubmissions.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/_components/nosubmissions.tsxrename to apps/web/src/app/[locale]/challenge/[id]/submissions/_components/nosubmissions.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/_components/overview.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/_components/overview.tsxrename to apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/_components/submissions-skeleton.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/submissions-skeleton.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/_components/submissions-skeleton.tsxrename to apps/web/src/app/[locale]/challenge/[id]/submissions/_components/submissions-skeleton.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/getChallengeSubmissions.ts b/apps/web/src/app/[locale]/challenge/[id]/submissions/getChallengeSubmissions.tssimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/getChallengeSubmissions.tsrename to apps/web/src/app/[locale]/challenge/[id]/submissions/getChallengeSubmissions.tsdiff --git a/apps/web/src/app/challenge/[id]/submissions/loading.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/loading.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/loading.tsxrename to apps/web/src/app/[locale]/challenge/[id]/submissions/loading.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/page.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/page.tsxsimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/page.tsxrename to apps/web/src/app/[locale]/challenge/[id]/submissions/page.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/save-submission.action.ts b/apps/web/src/app/[locale]/challenge/[id]/submissions/save-submission.action.tssimilarity index 100%rename from apps/web/src/app/challenge/[id]/submissions/save-submission.action.tsrename to apps/web/src/app/[locale]/challenge/[id]/submissions/save-submission.action.tsdiff --git a/apps/web/src/app/challenge/[id]/wrapper.tsx b/apps/web/src/app/[locale]/challenge/[id]/wrapper.tsxsimilarity index 94%rename from apps/web/src/app/challenge/[id]/wrapper.tsxrename to apps/web/src/app/[locale]/challenge/[id]/wrapper.tsxindex 2e4bb871..c67dfcbc 100644--- a/apps/web/src/app/challenge/[id]/wrapper.tsx+++ b/apps/web/src/app/[locale]/challenge/[id]/wrapper.tsx@@ -2,13 +2,13 @@import { useSelectedLayoutSegments } from 'next/navigation';import { CodePanel } from '@repo/monaco';import { useSession } from '@repo/auth/react';-import { SettingsButton } from '../_components/editor-settings/editor-settings-button';import type { ChallengeRouteData } from './getChallengeRouteData';import { SubmissionOverview } from './submissions/_components/overview';import { saveSubmission } from './submissions/save-submission.action';import { FullscreenButton } from '../_components/fullscreen';import { ResetEditorButton } from '../_components/reset-editor-button';import { EditorShortcutsButton } from '../_components/editor-shortcuts/editor-shortcuts-button';+import { SettingsButton } from '../_components/settings/settings-button';export function Wrapper({ challenge }: { challenge: ChallengeRouteData }) {const segments = useSelectedLayoutSegments();diff --git a/apps/web/src/app/challenge/_components/bookmark.action.ts b/apps/web/src/app/[locale]/challenge/_components/bookmark.action.tssimilarity index 100%rename from apps/web/src/app/challenge/_components/bookmark.action.tsrename to apps/web/src/app/[locale]/challenge/_components/bookmark.action.tsdiff --git a/apps/web/src/app/challenge/_components/challenge-layout.tsx b/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/challenge-layout.tsxrename to apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsxdiff --git a/apps/web/src/app/challenge/_components/challenge-store.ts b/apps/web/src/app/[locale]/challenge/_components/challenge-store.tssimilarity index 100%rename from apps/web/src/app/challenge/_components/challenge-store.tsrename to apps/web/src/app/[locale]/challenge/_components/challenge-store.tsdiff --git a/apps/web/src/app/challenge/_components/comments/comment-input.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/comment-input.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/comments/comment-input.tsxrename to apps/web/src/app/[locale]/challenge/_components/comments/comment-input.tsxdiff --git a/apps/web/src/app/challenge/_components/comments/comment-skeleton.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/comment-skeleton.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/comments/comment-skeleton.tsxrename to apps/web/src/app/[locale]/challenge/_components/comments/comment-skeleton.tsxdiff --git a/apps/web/src/app/challenge/_components/comments/comment.action.ts b/apps/web/src/app/[locale]/challenge/_components/comments/comment.action.tssimilarity index 100%rename from apps/web/src/app/challenge/_components/comments/comment.action.tsrename to apps/web/src/app/[locale]/challenge/_components/comments/comment.action.tsdiff --git a/apps/web/src/app/challenge/_components/comments/comment.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/comments/comment.tsxrename to apps/web/src/app/[locale]/challenge/_components/comments/comment.tsxdiff --git a/apps/web/src/app/challenge/_components/comments/delete/index.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/comments/delete/index.tsxrename to apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsxdiff --git a/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts b/apps/web/src/app/[locale]/challenge/_components/comments/getCommentRouteData.tssimilarity index 100%rename from apps/web/src/app/challenge/_components/comments/getCommentRouteData.tsrename to apps/web/src/app/[locale]/challenge/_components/comments/getCommentRouteData.tsdiff --git a/apps/web/src/app/challenge/_components/comments/index.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/index.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/comments/index.tsxrename to apps/web/src/app/[locale]/challenge/_components/comments/index.tsxdiff --git a/apps/web/src/app/challenge/_components/comments/nocomments.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/nocomments.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/comments/nocomments.tsxrename to apps/web/src/app/[locale]/challenge/_components/comments/nocomments.tsxdiff --git a/apps/web/src/app/challenge/_components/description/description-skeleton.tsx b/apps/web/src/app/[locale]/challenge/_components/description/description-skeleton.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/description/description-skeleton.tsxrename to apps/web/src/app/[locale]/challenge/_components/description/description-skeleton.tsxdiff --git a/apps/web/src/app/challenge/_components/description/index.tsx b/apps/web/src/app/[locale]/challenge/_components/description/index.tsxsimilarity index 98%rename from apps/web/src/app/challenge/_components/description/index.tsxrename to apps/web/src/app/[locale]/challenge/_components/description/index.tsxindex 8a49c4fa..ab3855bf 100644--- a/apps/web/src/app/challenge/_components/description/index.tsx+++ b/apps/web/src/app/[locale]/challenge/_components/description/index.tsx@@ -21,7 +21,7 @@ import { clsx } from 'clsx';import { debounce } from 'lodash';import Link from 'next/link';import { useRef, useState } from 'react';-import { type ChallengeRouteData } from '~/app/challenge/[id]/getChallengeRouteData';+import { type ChallengeRouteData } from '~/app/[locale]/challenge/[id]/getChallengeRouteData';import { ReportDialog } from '~/components/ReportDialog';import { getRelativeTime } from '~/utils/relativeTime';import { addOrRemoveBookmark } from '../bookmark.action';diff --git a/apps/web/src/app/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx b/apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsxrename to apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsxdiff --git a/apps/web/src/app/challenge/_components/editor-shortcuts/editor-shortcuts-form.tsx b/apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-form.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/editor-shortcuts/editor-shortcuts-form.tsxrename to apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-form.tsxdiff --git a/apps/web/src/app/challenge/_components/fullscreen.tsx b/apps/web/src/app/[locale]/challenge/_components/fullscreen.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/fullscreen.tsxrename to apps/web/src/app/[locale]/challenge/_components/fullscreen.tsxdiff --git a/apps/web/src/app/challenge/_components/left-panel-skeleton.tsx b/apps/web/src/app/[locale]/challenge/_components/left-panel-skeleton.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/left-panel-skeleton.tsxrename to apps/web/src/app/[locale]/challenge/_components/left-panel-skeleton.tsxdiff --git a/apps/web/src/app/challenge/_components/reset-editor-button.tsx b/apps/web/src/app/[locale]/challenge/_components/reset-editor-button.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/reset-editor-button.tsxrename to apps/web/src/app/[locale]/challenge/_components/reset-editor-button.tsxdiff --git a/apps/web/src/app/challenge/_components/editor-settings/editor-settings-button.tsx b/apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsxsimilarity index 95%rename from apps/web/src/app/challenge/_components/editor-settings/editor-settings-button.tsxrename to apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsxindex 96843abe..7b75fc0c 100644--- a/apps/web/src/app/challenge/_components/editor-settings/editor-settings-button.tsx+++ b/apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsx@@ -9,7 +9,7 @@ import {TooltipTrigger,} from '@repo/ui';import { Settings } from '@repo/ui/icons';-import { SettingsForm } from './editor-settings-form';+import { SettingsForm } from './settings-form';export function SettingsButton() {return (diff --git a/apps/web/src/app/challenge/_components/editor-settings/editor-settings-form.tsx b/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/editor-settings/editor-settings-form.tsxrename to apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsxdiff --git a/apps/web/src/app/challenge/_components/share-form.tsx b/apps/web/src/app/[locale]/challenge/_components/share-form.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/share-form.tsxrename to apps/web/src/app/[locale]/challenge/_components/share-form.tsxdiff --git a/apps/web/src/app/challenge/_components/vote.tsx b/apps/web/src/app/[locale]/challenge/_components/vote.tsxsimilarity index 100%rename from apps/web/src/app/challenge/_components/vote.tsxrename to apps/web/src/app/[locale]/challenge/_components/vote.tsxdiff --git a/apps/web/src/app/challenge/error.tsx b/apps/web/src/app/[locale]/challenge/error.tsxsimilarity index 100%rename from apps/web/src/app/challenge/error.tsxrename to apps/web/src/app/[locale]/challenge/error.tsxdiff --git a/apps/web/src/app/challenge/increment.action.ts b/apps/web/src/app/[locale]/challenge/increment.action.tssimilarity index 100%rename from apps/web/src/app/challenge/increment.action.tsrename to apps/web/src/app/[locale]/challenge/increment.action.tsdiff --git a/apps/web/src/app/explore/[slug]/page.tsx b/apps/web/src/app/[locale]/explore/[slug]/page.tsxsimilarity index 100%rename from apps/web/src/app/explore/[slug]/page.tsxrename to apps/web/src/app/[locale]/explore/[slug]/page.tsxdiff --git a/apps/web/src/app/explore/_components/explore-card-skeleton.tsx b/apps/web/src/app/[locale]/explore/_components/explore-card-skeleton.tsxsimilarity index 100%rename from apps/web/src/app/explore/_components/explore-card-skeleton.tsxrename to apps/web/src/app/[locale]/explore/_components/explore-card-skeleton.tsxdiff --git a/apps/web/src/app/explore/_components/explore-card.tsx b/apps/web/src/app/[locale]/explore/_components/explore-card.tsxsimilarity index 100%rename from apps/web/src/app/explore/_components/explore-card.tsxrename to apps/web/src/app/[locale]/explore/_components/explore-card.tsxdiff --git a/apps/web/src/app/explore/_components/explore-section-skeleton.tsx b/apps/web/src/app/[locale]/explore/_components/explore-section-skeleton.tsxsimilarity index 100%rename from apps/web/src/app/explore/_components/explore-section-skeleton.tsxrename to apps/web/src/app/[locale]/explore/_components/explore-section-skeleton.tsxdiff --git a/apps/web/src/app/explore/_components/explore-section.tsx b/apps/web/src/app/[locale]/explore/_components/explore-section.tsxsimilarity index 100%rename from apps/web/src/app/explore/_components/explore-section.tsxrename to apps/web/src/app/[locale]/explore/_components/explore-section.tsxdiff --git a/apps/web/src/app/explore/_components/explore-slug-skeleton.tsx b/apps/web/src/app/[locale]/explore/_components/explore-slug-skeleton.tsxsimilarity index 100%rename from apps/web/src/app/explore/_components/explore-slug-skeleton.tsxrename to apps/web/src/app/[locale]/explore/_components/explore-slug-skeleton.tsxdiff --git a/apps/web/src/app/explore/_components/explore-slug.tsx b/apps/web/src/app/[locale]/explore/_components/explore-slug.tsxsimilarity index 100%rename from apps/web/src/app/explore/_components/explore-slug.tsxrename to apps/web/src/app/[locale]/explore/_components/explore-slug.tsxdiff --git a/apps/web/src/app/explore/_components/explore.action.ts b/apps/web/src/app/[locale]/explore/_components/explore.action.tssimilarity index 100%rename from apps/web/src/app/explore/_components/explore.action.tsrename to apps/web/src/app/[locale]/explore/_components/explore.action.tsdiff --git a/apps/web/src/app/explore/_components/index.tsx b/apps/web/src/app/[locale]/explore/_components/index.tsxsimilarity index 100%rename from apps/web/src/app/explore/_components/index.tsxrename to apps/web/src/app/[locale]/explore/_components/index.tsxdiff --git a/apps/web/src/app/explore/_components/view-more-button.tsx b/apps/web/src/app/[locale]/explore/_components/view-more-button.tsxsimilarity index 100%rename from apps/web/src/app/explore/_components/view-more-button.tsxrename to apps/web/src/app/[locale]/explore/_components/view-more-button.tsxdiff --git a/apps/web/src/app/explore/error.tsx b/apps/web/src/app/[locale]/explore/error.tsxsimilarity index 100%rename from apps/web/src/app/explore/error.tsxrename to apps/web/src/app/[locale]/explore/error.tsxdiff --git a/apps/web/src/app/explore/page.tsx b/apps/web/src/app/[locale]/explore/page.tsxsimilarity index 100%rename from apps/web/src/app/explore/page.tsxrename to apps/web/src/app/[locale]/explore/page.tsxdiff --git a/apps/web/src/app/[locale]/feature-flag-provider.tsx b/apps/web/src/app/[locale]/feature-flag-provider.tsxnew file mode 100644index 00000000..02f82aef--- /dev/null+++ b/apps/web/src/app/[locale]/feature-flag-provider.tsx@@ -0,0 +1,29 @@+import { useQuery } from '@tanstack/react-query';+import { createContext, type ReactNode } from 'react';++export const FeatureFlagContext = createContext<Record<string, boolean>>({});++interface Props {+ children: ReactNode;+}++const mockFlags = {+ loginButton: true,+ exploreButton: true,+ tracksButton: true,+};++const isProd = process.env.NODE_ENV === 'production';+export function FeatureFlagProvider({ children }: Props) {+ const { data: featureFlags } = useQuery(['featureFlags'], () => getFeatureFlags());++ return <FeatureFlagContext.Provider value={featureFlags}>{children}</FeatureFlagContext.Provider>;+}++async function getFeatureFlags() {+ if (isProd) {+ return fetch('/api/flags').then((res) => res.json());+ }++ return mockFlags;+}diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/[locale]/page.tsxsimilarity index 100%rename from apps/web/src/app/page.tsxrename to apps/web/src/app/[locale]/page.tsxdiff --git a/apps/web/src/app/settings/error.tsx b/apps/web/src/app/[locale]/settings/error.tsxsimilarity index 100%rename from apps/web/src/app/settings/error.tsxrename to apps/web/src/app/[locale]/settings/error.tsxdiff --git a/apps/web/src/app/settings/page.tsx b/apps/web/src/app/[locale]/settings/page.tsxsimilarity index 100%rename from apps/web/src/app/settings/page.tsxrename to apps/web/src/app/[locale]/settings/page.tsxdiff --git a/apps/web/src/app/tracks/[slug]/page.tsx b/apps/web/src/app/[locale]/tracks/[slug]/page.tsxsimilarity index 100%rename from apps/web/src/app/tracks/[slug]/page.tsxrename to apps/web/src/app/[locale]/tracks/[slug]/page.tsxdiff --git a/apps/web/src/app/tracks/_components/enroll-button.tsx b/apps/web/src/app/[locale]/tracks/_components/enroll-button.tsxsimilarity index 100%rename from apps/web/src/app/tracks/_components/enroll-button.tsxrename to apps/web/src/app/[locale]/tracks/_components/enroll-button.tsxdiff --git a/apps/web/src/app/tracks/_components/index.tsx b/apps/web/src/app/[locale]/tracks/_components/index.tsxsimilarity index 100%rename from apps/web/src/app/tracks/_components/index.tsxrename to apps/web/src/app/[locale]/tracks/_components/index.tsxdiff --git a/apps/web/src/app/tracks/_components/personal-track-card.tsx b/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsxsimilarity index 100%rename from apps/web/src/app/tracks/_components/personal-track-card.tsxrename to apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsxdiff --git a/apps/web/src/app/tracks/_components/track-card.tsx b/apps/web/src/app/[locale]/tracks/_components/track-card.tsxsimilarity index 100%rename from apps/web/src/app/tracks/_components/track-card.tsxrename to apps/web/src/app/[locale]/tracks/_components/track-card.tsxdiff --git a/apps/web/src/app/tracks/_components/track-challenge-card.tsx b/apps/web/src/app/[locale]/tracks/_components/track-challenge-card.tsxsimilarity index 100%rename from apps/web/src/app/tracks/_components/track-challenge-card.tsxrename to apps/web/src/app/[locale]/tracks/_components/track-challenge-card.tsxdiff --git a/apps/web/src/app/tracks/_components/track-details.tsx b/apps/web/src/app/[locale]/tracks/_components/track-details.tsxsimilarity index 100%rename from apps/web/src/app/tracks/_components/track-details.tsxrename to apps/web/src/app/[locale]/tracks/_components/track-details.tsxdiff --git a/apps/web/src/app/tracks/_components/track-enrolled-section.tsx b/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsxsimilarity index 100%rename from apps/web/src/app/tracks/_components/track-enrolled-section.tsxrename to apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsxdiff --git a/apps/web/src/app/tracks/_components/track-grid.tsx b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsxsimilarity index 92%rename from apps/web/src/app/tracks/_components/track-grid.tsxrename to apps/web/src/app/[locale]/tracks/_components/track-grid.tsxindex bfe0f8ef..efa91c6c 100644--- a/apps/web/src/app/tracks/_components/track-grid.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx@@ -1,5 +1,5 @@import { prisma } from '@repo/db';-import { TrackCard } from '~/app/tracks/_components/track-card';+import { TrackCard } from './track-card';export async function TrackGrid() {const tracks = await getTracks();diff --git a/apps/web/src/app/tracks/_components/track-progress.tsx b/apps/web/src/app/[locale]/tracks/_components/track-progress.tsxsimilarity index 100%rename from apps/web/src/app/tracks/_components/track-progress.tsxrename to apps/web/src/app/[locale]/tracks/_components/track-progress.tsxdiff --git a/apps/web/src/app/tracks/_components/track.action.ts b/apps/web/src/app/[locale]/tracks/_components/track.action.tssimilarity index 100%rename from apps/web/src/app/tracks/_components/track.action.tsrename to apps/web/src/app/[locale]/tracks/_components/track.action.tsdiff --git a/apps/web/src/app/tracks/page.tsx b/apps/web/src/app/[locale]/tracks/page.tsxsimilarity index 100%rename from apps/web/src/app/tracks/page.tsxrename to apps/web/src/app/[locale]/tracks/page.tsxdiff --git a/apps/web/src/app/waitlist/_components/create.action.ts b/apps/web/src/app/[locale]/waitlist/_components/create.action.tssimilarity index 100%rename from apps/web/src/app/waitlist/_components/create.action.tsrename to apps/web/src/app/[locale]/waitlist/_components/create.action.tsdiff --git a/apps/web/src/app/waitlist/_components/index.tsx b/apps/web/src/app/[locale]/waitlist/_components/index.tsxsimilarity index 100%rename from apps/web/src/app/waitlist/_components/index.tsxrename to apps/web/src/app/[locale]/waitlist/_components/index.tsxdiff --git a/apps/web/src/app/waitlist/_components/waitlist-form.tsx b/apps/web/src/app/[locale]/waitlist/_components/waitlist-form.tsxsimilarity index 100%rename from apps/web/src/app/waitlist/_components/waitlist-form.tsxrename to apps/web/src/app/[locale]/waitlist/_components/waitlist-form.tsxdiff --git a/apps/web/src/app/waitlist/_components/waitlist.module.css b/apps/web/src/app/[locale]/waitlist/_components/waitlist.module.csssimilarity index 90%rename from apps/web/src/app/waitlist/_components/waitlist.module.cssrename to apps/web/src/app/[locale]/waitlist/_components/waitlist.module.cssindex f60fc894..30353bb0 100644--- a/apps/web/src/app/waitlist/_components/waitlist.module.css+++ b/apps/web/src/app/[locale]/waitlist/_components/waitlist.module.css@@ -17,7 +17,7 @@}.mybg {- background: url('../../../assets/images/waitlist-bg.webp');+ background: url('../../../../assets/images/waitlist-bg.webp');background-position-y: 33%;background-position-x: center;background-repeat: no-repeat;diff --git a/apps/web/src/app/waitlist/page.tsx b/apps/web/src/app/[locale]/waitlist/page.tsxsimilarity index 100%rename from apps/web/src/app/waitlist/page.tsxrename to apps/web/src/app/[locale]/waitlist/page.tsxdiff --git a/apps/web/src/app/wizard/error.tsx b/apps/web/src/app/[locale]/wizard/error.tsxsimilarity index 100%rename from apps/web/src/app/wizard/error.tsxrename to apps/web/src/app/[locale]/wizard/error.tsxdiff --git a/apps/web/src/app/wizard/page.tsx b/apps/web/src/app/[locale]/wizard/page.tsxsimilarity index 100%rename from apps/web/src/app/wizard/page.tsxrename to apps/web/src/app/[locale]/wizard/page.tsxdiff --git a/apps/web/src/app/providers.tsx b/apps/web/src/app/providers.tsxindex 82802116..e7a6e879 100644--- a/apps/web/src/app/providers.tsx+++ b/apps/web/src/app/providers.tsx@@ -7,6 +7,8 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import { ThemeProvider } from 'next-themes';import React from 'react';import { FeatureFlagProvider } from './feature-flag-provider';+import { I18nProviderClient } from '~/locales/client';+import en from '~/locales/en';interface Props {children: React.ReactNode;@@ -22,7 +24,9 @@ export function Providers({ children }: Props) {<SessionProvider><ThemeProvider attribute="class"><FeatureFlagProvider>- <TooltipProvider>{children}</TooltipProvider>+ <TooltipProvider>+ <I18nProviderClient fallbackLocale={en}>{children}</I18nProviderClient>+ </TooltipProvider></FeatureFlagProvider>{shouldInjectToolbar ? <VercelToolbar /> : null}</ThemeProvider>diff --git a/apps/web/src/components/ui/navigation.tsx b/apps/web/src/components/ui/navigation.tsxindex 45af31fc..7c14b612 100644--- a/apps/web/src/components/ui/navigation.tsx+++ b/apps/web/src/components/ui/navigation.tsx@@ -17,7 +17,7 @@ import Link from 'next/link';import { usePathname, useRouter } from 'next/navigation';import { useContext, useEffect, useState } from 'react';import { FeatureFlagContext } from '~/app/feature-flag-provider';-import { useFullscreenSettingsStore } from '../../app/challenge/_components/fullscreen';+import { useFullscreenSettingsStore } from '../../app/[locale]/challenge/_components/fullscreen';export function getAdminUrl() {// reference for vercel.comdiff --git a/apps/web/src/components/wizard/ChallengeCardEditor.tsx b/apps/web/src/components/wizard/ChallengeCardEditor.tsxindex 71570e87..08800a76 100644--- a/apps/web/src/components/wizard/ChallengeCardEditor.tsx+++ b/apps/web/src/components/wizard/ChallengeCardEditor.tsx@@ -17,8 +17,8 @@ import {} from '@repo/ui';import { useWatch } from 'react-hook-form';import type { WizardForm } from '.';-import type { ExploreChallengeData } from '~/app/explore/_components/explore.action';-import ExploreCard from '~/app/explore/_components/explore-card';+import type { ExploreChallengeData } from '~/app/[locale]/explore/_components/explore.action';+import ExploreCard from '~/app/[locale]/explore/_components/explore-card';interface Props {form: WizardForm;diff --git a/apps/web/src/components/wizard/TestCasesEditor.tsx b/apps/web/src/components/wizard/TestCasesEditor.tsxindex aa2b5a50..fcb370b9 100644--- a/apps/web/src/components/wizard/TestCasesEditor.tsx+++ b/apps/web/src/components/wizard/TestCasesEditor.tsx@@ -8,7 +8,7 @@ import dynamic from 'next/dynamic';import { createTwoslashInlayProvider } from '@repo/monaco/twoslash';import { PrettierFormatProvider } from '@repo/monaco/prettier';import type { WizardForm } from '.';-import { SettingsButton } from '~/app/challenge/_components/editor-settings/editor-settings-button';+import { SettingsButton } from '~/app/[locale]/challenge/_components/settings/settings-button';const VimStatusBar = dynamic(() => import('@repo/monaco/vim-mode'), {ssr: false,diff --git a/apps/web/src/locales/client.ts b/apps/web/src/locales/client.tsnew file mode 100644index 00000000..1ecf45b6--- /dev/null+++ b/apps/web/src/locales/client.ts@@ -0,0 +1,5 @@+import { createI18nClient } from 'next-international/client';++export const { useI18n, useScopedI18n, I18nProviderClient } = createI18nClient({+ en: () => import('./en'),+});diff --git a/apps/web/src/locales/en.ts b/apps/web/src/locales/en.tsnew file mode 100644index 00000000..36dee81a--- /dev/null+++ b/apps/web/src/locales/en.ts@@ -0,0 +1,5 @@+export default {+ 'landing.hero.description':+ 'Connect, collaborate, and grow with a community of TypeScript developers. Elevate your skills through interactive coding challenges, discussions, and knowledge sharing',+ 'landing.hero.buttons.waitlist': 'Join the waitlist',+} as const;diff --git a/apps/web/src/locales/server.ts b/apps/web/src/locales/server.tsnew file mode 100644index 00000000..5d14a15c--- /dev/null+++ b/apps/web/src/locales/server.ts@@ -0,0 +1,5 @@+import { createI18nServer } from 'next-international/server';++export const { getI18n, getScopedI18n, getStaticParams } = createI18nServer({+ en: () => import('./en'),+});diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.tsindex 4eca1bc6..018be362 100644--- a/apps/web/src/middleware.ts+++ b/apps/web/src/middleware.ts@@ -1,11 +1,18 @@import { NextResponse, type NextRequest } from 'next/server';+import { createI18nMiddleware } from 'next-international/middleware';++const I18nMiddleware = createI18nMiddleware({+ locales: ['en'],+ defaultLocale: 'en',+ urlMappingStrategy: 'rewrite',+});export function middleware(req: NextRequest) {const { VERCEL_ENV: vercelEnv, STAGING: staging = false } = process.env;// skip blocking the request if local or preview or stagingif (!vercelEnv || staging) {- return NextResponse.next();+ return I18nMiddleware(req);}const path = req.nextUrl.pathname;@@ -15,5 +22,9 @@ export function middleware(req: NextRequest) {return NextResponse.redirect(new URL('/waitlist', req.url));}- return NextResponse.next();+ return I18nMiddleware(req);}++export const config = {+ matcher: ['/((?!api|static|.*\\..*|_next|favicon.ico|robots.txt).*)'],+};diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex f754fd29..3f8deb70 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -294,6 +294,9 @@ importers:next:specifier: ^13.4.19+ next-international:+ specifier: 1.0.0-rc.4+ version: 1.0.0-rc.4next-themes:specifier: ^0.2.1@@ -1559,7 +1562,7 @@ packages:eslint: ^6.0.0 || ^7.0.0 || >=8.0.0dependencies:eslint: 8.48.0- eslint-visitor-keys: 3.4.1+ eslint-visitor-keys: 3.4.3dev: true/@eslint-community/[email protected]:@@ -5185,7 +5188,7 @@ packages:dev: false- resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}+ resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}resolution: {integrity: sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==}@@ -7221,6 +7224,10 @@ packages:has: 1.0.3side-channel: 1.0.4+ resolution: {integrity: sha512-cJwagIBzMG0FTK81TABeSBU0eReIXWmvW18m/URn8ZA+GLoWIcdL43kfjArwHVmZJ1n+IFchsBj8tQLYUqmwnA==}+ dev: false+resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}engines: {node: '>= 0.10'}@@ -8333,6 +8340,14 @@ packages:dev: falsepatched: true+ resolution: {integrity: sha512-okY1xqSixMiRCfpSdt4or7Lup9pwVAITEC1rPdt/wfqkbK15gJwxbc087tYXiHzAlLaL9IszaUjHnJwBQnrISg==}+ dependencies:+ client-only: 0.0.1+ international-types: 0.8.0+ server-only: 0.0.1+ dev: false+resolution: {integrity: sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==}peerDependencies:@@ -9806,6 +9821,10 @@ packages:dependencies:randombytes: 2.1.0+ resolution: {integrity: sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==}+ dev: false+resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}dev: false