From b5c50728deb24d677764504d784a53440d99cc43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20LUDWIG?= Date: Wed, 31 Jul 2024 11:41:39 +0200 Subject: [PATCH] refactor: components struture --- apps/storybook/.storybook/preview.tsx | 2 +- apps/website/Dockerfile | 2 +- apps/website/app/[locale]/blog/page.tsx | 4 +- apps/website/app/[locale]/layout.tsx | 6 +- apps/website/app/[locale]/loading.tsx | 4 +- apps/website/app/[locale]/page.tsx | 14 ++-- apps/website/middleware.ts | 2 + package.json | 2 +- packages/blog/src/BlogPostComments.tsx | 2 +- packages/blog/src/BlogPostUI.tsx | 4 +- packages/blog/src/BlogPosts.tsx | 4 +- .../blog/src/stories/BlogPostUI.stories.tsx | 2 +- .../blog/src/stories/BlogPosts.stories.tsx | 2 +- packages/ui/package.json | 28 +++---- .../Button/Button.stories.tsx | 0 .../src/{design => Design}/Button/Button.tsx | 0 .../src/{design => Design}/Button/Ripple.tsx | 0 .../{design => Design}/Link/Link.stories.tsx | 0 .../ui/src/{design => Design}/Link/Link.tsx | 0 .../Spinner/Spinner.stories.tsx | 0 .../{design => Design}/Spinner/Spinner.tsx | 0 .../Typography/Typography.stories.tsx | 0 .../Typography/Typography.tsx | 0 .../Errors/ErrorNotFound/ErrorNotFound.tsx | 8 +- .../ui/src/Errors/ErrorServer/ErrorServer.tsx | 8 +- .../ui/src/{ => Home}/About/About.stories.tsx | 2 +- packages/ui/src/{ => Home}/About/About.tsx | 2 +- .../src/{ => Home}/About/AboutDescription.tsx | 4 +- .../{ => Home}/About/AboutIntroduction.tsx | 2 +- .../{ => Home}/About/AboutList/AboutItem.tsx | 0 .../About/AboutList/AboutItemBirthDate.tsx | 0 .../{ => Home}/About/AboutList/AboutList.tsx | 0 .../ui/src/{ => Home}/About/AboutLogo.tsx | 0 .../SocialMediaIcons/EmailIcon.tsx | 0 .../SocialMediaIcons/GitHubIcon.tsx | 0 .../SocialMediaIcons/GitLabIcon.tsx | 0 .../SocialMediaList/SocialMediaIcons/Icon.tsx | 0 .../SocialMediaIcons/NPMIcon.tsx | 0 .../SocialMediaIcons/TwitchIcon.tsx | 0 .../SocialMediaIcons/TwitterIcon.tsx | 0 .../SocialMediaIcons/YouTubeIcon.tsx | 0 .../About/SocialMediaList/SocialMediaItem.tsx | 0 .../About/SocialMediaList/SocialMediaList.tsx | 0 .../src/{ => Home}/Interests/InterestItem.tsx | 2 +- .../Interests/Interests.stories.tsx | 2 +- .../ui/src/{ => Home}/Interests/Interests.tsx | 4 +- .../OpenSource/OpenSource.stories.tsx | 2 +- .../src/{ => Home}/OpenSource/OpenSource.tsx | 2 +- .../src/{ => Home}/OpenSource/Repository.tsx | 4 +- .../Portfolio/Portfolio.stories.tsx | 2 +- .../ui/src/{ => Home}/Portfolio/Portfolio.tsx | 2 +- .../{ => Home}/Portfolio/PortfolioItem.tsx | 4 +- .../ui/src/{ => Home}/Skills/SkillItem.tsx | 4 +- .../src/{ => Home}/Skills/Skills.stories.tsx | 2 +- packages/ui/src/{ => Home}/Skills/Skills.tsx | 2 +- .../src/{ => Home}/Skills/SkillsSection.tsx | 4 +- packages/ui/src/{ => Home}/Skills/skills.ts | 0 .../{ => Layout}/Footer/Footer.stories.tsx | 2 +- .../ui/src/{ => Layout}/Footer/Footer.tsx | 2 +- .../{ => Layout}/Header/Header.stories.tsx | 2 +- .../ui/src/{ => Layout}/Header/Header.tsx | 2 +- .../src/{ => Layout}/Header/Locales/Arrow.tsx | 0 .../Header/Locales/LocaleFlag.tsx | 0 .../{ => Layout}/Header/Locales/Locales.tsx | 0 .../src/{ => Layout}/Header/SwitchTheme.tsx | 0 .../{ => Layout}/MainLayout/MainLayout.tsx | 0 .../{design => Layout}/Section/RevealFade.tsx | 0 .../{design => Layout}/Section/Section.tsx | 4 +- packages/utils/src/dates.ts | 1 + packages/utils/src/strings.ts | 6 ++ pnpm-lock.yaml | 76 +++++++++---------- pnpm-workspace.yaml | 1 - 72 files changed, 122 insertions(+), 114 deletions(-) rename packages/ui/src/{design => Design}/Button/Button.stories.tsx (100%) rename packages/ui/src/{design => Design}/Button/Button.tsx (100%) rename packages/ui/src/{design => Design}/Button/Ripple.tsx (100%) rename packages/ui/src/{design => Design}/Link/Link.stories.tsx (100%) rename packages/ui/src/{design => Design}/Link/Link.tsx (100%) rename packages/ui/src/{design => Design}/Spinner/Spinner.stories.tsx (100%) rename packages/ui/src/{design => Design}/Spinner/Spinner.tsx (100%) rename packages/ui/src/{design => Design}/Typography/Typography.stories.tsx (100%) rename packages/ui/src/{design => Design}/Typography/Typography.tsx (100%) rename packages/ui/src/{ => Home}/About/About.stories.tsx (91%) rename packages/ui/src/{ => Home}/About/About.tsx (91%) rename packages/ui/src/{ => Home}/About/AboutDescription.tsx (82%) rename packages/ui/src/{ => Home}/About/AboutIntroduction.tsx (88%) rename packages/ui/src/{ => Home}/About/AboutList/AboutItem.tsx (100%) rename packages/ui/src/{ => Home}/About/AboutList/AboutItemBirthDate.tsx (100%) rename packages/ui/src/{ => Home}/About/AboutList/AboutList.tsx (100%) rename packages/ui/src/{ => Home}/About/AboutLogo.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaIcons/EmailIcon.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaIcons/GitHubIcon.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaIcons/GitLabIcon.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaIcons/Icon.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaIcons/NPMIcon.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaIcons/TwitchIcon.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaIcons/TwitterIcon.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaIcons/YouTubeIcon.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaItem.tsx (100%) rename packages/ui/src/{ => Home}/About/SocialMediaList/SocialMediaList.tsx (100%) rename packages/ui/src/{ => Home}/Interests/InterestItem.tsx (88%) rename packages/ui/src/{ => Home}/Interests/Interests.stories.tsx (91%) rename packages/ui/src/{ => Home}/Interests/Interests.tsx (95%) rename packages/ui/src/{ => Home}/OpenSource/OpenSource.stories.tsx (91%) rename packages/ui/src/{ => Home}/OpenSource/OpenSource.tsx (97%) rename packages/ui/src/{ => Home}/OpenSource/Repository.tsx (87%) rename packages/ui/src/{ => Home}/Portfolio/Portfolio.stories.tsx (91%) rename packages/ui/src/{ => Home}/Portfolio/Portfolio.tsx (94%) rename packages/ui/src/{ => Home}/Portfolio/PortfolioItem.tsx (91%) rename packages/ui/src/{ => Home}/Skills/SkillItem.tsx (91%) rename packages/ui/src/{ => Home}/Skills/Skills.stories.tsx (91%) rename packages/ui/src/{ => Home}/Skills/Skills.tsx (95%) rename packages/ui/src/{ => Home}/Skills/SkillsSection.tsx (83%) rename packages/ui/src/{ => Home}/Skills/skills.ts (100%) rename packages/ui/src/{ => Layout}/Footer/Footer.stories.tsx (90%) rename packages/ui/src/{ => Layout}/Footer/Footer.tsx (94%) rename packages/ui/src/{ => Layout}/Header/Header.stories.tsx (89%) rename packages/ui/src/{ => Layout}/Header/Header.tsx (96%) rename packages/ui/src/{ => Layout}/Header/Locales/Arrow.tsx (100%) rename packages/ui/src/{ => Layout}/Header/Locales/LocaleFlag.tsx (100%) rename packages/ui/src/{ => Layout}/Header/Locales/Locales.tsx (100%) rename packages/ui/src/{ => Layout}/Header/SwitchTheme.tsx (100%) rename packages/ui/src/{ => Layout}/MainLayout/MainLayout.tsx (100%) rename packages/ui/src/{design => Layout}/Section/RevealFade.tsx (100%) rename packages/ui/src/{design => Layout}/Section/Section.tsx (93%) diff --git a/apps/storybook/.storybook/preview.tsx b/apps/storybook/.storybook/preview.tsx index 1c2d4cf..54777fa 100644 --- a/apps/storybook/.storybook/preview.tsx +++ b/apps/storybook/.storybook/preview.tsx @@ -13,7 +13,7 @@ const preview: Preview = { }, options: { storySort: { - order: ["Design System", "User Interface", "Errors", "Feature"], + order: ["Design System", "Layout", "Errors"], }, }, backgrounds: { disable: true }, diff --git a/apps/website/Dockerfile b/apps/website/Dockerfile index abcaf7c..899c8ef 100644 --- a/apps/website/Dockerfile +++ b/apps/website/Dockerfile @@ -5,7 +5,7 @@ RUN corepack enable WORKDIR /usr/src/app FROM node-pnpm AS builder -RUN pnpm install --global turbo@2.0.9 +RUN pnpm install --global turbo@2.0.10 COPY ./ ./ RUN turbo prune @repo/website --docker diff --git a/apps/website/app/[locale]/blog/page.tsx b/apps/website/app/[locale]/blog/page.tsx index 354b5db..5dae27a 100644 --- a/apps/website/app/[locale]/blog/page.tsx +++ b/apps/website/app/[locale]/blog/page.tsx @@ -1,12 +1,12 @@ import { getBlogPosts } from "@repo/blog" import { BlogPosts } from "@repo/blog/BlogPosts" import { LOCALE_DEFAULT, type LocaleProps } from "@repo/i18n/config" +import { MainLayout } from "@repo/ui/Layout/MainLayout" import { Section, SectionDescription, SectionTitle, -} from "@repo/ui/design/Section" -import { MainLayout } from "@repo/ui/MainLayout" +} from "@repo/ui/Layout/Section" import type { Metadata } from "next" import { unstable_setRequestLocale } from "next-intl/server" diff --git a/apps/website/app/[locale]/layout.tsx b/apps/website/app/[locale]/layout.tsx index c2b825f..c1f75d9 100644 --- a/apps/website/app/[locale]/layout.tsx +++ b/apps/website/app/[locale]/layout.tsx @@ -1,9 +1,9 @@ import "@repo/config-tailwind/styles.css" import type { Locale, LocaleProps } from "@repo/i18n/config" import { LOCALES } from "@repo/i18n/config" -import { Footer } from "@repo/ui/Footer" -import { Header } from "@repo/ui/Header" -import { ThemeProvider } from "@repo/ui/Header/SwitchTheme" +import { Footer } from "@repo/ui/Layout/Footer" +import { Header } from "@repo/ui/Layout/Header" +import { ThemeProvider } from "@repo/ui/Layout/Header/SwitchTheme" import { VERSION } from "@repo/utils/constants" import type { Metadata } from "next" import { NextIntlClientProvider } from "next-intl" diff --git a/apps/website/app/[locale]/loading.tsx b/apps/website/app/[locale]/loading.tsx index 8cde0c9..57378e5 100644 --- a/apps/website/app/[locale]/loading.tsx +++ b/apps/website/app/[locale]/loading.tsx @@ -1,5 +1,5 @@ -import { MainLayout } from "@repo/ui/MainLayout" -import { Spinner } from "@repo/ui/design/Spinner" +import { Spinner } from "@repo/ui/Design/Spinner" +import { MainLayout } from "@repo/ui/Layout/MainLayout" const Loading: React.FC = () => { return ( diff --git a/apps/website/app/[locale]/page.tsx b/apps/website/app/[locale]/page.tsx index f1f307d..98c6d6c 100644 --- a/apps/website/app/[locale]/page.tsx +++ b/apps/website/app/[locale]/page.tsx @@ -1,11 +1,11 @@ import type { LocaleProps } from "@repo/i18n/config" -import { About } from "@repo/ui/About" -import { RevealFade } from "@repo/ui/design/Section" -import { Interests } from "@repo/ui/Interests" -import { MainLayout } from "@repo/ui/MainLayout" -import { OpenSource } from "@repo/ui/OpenSource" -import { Portfolio } from "@repo/ui/Portfolio" -import { Skills } from "@repo/ui/Skills" +import { About } from "@repo/ui/Home/About" +import { Interests } from "@repo/ui/Home/Interests" +import { OpenSource } from "@repo/ui/Home/OpenSource" +import { Portfolio } from "@repo/ui/Home/Portfolio" +import { Skills } from "@repo/ui/Home/Skills" +import { MainLayout } from "@repo/ui/Layout/MainLayout" +import { RevealFade } from "@repo/ui/Layout/Section" import { unstable_setRequestLocale } from "next-intl/server" interface HomePageProps extends LocaleProps {} diff --git a/apps/website/middleware.ts b/apps/website/middleware.ts index 755cdc9..e604e4f 100644 --- a/apps/website/middleware.ts +++ b/apps/website/middleware.ts @@ -14,6 +14,8 @@ export const config = { // Set a cookie to remember the previous locale for // all requests that have a locale prefix + // Next.js issue, middleware matcher should support template literals: + // https://github.com/vercel/next.js/issues/56398 "/(en-US|fr-FR)/:path*", // Enable redirects that add missing locales diff --git a/package.json b/package.json index 813f2aa..bb0ddcd 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "markdownlint-rule-relative-links": "3.0.0", "replace-in-files-cli": "3.0.0", "semantic-release": "23.1.1", - "turbo": "2.0.9", + "turbo": "2.0.10", "typescript": "catalog:" } } diff --git a/packages/blog/src/BlogPostComments.tsx b/packages/blog/src/BlogPostComments.tsx index b8d43cb..67ed00c 100644 --- a/packages/blog/src/BlogPostComments.tsx +++ b/packages/blog/src/BlogPostComments.tsx @@ -1,7 +1,7 @@ "use client" import Giscus from "@giscus/react" -import { useTheme } from "@repo/ui/Header/SwitchTheme" +import { useTheme } from "@repo/ui/Layout/Header/SwitchTheme" interface BlogPostCommentsProps {} diff --git a/packages/blog/src/BlogPostUI.tsx b/packages/blog/src/BlogPostUI.tsx index 28519f1..d7e6eb4 100644 --- a/packages/blog/src/BlogPostUI.tsx +++ b/packages/blog/src/BlogPostUI.tsx @@ -1,8 +1,8 @@ import { getISODate } from "@repo/utils/dates" import "katex/dist/katex.min.css" -import { Typography } from "@repo/ui/design/Typography" -import { MainLayout } from "@repo/ui/MainLayout" +import { Typography } from "@repo/ui/Design/Typography" +import { MainLayout } from "@repo/ui/Layout/MainLayout" import type { BlogPost } from "./BlogPost" import { BlogPostContent } from "./BlogPostContent" diff --git a/packages/blog/src/BlogPosts.tsx b/packages/blog/src/BlogPosts.tsx index 1838d0e..564f1c4 100644 --- a/packages/blog/src/BlogPosts.tsx +++ b/packages/blog/src/BlogPosts.tsx @@ -1,6 +1,6 @@ import { Link } from "@repo/i18n/navigation" -import { Section, SectionContent } from "@repo/ui/design/Section" -import { Typography } from "@repo/ui/design/Typography" +import { Typography } from "@repo/ui/Design/Typography" +import { Section, SectionContent } from "@repo/ui/Layout/Section" import { getISODate } from "@repo/utils/dates" import type { BlogPost } from "./BlogPost" diff --git a/packages/blog/src/stories/BlogPostUI.stories.tsx b/packages/blog/src/stories/BlogPostUI.stories.tsx index 43d5258..52c437c 100644 --- a/packages/blog/src/stories/BlogPostUI.stories.tsx +++ b/packages/blog/src/stories/BlogPostUI.stories.tsx @@ -4,7 +4,7 @@ import { BLOG_POST_MOCK } from "../BlogPost" import { BlogPostUI as BlogPostUIComponent } from "../BlogPostUI" const meta = { - title: "Feature/Blog/BlogPostUI", + title: "Blog/BlogPostUI", component: BlogPostUIComponent, } satisfies Meta diff --git a/packages/blog/src/stories/BlogPosts.stories.tsx b/packages/blog/src/stories/BlogPosts.stories.tsx index f50241d..cdde770 100644 --- a/packages/blog/src/stories/BlogPosts.stories.tsx +++ b/packages/blog/src/stories/BlogPosts.stories.tsx @@ -4,7 +4,7 @@ import { BLOG_POST_MOCK } from "../BlogPost" import { BlogPosts as BlogPostsComponent } from "../BlogPosts" const meta = { - title: "Feature/Blog/BlogPosts", + title: "Blog/BlogPosts", component: BlogPostsComponent, } satisfies Meta diff --git a/packages/ui/package.json b/packages/ui/package.json index 355b3a3..8059687 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -4,22 +4,22 @@ "private": true, "type": "module", "exports": { - "./About": "./src/About/About.tsx", - "./design/Button": "./src/design/Button/Button.tsx", - "./design/Link": "./src/design/Link/Link.tsx", - "./design/Section": "./src/design/Section/Section.tsx", - "./design/Spinner": "./src/design/Spinner/Spinner.tsx", - "./design/Typography": "./src/design/Typography/Typography.tsx", + "./Design/Button": "./src/Design/Button/Button.tsx", + "./Design/Link": "./src/Design/Link/Link.tsx", + "./Design/Spinner": "./src/Design/Spinner/Spinner.tsx", + "./Design/Typography": "./src/Design/Typography/Typography.tsx", "./Errors/ErrorNotFound": "./src/Errors/ErrorNotFound/ErrorNotFound.tsx", "./Errors/ErrorServer": "./src/Errors/ErrorServer/ErrorServer.tsx", - "./Footer": "./src/Footer/Footer.tsx", - "./Header": "./src/Header/Header.tsx", - "./Interests": "./src/Interests/Interests.tsx", - "./Header/SwitchTheme": "./src/Header/SwitchTheme.tsx", - "./MainLayout": "./src/MainLayout/MainLayout.tsx", - "./OpenSource": "./src/OpenSource/OpenSource.tsx", - "./Portfolio": "./src/Portfolio/Portfolio.tsx", - "./Skills": "./src/Skills/Skills.tsx" + "./Home/About": "./src/Home/About/About.tsx", + "./Home/Interests": "./src/Home/Interests/Interests.tsx", + "./Home/OpenSource": "./src/Home/OpenSource/OpenSource.tsx", + "./Home/Portfolio": "./src/Home/Portfolio/Portfolio.tsx", + "./Home/Skills": "./src/Home/Skills/Skills.tsx", + "./Layout/Footer": "./src/Layout/Footer/Footer.tsx", + "./Layout/Header": "./src/Layout/Header/Header.tsx", + "./Layout/Header/SwitchTheme": "./src/Layout/Header/SwitchTheme.tsx", + "./Layout/MainLayout": "./src/Layout/MainLayout/MainLayout.tsx", + "./Layout/Section": "./src/Layout/Section/Section.tsx" }, "scripts": { "lint:eslint": "eslint src --max-warnings 0 --report-unused-disable-directives", diff --git a/packages/ui/src/design/Button/Button.stories.tsx b/packages/ui/src/Design/Button/Button.stories.tsx similarity index 100% rename from packages/ui/src/design/Button/Button.stories.tsx rename to packages/ui/src/Design/Button/Button.stories.tsx diff --git a/packages/ui/src/design/Button/Button.tsx b/packages/ui/src/Design/Button/Button.tsx similarity index 100% rename from packages/ui/src/design/Button/Button.tsx rename to packages/ui/src/Design/Button/Button.tsx diff --git a/packages/ui/src/design/Button/Ripple.tsx b/packages/ui/src/Design/Button/Ripple.tsx similarity index 100% rename from packages/ui/src/design/Button/Ripple.tsx rename to packages/ui/src/Design/Button/Ripple.tsx diff --git a/packages/ui/src/design/Link/Link.stories.tsx b/packages/ui/src/Design/Link/Link.stories.tsx similarity index 100% rename from packages/ui/src/design/Link/Link.stories.tsx rename to packages/ui/src/Design/Link/Link.stories.tsx diff --git a/packages/ui/src/design/Link/Link.tsx b/packages/ui/src/Design/Link/Link.tsx similarity index 100% rename from packages/ui/src/design/Link/Link.tsx rename to packages/ui/src/Design/Link/Link.tsx diff --git a/packages/ui/src/design/Spinner/Spinner.stories.tsx b/packages/ui/src/Design/Spinner/Spinner.stories.tsx similarity index 100% rename from packages/ui/src/design/Spinner/Spinner.stories.tsx rename to packages/ui/src/Design/Spinner/Spinner.stories.tsx diff --git a/packages/ui/src/design/Spinner/Spinner.tsx b/packages/ui/src/Design/Spinner/Spinner.tsx similarity index 100% rename from packages/ui/src/design/Spinner/Spinner.tsx rename to packages/ui/src/Design/Spinner/Spinner.tsx diff --git a/packages/ui/src/design/Typography/Typography.stories.tsx b/packages/ui/src/Design/Typography/Typography.stories.tsx similarity index 100% rename from packages/ui/src/design/Typography/Typography.stories.tsx rename to packages/ui/src/Design/Typography/Typography.stories.tsx diff --git a/packages/ui/src/design/Typography/Typography.tsx b/packages/ui/src/Design/Typography/Typography.tsx similarity index 100% rename from packages/ui/src/design/Typography/Typography.tsx rename to packages/ui/src/Design/Typography/Typography.tsx diff --git a/packages/ui/src/Errors/ErrorNotFound/ErrorNotFound.tsx b/packages/ui/src/Errors/ErrorNotFound/ErrorNotFound.tsx index fae3e27..62ef931 100644 --- a/packages/ui/src/Errors/ErrorNotFound/ErrorNotFound.tsx +++ b/packages/ui/src/Errors/ErrorNotFound/ErrorNotFound.tsx @@ -1,8 +1,8 @@ import { useTranslations } from "next-intl" -import { MainLayout } from "../../MainLayout/MainLayout" -import { Link } from "../../design/Link/Link" -import { Section } from "../../design/Section/Section" -import { Typography } from "../../design/Typography/Typography" +import { Link } from "../../Design/Link/Link" +import { Typography } from "../../Design/Typography/Typography" +import { MainLayout } from "../../Layout/MainLayout/MainLayout" +import { Section } from "../../Layout/Section/Section" export interface ErrorNotFoundProps {} diff --git a/packages/ui/src/Errors/ErrorServer/ErrorServer.tsx b/packages/ui/src/Errors/ErrorServer/ErrorServer.tsx index 4c3d6bc..9acc944 100644 --- a/packages/ui/src/Errors/ErrorServer/ErrorServer.tsx +++ b/packages/ui/src/Errors/ErrorServer/ErrorServer.tsx @@ -2,10 +2,10 @@ import { useTranslations } from "next-intl" import { useEffect } from "react" -import { MainLayout } from "../../MainLayout/MainLayout" -import { Button } from "../../design/Button/Button" -import { Section } from "../../design/Section/Section" -import { Typography } from "../../design/Typography/Typography" +import { Button } from "../../Design/Button/Button" +import { Typography } from "../../Design/Typography/Typography" +import { MainLayout } from "../../Layout/MainLayout/MainLayout" +import { Section } from "../../Layout/Section/Section" export interface ErrorServerProps { error: Error & { digest?: string } diff --git a/packages/ui/src/About/About.stories.tsx b/packages/ui/src/Home/About/About.stories.tsx similarity index 91% rename from packages/ui/src/About/About.stories.tsx rename to packages/ui/src/Home/About/About.stories.tsx index b09642a..10be915 100644 --- a/packages/ui/src/About/About.stories.tsx +++ b/packages/ui/src/Home/About/About.stories.tsx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react" import { About as AboutComponent } from "./About" const meta = { - title: "Feature/About", + title: "Home/About", component: AboutComponent, } satisfies Meta diff --git a/packages/ui/src/About/About.tsx b/packages/ui/src/Home/About/About.tsx similarity index 91% rename from packages/ui/src/About/About.tsx rename to packages/ui/src/Home/About/About.tsx index 365d1b2..487b0ae 100644 --- a/packages/ui/src/About/About.tsx +++ b/packages/ui/src/Home/About/About.tsx @@ -1,4 +1,4 @@ -import { Section, SectionContent } from "../design/Section/Section" +import { Section, SectionContent } from "../../Layout/Section/Section" import { AboutDescription } from "./AboutDescription" import { AboutIntroduction } from "./AboutIntroduction" import { AboutList } from "./AboutList/AboutList" diff --git a/packages/ui/src/About/AboutDescription.tsx b/packages/ui/src/Home/About/AboutDescription.tsx similarity index 82% rename from packages/ui/src/About/AboutDescription.tsx rename to packages/ui/src/Home/About/AboutDescription.tsx index 6ca959b..f3e374e 100644 --- a/packages/ui/src/About/AboutDescription.tsx +++ b/packages/ui/src/Home/About/AboutDescription.tsx @@ -1,6 +1,6 @@ import { useTranslations } from "next-intl" -import { Button } from "../design/Button/Button" -import { Typography } from "../design/Typography/Typography" +import { Button } from "../../Design/Button/Button" +import { Typography } from "../../Design/Typography/Typography" export interface AboutDescriptionProps {} diff --git a/packages/ui/src/About/AboutIntroduction.tsx b/packages/ui/src/Home/About/AboutIntroduction.tsx similarity index 88% rename from packages/ui/src/About/AboutIntroduction.tsx rename to packages/ui/src/Home/About/AboutIntroduction.tsx index b6b055e..f6df8ca 100644 --- a/packages/ui/src/About/AboutIntroduction.tsx +++ b/packages/ui/src/Home/About/AboutIntroduction.tsx @@ -1,5 +1,5 @@ import { useTranslations } from "next-intl" -import { Typography } from "../design/Typography/Typography" +import { Typography } from "../../Design/Typography/Typography" export interface AboutIntroductionProps {} diff --git a/packages/ui/src/About/AboutList/AboutItem.tsx b/packages/ui/src/Home/About/AboutList/AboutItem.tsx similarity index 100% rename from packages/ui/src/About/AboutList/AboutItem.tsx rename to packages/ui/src/Home/About/AboutList/AboutItem.tsx diff --git a/packages/ui/src/About/AboutList/AboutItemBirthDate.tsx b/packages/ui/src/Home/About/AboutList/AboutItemBirthDate.tsx similarity index 100% rename from packages/ui/src/About/AboutList/AboutItemBirthDate.tsx rename to packages/ui/src/Home/About/AboutList/AboutItemBirthDate.tsx diff --git a/packages/ui/src/About/AboutList/AboutList.tsx b/packages/ui/src/Home/About/AboutList/AboutList.tsx similarity index 100% rename from packages/ui/src/About/AboutList/AboutList.tsx rename to packages/ui/src/Home/About/AboutList/AboutList.tsx diff --git a/packages/ui/src/About/AboutLogo.tsx b/packages/ui/src/Home/About/AboutLogo.tsx similarity index 100% rename from packages/ui/src/About/AboutLogo.tsx rename to packages/ui/src/Home/About/AboutLogo.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaIcons/EmailIcon.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/EmailIcon.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaIcons/EmailIcon.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/EmailIcon.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaIcons/GitHubIcon.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/GitHubIcon.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaIcons/GitHubIcon.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/GitHubIcon.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaIcons/GitLabIcon.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/GitLabIcon.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaIcons/GitLabIcon.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/GitLabIcon.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaIcons/Icon.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/Icon.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaIcons/Icon.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/Icon.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaIcons/NPMIcon.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/NPMIcon.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaIcons/NPMIcon.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/NPMIcon.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaIcons/TwitchIcon.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/TwitchIcon.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaIcons/TwitchIcon.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/TwitchIcon.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaIcons/TwitterIcon.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/TwitterIcon.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaIcons/TwitterIcon.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/TwitterIcon.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaIcons/YouTubeIcon.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/YouTubeIcon.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaIcons/YouTubeIcon.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaIcons/YouTubeIcon.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaItem.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaItem.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaItem.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaItem.tsx diff --git a/packages/ui/src/About/SocialMediaList/SocialMediaList.tsx b/packages/ui/src/Home/About/SocialMediaList/SocialMediaList.tsx similarity index 100% rename from packages/ui/src/About/SocialMediaList/SocialMediaList.tsx rename to packages/ui/src/Home/About/SocialMediaList/SocialMediaList.tsx diff --git a/packages/ui/src/Interests/InterestItem.tsx b/packages/ui/src/Home/Interests/InterestItem.tsx similarity index 88% rename from packages/ui/src/Interests/InterestItem.tsx rename to packages/ui/src/Home/Interests/InterestItem.tsx index b06c8ef..26b9ba7 100644 --- a/packages/ui/src/Interests/InterestItem.tsx +++ b/packages/ui/src/Home/Interests/InterestItem.tsx @@ -1,4 +1,4 @@ -import { Typography } from "../design/Typography/Typography" +import { Typography } from "../../Design/Typography/Typography" export interface InterestItemProps { title: string diff --git a/packages/ui/src/Interests/Interests.stories.tsx b/packages/ui/src/Home/Interests/Interests.stories.tsx similarity index 91% rename from packages/ui/src/Interests/Interests.stories.tsx rename to packages/ui/src/Home/Interests/Interests.stories.tsx index 3de4e15..b459aa1 100644 --- a/packages/ui/src/Interests/Interests.stories.tsx +++ b/packages/ui/src/Home/Interests/Interests.stories.tsx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react" import { Interests as InterestsComponent } from "./Interests" const meta = { - title: "Feature/Interests", + title: "Home/Interests", component: InterestsComponent, } satisfies Meta diff --git a/packages/ui/src/Interests/Interests.tsx b/packages/ui/src/Home/Interests/Interests.tsx similarity index 95% rename from packages/ui/src/Interests/Interests.tsx rename to packages/ui/src/Home/Interests/Interests.tsx index 07f4bc0..39e49e1 100644 --- a/packages/ui/src/Interests/Interests.tsx +++ b/packages/ui/src/Home/Interests/Interests.tsx @@ -1,12 +1,12 @@ import { GIT_REPO_LINK } from "@repo/utils/constants" import { useTranslations } from "next-intl" import { FaGit, FaMicrochip } from "react-icons/fa" -import { Link } from "../design/Link/Link" +import { Link } from "../../Design/Link/Link" import { Section, SectionContent, SectionTitle, -} from "../design/Section/Section" +} from "../../Layout/Section/Section" import { InterestItem } from "./InterestItem" export interface InterestsProps {} diff --git a/packages/ui/src/OpenSource/OpenSource.stories.tsx b/packages/ui/src/Home/OpenSource/OpenSource.stories.tsx similarity index 91% rename from packages/ui/src/OpenSource/OpenSource.stories.tsx rename to packages/ui/src/Home/OpenSource/OpenSource.stories.tsx index 58a9d4c..e2b13d1 100644 --- a/packages/ui/src/OpenSource/OpenSource.stories.tsx +++ b/packages/ui/src/Home/OpenSource/OpenSource.stories.tsx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react" import { OpenSource as OpenSourceComponent } from "./OpenSource" const meta = { - title: "Feature/OpenSource", + title: "Home/OpenSource", component: OpenSourceComponent, } satisfies Meta diff --git a/packages/ui/src/OpenSource/OpenSource.tsx b/packages/ui/src/Home/OpenSource/OpenSource.tsx similarity index 97% rename from packages/ui/src/OpenSource/OpenSource.tsx rename to packages/ui/src/Home/OpenSource/OpenSource.tsx index 9c3fc00..669bfa9 100644 --- a/packages/ui/src/OpenSource/OpenSource.tsx +++ b/packages/ui/src/Home/OpenSource/OpenSource.tsx @@ -3,7 +3,7 @@ import { Section, SectionDescription, SectionTitle, -} from "../design/Section/Section" +} from "../../Layout/Section/Section" import { Repository } from "./Repository" export interface OpenSourceProps {} diff --git a/packages/ui/src/OpenSource/Repository.tsx b/packages/ui/src/Home/OpenSource/Repository.tsx similarity index 87% rename from packages/ui/src/OpenSource/Repository.tsx rename to packages/ui/src/Home/OpenSource/Repository.tsx index 6a92216..f709654 100644 --- a/packages/ui/src/OpenSource/Repository.tsx +++ b/packages/ui/src/Home/OpenSource/Repository.tsx @@ -1,6 +1,6 @@ +import { Typography } from "../../Design/Typography/Typography" +import { SectionContent } from "../../Layout/Section/Section" import { GitHubIcon } from "../About/SocialMediaList/SocialMediaIcons/GitHubIcon" -import { SectionContent } from "../design/Section/Section" -import { Typography } from "../design/Typography/Typography" export interface RepositoryProps { name: string diff --git a/packages/ui/src/Portfolio/Portfolio.stories.tsx b/packages/ui/src/Home/Portfolio/Portfolio.stories.tsx similarity index 91% rename from packages/ui/src/Portfolio/Portfolio.stories.tsx rename to packages/ui/src/Home/Portfolio/Portfolio.stories.tsx index 8703883..fb8876a 100644 --- a/packages/ui/src/Portfolio/Portfolio.stories.tsx +++ b/packages/ui/src/Home/Portfolio/Portfolio.stories.tsx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react" import { Portfolio as PortfolioComponent } from "./Portfolio" const meta = { - title: "Feature/Portfolio", + title: "Home/Portfolio", component: PortfolioComponent, } satisfies Meta diff --git a/packages/ui/src/Portfolio/Portfolio.tsx b/packages/ui/src/Home/Portfolio/Portfolio.tsx similarity index 94% rename from packages/ui/src/Portfolio/Portfolio.tsx rename to packages/ui/src/Home/Portfolio/Portfolio.tsx index c2a0412..2540fef 100644 --- a/packages/ui/src/Portfolio/Portfolio.tsx +++ b/packages/ui/src/Home/Portfolio/Portfolio.tsx @@ -1,5 +1,5 @@ import { useTranslations } from "next-intl" -import { Section, SectionTitle } from "../design/Section/Section" +import { Section, SectionTitle } from "../../Layout/Section/Section" import { PortfolioItem, type PortfolioProject } from "./PortfolioItem" export interface PortfolioProps {} diff --git a/packages/ui/src/Portfolio/PortfolioItem.tsx b/packages/ui/src/Home/Portfolio/PortfolioItem.tsx similarity index 91% rename from packages/ui/src/Portfolio/PortfolioItem.tsx rename to packages/ui/src/Home/Portfolio/PortfolioItem.tsx index 157b19c..e641482 100644 --- a/packages/ui/src/Portfolio/PortfolioItem.tsx +++ b/packages/ui/src/Home/Portfolio/PortfolioItem.tsx @@ -1,6 +1,6 @@ import Image from "next/image" -import { SectionContent } from "../design/Section/Section" -import { Typography } from "../design/Typography/Typography" +import { Typography } from "../../Design/Typography/Typography" +import { SectionContent } from "../../Layout/Section/Section" export interface PortfolioProject { id: string diff --git a/packages/ui/src/Skills/SkillItem.tsx b/packages/ui/src/Home/Skills/SkillItem.tsx similarity index 91% rename from packages/ui/src/Skills/SkillItem.tsx rename to packages/ui/src/Home/Skills/SkillItem.tsx index f776382..b44b6f9 100644 --- a/packages/ui/src/Skills/SkillItem.tsx +++ b/packages/ui/src/Home/Skills/SkillItem.tsx @@ -2,8 +2,8 @@ import Image from "next/image" import { useMemo } from "react" -import { Link } from "../design/Link/Link" -import { useTheme } from "../Header/SwitchTheme" +import { Link } from "../../Design/Link/Link" +import { useTheme } from "../../Layout/Header/SwitchTheme" import type { SkillName } from "./skills" import { skills } from "./skills" diff --git a/packages/ui/src/Skills/Skills.stories.tsx b/packages/ui/src/Home/Skills/Skills.stories.tsx similarity index 91% rename from packages/ui/src/Skills/Skills.stories.tsx rename to packages/ui/src/Home/Skills/Skills.stories.tsx index b487e13..58316a0 100644 --- a/packages/ui/src/Skills/Skills.stories.tsx +++ b/packages/ui/src/Home/Skills/Skills.stories.tsx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react" import { Skills as SkillsComponent } from "./Skills" const meta = { - title: "Feature/Skills", + title: "Home/Skills", component: SkillsComponent, } satisfies Meta diff --git a/packages/ui/src/Skills/Skills.tsx b/packages/ui/src/Home/Skills/Skills.tsx similarity index 95% rename from packages/ui/src/Skills/Skills.tsx rename to packages/ui/src/Home/Skills/Skills.tsx index d6a09b2..3e4a7fb 100644 --- a/packages/ui/src/Skills/Skills.tsx +++ b/packages/ui/src/Home/Skills/Skills.tsx @@ -1,5 +1,5 @@ import { useTranslations } from "next-intl" -import { Section, SectionTitle } from "../design/Section/Section" +import { Section, SectionTitle } from "../../Layout/Section/Section" import { SkillItem } from "./SkillItem" import { SkillsSection } from "./SkillsSection" diff --git a/packages/ui/src/Skills/SkillsSection.tsx b/packages/ui/src/Home/Skills/SkillsSection.tsx similarity index 83% rename from packages/ui/src/Skills/SkillsSection.tsx rename to packages/ui/src/Home/Skills/SkillsSection.tsx index b1b0e92..9a782fc 100644 --- a/packages/ui/src/Skills/SkillsSection.tsx +++ b/packages/ui/src/Home/Skills/SkillsSection.tsx @@ -1,5 +1,5 @@ -import { SectionContent } from "../design/Section/Section" -import { Typography } from "../design/Typography/Typography" +import { Typography } from "../../Design/Typography/Typography" +import { SectionContent } from "../../Layout/Section/Section" export interface SkillsSectionProps extends React.PropsWithChildren { title: string diff --git a/packages/ui/src/Skills/skills.ts b/packages/ui/src/Home/Skills/skills.ts similarity index 100% rename from packages/ui/src/Skills/skills.ts rename to packages/ui/src/Home/Skills/skills.ts diff --git a/packages/ui/src/Footer/Footer.stories.tsx b/packages/ui/src/Layout/Footer/Footer.stories.tsx similarity index 90% rename from packages/ui/src/Footer/Footer.stories.tsx rename to packages/ui/src/Layout/Footer/Footer.stories.tsx index 3300169..e88c609 100644 --- a/packages/ui/src/Footer/Footer.stories.tsx +++ b/packages/ui/src/Layout/Footer/Footer.stories.tsx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react" import { Footer as FooterComponent } from "./Footer" const meta = { - title: "User Interface/Footer", + title: "Layout/Footer", component: FooterComponent, } satisfies Meta diff --git a/packages/ui/src/Footer/Footer.tsx b/packages/ui/src/Layout/Footer/Footer.tsx similarity index 94% rename from packages/ui/src/Footer/Footer.tsx rename to packages/ui/src/Layout/Footer/Footer.tsx index 0e9c5a9..1e488ed 100644 --- a/packages/ui/src/Footer/Footer.tsx +++ b/packages/ui/src/Layout/Footer/Footer.tsx @@ -1,7 +1,7 @@ import { useTranslations } from "next-intl" import { GIT_REPO_LINK } from "@repo/utils/constants" -import { Link } from "../design/Link/Link" +import { Link } from "../../Design/Link/Link" export interface FooterProps { version: string diff --git a/packages/ui/src/Header/Header.stories.tsx b/packages/ui/src/Layout/Header/Header.stories.tsx similarity index 89% rename from packages/ui/src/Header/Header.stories.tsx rename to packages/ui/src/Layout/Header/Header.stories.tsx index afc7866..4caf804 100644 --- a/packages/ui/src/Header/Header.stories.tsx +++ b/packages/ui/src/Layout/Header/Header.stories.tsx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react" import { Header as HeaderComponent } from "./Header" const meta = { - title: "User Interface/Header", + title: "Layout/Header", component: HeaderComponent, } satisfies Meta diff --git a/packages/ui/src/Header/Header.tsx b/packages/ui/src/Layout/Header/Header.tsx similarity index 96% rename from packages/ui/src/Header/Header.tsx rename to packages/ui/src/Layout/Header/Header.tsx index aa682d5..057e918 100644 --- a/packages/ui/src/Header/Header.tsx +++ b/packages/ui/src/Layout/Header/Header.tsx @@ -1,6 +1,6 @@ import { useTranslations } from "next-intl" import Image from "next/image" -import { Link } from "../design/Link/Link" +import { Link } from "../../Design/Link/Link" import { Locales } from "./Locales/Locales" import { SwitchTheme } from "./SwitchTheme" diff --git a/packages/ui/src/Header/Locales/Arrow.tsx b/packages/ui/src/Layout/Header/Locales/Arrow.tsx similarity index 100% rename from packages/ui/src/Header/Locales/Arrow.tsx rename to packages/ui/src/Layout/Header/Locales/Arrow.tsx diff --git a/packages/ui/src/Header/Locales/LocaleFlag.tsx b/packages/ui/src/Layout/Header/Locales/LocaleFlag.tsx similarity index 100% rename from packages/ui/src/Header/Locales/LocaleFlag.tsx rename to packages/ui/src/Layout/Header/Locales/LocaleFlag.tsx diff --git a/packages/ui/src/Header/Locales/Locales.tsx b/packages/ui/src/Layout/Header/Locales/Locales.tsx similarity index 100% rename from packages/ui/src/Header/Locales/Locales.tsx rename to packages/ui/src/Layout/Header/Locales/Locales.tsx diff --git a/packages/ui/src/Header/SwitchTheme.tsx b/packages/ui/src/Layout/Header/SwitchTheme.tsx similarity index 100% rename from packages/ui/src/Header/SwitchTheme.tsx rename to packages/ui/src/Layout/Header/SwitchTheme.tsx diff --git a/packages/ui/src/MainLayout/MainLayout.tsx b/packages/ui/src/Layout/MainLayout/MainLayout.tsx similarity index 100% rename from packages/ui/src/MainLayout/MainLayout.tsx rename to packages/ui/src/Layout/MainLayout/MainLayout.tsx diff --git a/packages/ui/src/design/Section/RevealFade.tsx b/packages/ui/src/Layout/Section/RevealFade.tsx similarity index 100% rename from packages/ui/src/design/Section/RevealFade.tsx rename to packages/ui/src/Layout/Section/RevealFade.tsx diff --git a/packages/ui/src/design/Section/Section.tsx b/packages/ui/src/Layout/Section/Section.tsx similarity index 93% rename from packages/ui/src/design/Section/Section.tsx rename to packages/ui/src/Layout/Section/Section.tsx index b4857b4..bfe24d2 100644 --- a/packages/ui/src/design/Section/Section.tsx +++ b/packages/ui/src/Layout/Section/Section.tsx @@ -1,6 +1,6 @@ import { classNames } from "@repo/config-tailwind/classNames" -import type { TypographyProps } from "../Typography/Typography" -import { Typography } from "../Typography/Typography" +import type { TypographyProps } from "../../Design/Typography/Typography" +import { Typography } from "../../Design/Typography/Typography" export * from "./RevealFade" diff --git a/packages/utils/src/dates.ts b/packages/utils/src/dates.ts index 5df6d3b..cc1c1cc 100644 --- a/packages/utils/src/dates.ts +++ b/packages/utils/src/dates.ts @@ -12,6 +12,7 @@ export const getISODate = (date: Date): string => { /** * Calculates the age of a person based on their birth date. * @param birthDate + * @returns */ export const getAge = (birthDate: Date): number => { const today = new Date() diff --git a/packages/utils/src/strings.ts b/packages/utils/src/strings.ts index df75057..c857cb1 100644 --- a/packages/utils/src/strings.ts +++ b/packages/utils/src/strings.ts @@ -1,3 +1,9 @@ +/** + * Capitalize the first letter of a string. + * @param string + * @returns + * @example capitalize("hello, world!") // "Hello, world!" + */ export const capitalize = (string: string): string => { return string.charAt(0).toUpperCase() + string.slice(1) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a513b7..9d0be44 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -246,8 +246,8 @@ importers: specifier: 23.1.1 version: 23.1.1(typescript@5.5.4) turbo: - specifier: 2.0.9 - version: 2.0.9 + specifier: 2.0.10 + version: 2.0.10 typescript: specifier: 'catalog:' version: 5.5.4 @@ -3624,8 +3624,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - caniuse-lite@1.0.30001644: - resolution: {integrity: sha512-YGvlOZB4QhZuiis+ETS0VXR+MExbFf4fZYYeMTEE0aTQd/RdIjkTyZjLrbYVKnHzppDvnOhritRVv+i7Go6mHw==} + caniuse-lite@1.0.30001645: + resolution: {integrity: sha512-GFtY2+qt91kzyMk6j48dJcwJVq5uTkk71XxE3RtScx7XWRLsO7bU44LOFkOZYR8w9YMS0UhPSYpN/6rAMImmLw==} cardinal@2.1.1: resolution: {integrity: sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==} @@ -4269,8 +4269,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - electron-to-chromium@1.5.3: - resolution: {integrity: sha512-QNdYSS5i8D9axWp/6XIezRObRHqaav/ur9z1VzCDUCH1XIFOr9WQk5xmgunhsTpjjgDy3oLxO/WMOVZlpUQrlA==} + electron-to-chromium@1.5.4: + resolution: {integrity: sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==} elliptic@6.5.6: resolution: {integrity: sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ==} @@ -8111,38 +8111,38 @@ packages: tty-browserify@0.0.1: resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==} - turbo-darwin-64@2.0.9: - resolution: {integrity: sha512-owlGsOaExuVGBUfrnJwjkL1BWlvefjSKczEAcpLx4BI7Oh6ttakOi+JyomkPkFlYElRpjbvlR2gP8WIn6M/+xQ==} + turbo-darwin-64@2.0.10: + resolution: {integrity: sha512-ND4hohx0wrd0AUsCf2RsdavlzUWVi0JU3vX5Vn2+wk3GG5RcZWIKi3y+it9MjgYuqqlCystkDbeamfH05iiQBQ==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.0.9: - resolution: {integrity: sha512-XAXkKkePth5ZPPE/9G9tTnPQx0C8UTkGWmNGYkpmGgRr8NedW+HrPsi9N0HcjzzIH9A4TpNYvtiV+WcwdaEjKA==} + turbo-darwin-arm64@2.0.10: + resolution: {integrity: sha512-cvHMMi1jDiiVl5ls1nWwXyanH7mB+xD3oYyZOC3NzZdFAfce3CWpL6hgUnK2CFxbdvaHQTizkQEgsHvUeD9nTQ==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.0.9: - resolution: {integrity: sha512-l9wSgEjrCFM1aG16zItBsZ206ZlhSSx1owB8Cgskfv0XyIXRGHRkluihiaxkp+UeU5WoEfz4EN5toc+ICA0q0w==} + turbo-linux-64@2.0.10: + resolution: {integrity: sha512-dPRwHrKkzyc/VuQLfhOeYLkBxA60vvLZyn9pXChRF0zyimg04OnhBYcKBNkfWMUU+Z1gQDFEvfyvnV9EEHLh0Q==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.0.9: - resolution: {integrity: sha512-gRnjxXRne18B27SwxXMqL3fJu7jw/8kBrOBTBNRSmZZiG1Uu3nbnP7b4lgrA/bCku6C0Wligwqurvtpq6+nFHA==} + turbo-linux-arm64@2.0.10: + resolution: {integrity: sha512-6qsYl+b1gf243QbL6cw+TbgUEWo6/krCCWDQjVg/8Znx45rkXnTJUqtIAMkQQsT+t7d3UU8hreQ77pjOW59LcQ==} cpu: [arm64] os: [linux] - turbo-windows-64@2.0.9: - resolution: {integrity: sha512-ZVo0apxUvaRq4Vm1qhsfqKKhtRgReYlBVf9MQvVU1O9AoyydEQvLDO1ryqpXDZWpcHoFxHAQc9msjAMtE5K2lA==} + turbo-windows-64@2.0.10: + resolution: {integrity: sha512-rkMOqvwN7hmMJNeChj63ZpLlIF6b9QC0jW/IbOMgcZMLcvz9iF+qCc2yaeDWgfOgLsNjhtv1rlhimShUuasSXw==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.0.9: - resolution: {integrity: sha512-sGRz7c5Pey6y7y9OKi8ypbWNuIRPF9y8xcMqL56OZifSUSo+X2EOsOleR9MKxQXVaqHPGOUKWsE6y8hxBi9pag==} + turbo-windows-arm64@2.0.10: + resolution: {integrity: sha512-r7HQScx+CpO0p+Mw97Yq63uUAIwTfEUXRX6qxzeipBK+mTsnV1A6dTTYeVLD3S5AlL8GGdXddx0swyDeeVkQng==} cpu: [arm64] os: [win32] - turbo@2.0.9: - resolution: {integrity: sha512-QaLaUL1CqblSKKPgLrFW3lZWkWG4pGBQNW+q1ScJB5v1D/nFWtsrD/yZljW/bdawg90ihi4/ftQJ3h6fz1FamA==} + turbo@2.0.10: + resolution: {integrity: sha512-1t10h9bWl94/zktjzVWwTerJL3kIMDSA8mfibr1bevGLjF0DsiHOJFkCQFa5QABK0eXb0Af5mdRehLRBVem0Qg==} hasBin: true tween-functions@1.2.0: @@ -12234,8 +12234,8 @@ snapshots: browserslist@4.23.2: dependencies: - caniuse-lite: 1.0.30001644 - electron-to-chromium: 1.5.3 + caniuse-lite: 1.0.30001645 + electron-to-chromium: 1.5.4 node-releases: 2.0.18 update-browserslist-db: 1.1.0(browserslist@4.23.2) @@ -12297,7 +12297,7 @@ snapshots: camelcase@6.3.0: {} - caniuse-lite@1.0.30001644: {} + caniuse-lite@1.0.30001645: {} cardinal@2.1.1: dependencies: @@ -12932,7 +12932,7 @@ snapshots: ee-first@1.1.1: {} - electron-to-chromium@1.5.3: {} + electron-to-chromium@1.5.4: {} elliptic@6.5.6: dependencies: @@ -16004,7 +16004,7 @@ snapshots: '@next/env': 14.2.5 '@swc/helpers': 0.5.5 busboy: 1.6.0 - caniuse-lite: 1.0.30001644 + caniuse-lite: 1.0.30001645 graceful-fs: 4.2.11 postcss: 8.4.31 react: 18.3.1 @@ -17907,32 +17907,32 @@ snapshots: tty-browserify@0.0.1: {} - turbo-darwin-64@2.0.9: + turbo-darwin-64@2.0.10: optional: true - turbo-darwin-arm64@2.0.9: + turbo-darwin-arm64@2.0.10: optional: true - turbo-linux-64@2.0.9: + turbo-linux-64@2.0.10: optional: true - turbo-linux-arm64@2.0.9: + turbo-linux-arm64@2.0.10: optional: true - turbo-windows-64@2.0.9: + turbo-windows-64@2.0.10: optional: true - turbo-windows-arm64@2.0.9: + turbo-windows-arm64@2.0.10: optional: true - turbo@2.0.9: + turbo@2.0.10: optionalDependencies: - turbo-darwin-64: 2.0.9 - turbo-darwin-arm64: 2.0.9 - turbo-linux-64: 2.0.9 - turbo-linux-arm64: 2.0.9 - turbo-windows-64: 2.0.9 - turbo-windows-arm64: 2.0.9 + turbo-darwin-64: 2.0.10 + turbo-darwin-arm64: 2.0.10 + turbo-linux-64: 2.0.10 + turbo-linux-arm64: 2.0.10 + turbo-windows-64: 2.0.10 + turbo-windows-arm64: 2.0.10 tween-functions@1.2.0: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index b6c3cb4..98b97c6 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -35,7 +35,6 @@ catalog: "typescript": "5.5.4" "@total-typescript/ts-reset": "0.5.1" "@types/node": "22.0.0" - "tsx": "4.16.2" # ESLint "@typescript-eslint/eslint-plugin": "7.18.0"