diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml index 8701785fd..98e5158ab 100644 --- a/.github/actions/e2e/action.yml +++ b/.github/actions/e2e/action.yml @@ -76,10 +76,10 @@ runs: # # TURBO_TOKEN: ${{ inputs.TURBO_TOKEN }} # # VERCEL_ENV: ${{ inputs.VERCEL_ENV }} # run: | - # pnpm add @lhci/cli@0.12.0 --global - # # pnpm dlx @lhci/cli@0.12.0 + # pnpm add @lhci/cli@0.14.0 --global + # # pnpm dlx @lhci/cli@0.14.0 # # run: | - # # npx @lhci/cli@0.12.0 autorun --config="./sites/${{ inputs.WEBSITE }}/lighthouse.config.js" + # # npx @lhci/cli@0.14.0 autorun --config="./sites/${{ inputs.WEBSITE }}/lighthouse.config.js" - name: '💡 Lighthouse: ${{ inputs.WEBSITE }}' id: test-lighthouse shell: bash diff --git a/package.json b/package.json index 57da32804..64b7ce42b 100644 --- a/package.json +++ b/package.json @@ -32,15 +32,16 @@ }, "dependencies": { "@jeromefitz/conventional-gitmoji": "4.0.16", - "@jeromefitz/eslint-config": "5.0.0-canary.44", + "@jeromefitz/eslint-config": "5.0.0-canary.45", "@jeromefitz/lint-staged": "2.1.4", "@jeromefitz/prettier-config": "2.1.6", "@jeromefitz/release-notes-generator": "3.1.6", "@jeromefitz/semantic": "11.1.4", "@jeromefitz/tsconfig": "2.1.0", "@manypkg/cli": "0.23.0", + "@tailwindcss/postcss": "4.0.14", "@types/lodash": "4.17.16", - "@types/node": "22.10.2", + "@types/node": "22.13.10", "ccommit": "3.1.2", "concurrently": "9.1.2", "dotenv": "16.4.7", @@ -49,7 +50,7 @@ "lodash": "4.17.21", "semantic-release": "24.2.3", "syncpack": "13.0.3", - "tailwindcss": "3.4.17", + "tailwindcss": "4.0.14", "ts-node": "10.9.2", "tsup": "8.4.0", "turbo": "2.4.4", diff --git a/packages/design-system/package.json b/packages/design-system/package.json index d473c65fe..f5e5443fb 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -103,7 +103,7 @@ "@radix-ui/themes": "3.2.1", "clsx": "2.1.1", "cmdk": "1.1.1", - "tailwind-merge": "2.6.0" + "tailwind-merge": "3.0.2" }, "devDependencies": { "@jeromefitz/jest-config": "workspace:*", diff --git a/packages/design-system/src/components/Icon/Icon.tsx b/packages/design-system/src/components/Icon/Icon.tsx index fa8027d92..78ddcfaa2 100644 --- a/packages/design-system/src/components/Icon/Icon.tsx +++ b/packages/design-system/src/components/Icon/Icon.tsx @@ -94,7 +94,9 @@ import { IconProps } from './Icon.types' * Override by passing tailwind className to Icon.XYZ * */ -const twHeroToRadixIcon = 'mt-[1px] w-[1rem] [&>path]:stroke-[1.5]' +const twHeroToRadixIcon = + 'icon-custom mt-[1px] w-[1rem] [&>path]:stroke-[1.5] icon-hero' +// const twHeroToRadixIcon = '' const AmazonLogoIcon = ({ label, ...props }: IconProps) => ( ( } > ( label={label || 'An icon representing the logo of Apple. Which is an apple.'} > ( > @@ -231,7 +234,7 @@ const BlueskyLogoIcon = ({ label, ...props }: IconProps) => ( } > ( > @@ -433,6 +437,7 @@ const CloudIcon = ({ className, label, ...props }: IconProps) => ( > @@ -593,7 +598,7 @@ const GooglePodcastsLogoIcon = ({ label, ...props }: IconProps) => ( label={label || 'An icon representing the logo for Google Podcasts.'} > ( > @@ -737,6 +743,7 @@ const LocationMarkerIcon = ({ className, label, ...props }: IconProps) => ( > @@ -763,6 +770,7 @@ const MapIcon = ({ className, label, ...props }: IconProps) => ( > @@ -778,6 +786,7 @@ const MicrophoneIcon = ({ className, label, ...props }: IconProps) => ( > @@ -804,6 +813,7 @@ const MusicalNoteIcon = ({ className, label, ...props }: IconProps) => ( > @@ -857,7 +867,7 @@ const ReturnIcon = ({ className, label, ...props }: IconProps) => ( } > @@ -905,7 +915,7 @@ const SpotifyLogoIcon = ({ label, ...props }: IconProps) => ( } > ( > @@ -1026,6 +1037,7 @@ const ThreadsLogoIcon = ({ className, label, ...props }: IconProps) => ( > @@ -1041,6 +1053,7 @@ const TicketIcon = ({ className, label, ...props }: IconProps) => ( > diff --git a/packages/design-system/src/components/Section/Section.Header.Title.tsx b/packages/design-system/src/components/Section/Section.Header.Title.tsx index 687fd9a0b..b10def643 100644 --- a/packages/design-system/src/components/Section/Section.Header.Title.tsx +++ b/packages/design-system/src/components/Section/Section.Header.Title.tsx @@ -1,4 +1,3 @@ -/* eslint-disable tailwindcss/no-custom-classname */ import { cx } from '../../utils/cx' function SectionHeaderTitle({ children, className = '', isTitle = false }) { @@ -9,7 +8,7 @@ function SectionHeaderTitle({ children, className = '', isTitle = false }) { 'md:[writing-mode:lr]', isTitle ? 'text-xl font-extrabold tracking-tight md:text-3xl' - : 'font-bold uppercase tracking-tight md:text-lg md:font-extrabold', + : 'font-bold tracking-tight uppercase md:text-lg md:font-extrabold', 'my-1 py-1 pr-2', 'md:my-2 md:py-2 md:pr-6', 'w-11/12', diff --git a/packages/design-system/src/components/Section/Section.Hero.tsx b/packages/design-system/src/components/Section/Section.Hero.tsx index b62e34f44..ca4bbc5a5 100644 --- a/packages/design-system/src/components/Section/Section.Hero.tsx +++ b/packages/design-system/src/components/Section/Section.Hero.tsx @@ -1,8 +1,7 @@ -/* eslint-disable tailwindcss/no-custom-classname */ function SectionHero({ title }) { return ( -
-

{title}

+
+

{title}

) } diff --git a/packages/design-system/src/components/Section/Tags.tsx b/packages/design-system/src/components/Section/Tags.tsx index 17361f197..889ae642e 100644 --- a/packages/design-system/src/components/Section/Tags.tsx +++ b/packages/design-system/src/components/Section/Tags.tsx @@ -1,4 +1,3 @@ -/* eslint-disable tailwindcss/no-custom-classname */ import { cx } from '../../utils/cx' function Tags({ className = '', classNameTag = '', tags }) { @@ -21,7 +20,7 @@ function Tags({ className = '', classNameTag = '', tags }) { // `text-radix-${color}11 bg-radix-${color}3 dark:bg-radix-${color}3`, 'relative rounded-full text-center font-semibold normal-case', // mobile (vertical sometimes) - '-left-1.5 my-0 mb-2 mr-2', + '-left-1.5 my-0 mr-2 mb-2', 'px-2 py-3', // horizontal // 'px-3 py-2', diff --git a/packages/design-system/src/components/SkipNav/SkipNav.tsx b/packages/design-system/src/components/SkipNav/SkipNav.tsx index 9f92b5793..6e49f3835 100644 --- a/packages/design-system/src/components/SkipNav/SkipNav.tsx +++ b/packages/design-system/src/components/SkipNav/SkipNav.tsx @@ -24,8 +24,8 @@ const SkipNavLink = forwardRef(function SkipNavLink( { 'unused-css-rules': OFF, 'unused-javascript': OFF, 'uses-responsive-images': OFF, - 'uses-text-compression': WARN, + 'uses-text-compression': OFF, }, preset: 'lighthouse:no-pwa', }, diff --git a/packages/next-notion/src/blocks/Emoji.server.tsx b/packages/next-notion/src/blocks/Emoji.server.tsx index 7ceee3367..006666525 100644 --- a/packages/next-notion/src/blocks/Emoji.server.tsx +++ b/packages/next-notion/src/blocks/Emoji.server.tsx @@ -47,7 +47,7 @@ function Emoji({ character }) { */ function EmojiHtml({ emoji, label }) { return ( - + {emoji} ) diff --git a/packages/shared/package.json b/packages/shared/package.json index 6ed84f58a..e65d1054b 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -131,7 +131,7 @@ "react-tweet": "^3.2.0", "server-only": "0.0.1", "swr": "^2.2.5", - "tailwind-merge": "^2.2.1", + "tailwind-merge": "^2.2.1 || ^3.0.0", "valid-url": "^1.0.9" }, "devDependencies": { @@ -158,7 +158,7 @@ "server-only": "0.0.1", "sharp": "0.33.5", "swr": "2.3.3", - "tailwind-merge": "2.6.0", + "tailwind-merge": "3.0.2", "title": "4.0.1", "valid-url": "1.0.9" }, diff --git a/packages/shared/src/components/Notion/Blocks/Embed.Spotify.tsx b/packages/shared/src/components/Notion/Blocks/Embed.Spotify.tsx index 807ab6706..2c69cc5a9 100644 --- a/packages/shared/src/components/Notion/Blocks/Embed.Spotify.tsx +++ b/packages/shared/src/components/Notion/Blocks/Embed.Spotify.tsx @@ -1,6 +1,6 @@ function EmbedSpotify({ id }) { return ( -
+