Compare commits

...

10 Commits

Author SHA1 Message Date
a1857ef3f7 Merge branch 'tailwind-v4'
All checks were successful
Lint / Lint (push) Successful in 33s
2025-05-10 20:23:23 +02:00
227a9e65ef tailwind v4 upgrade command 2025-05-10 20:23:15 +02:00
d54aa44858 fix(deps): update dependency tailwind-merge to v3 (#12)
All checks were successful
Lint / Lint (push) Successful in 34s
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [tailwind-merge](https://github.com/dcastil/tailwind-merge) | dependencies | major | [`^2.5.2` -> `^3.0.0`](https://renovatebot.com/diffs/npm/tailwind-merge/2.6.0/3.2.0) |

---

### Release Notes

<details>
<summary>dcastil/tailwind-merge (tailwind-merge)</summary>

### [`v3.2.0`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.2.0)

[Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.1.0...v3.2.0)

##### New Features

-   Add support for Tailwind CSS v4.1 by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/565

**Full Changelog**: https://github.com/dcastil/tailwind-merge/compare/v3.1.0...v3.2.0

Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️

### [`v3.1.0`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.1.0)

[Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.0.2...v3.1.0)

##### New Features

-   Add support for Tailwind CSS v4.0.10 by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/546

##### Bug Fixes

-   Fix length variable in `via-(length:*)` class being merged with `via-<color>` classes accidentally by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/559

##### Documentation

-   Fix typo in comment in types.ts by [@&#8203;roottool](https://github.com/roottool) in https://github.com/dcastil/tailwind-merge/pull/549
-   Update shadow scale recipe to tailwind merge v3 API by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/545

##### Other

-   Fix metrics report action erroring on PRs from forks by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/551

**Full Changelog**: https://github.com/dcastil/tailwind-merge/compare/v3.0.2...v3.1.0

Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️

### [`v3.0.2`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.0.2)

[Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.0.1...v3.0.2)

##### Bug Fixes

-   Fix `px` value not being recognized for some class groups by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/538
-   Fix doc comment being in incorrect place in default config by [@&#8203;gjtorikian](https://github.com/gjtorikian) in https://github.com/dcastil/tailwind-merge/pull/526

**Full Changelog**: https://github.com/dcastil/tailwind-merge/compare/v3.0.1...v3.0.2

Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️

### [`v3.0.1`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.0.1)

[Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.0.0...v3.0.1)

##### Bug Fixes

-   Update info about supported Tailwind CSS version in README by [@&#8203;dcastil](https://github.com/dcastil) in [`b9c136d`](https://github.com/dcastil/tailwind-merge/commit/b9c136d)
-   Update incorrect link in v3 changelog by [@&#8203;dcastil](https://github.com/dcastil) in [`e22885e`](https://github.com/dcastil/tailwind-merge/commit/e22885e)

**Full Changelog**: https://github.com/dcastil/tailwind-merge/compare/v3.0.0...v3.0.1

Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️

### [`v3.0.0`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.0.0)

[Compare Source](https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.0.0)

[Tailwind CSS v4 is here](https://tailwindcss.com/blog/tailwindcss-v4) and it's time to upgrade tailwind-merge to support it. tailwind-merge v3.0.0 is more accurate than ever and follows the Tailwind CSS spec more closely than in v2. That is thanks to Tailwind CSS v4 being more consistent than ever.

This release drops support for Tailwind CSS v3 and in turn adds support for Tailwind CSS v4. That means you should upgrade to Tailwind CSS v4 and tailwind-merge v3 together. All breaking changes are related to the Tailwind CSS v4 support.

Check out the [migration guide](https://github.com/dcastil/tailwind-merge/blob/v3.0.0/docs/changelog/v2-to-v3-migration.md) and if you have any questions, feel free to [create an issue](https://github.com/dcastil/tailwind-merge/issues/new/choose).

##### Breaking Changes

-   Dropping support for Tailwind CSS v3 in favor of support for Tailwind CSS v4 by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   Theme scales keys changed and now match Tailwind CSS v4 theme variable namespace exactly by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   `isLength` validator was removed and split into separate validators `isNumber` and `isFraction` by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   Prefix defined in config shouldn't include combining `-` character anymore by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   Tailwind CSS v3 prefix position in class not supported anymore in favor of Tailwind CSS v4 position by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   Custom separators are no longer supported by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   New mandatory `orderSensitiveModifiers` property in config when using `createTailwindMerge` by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   `DefaultThemeGroupIds` type union consists of different string literals than before by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   Classes removed in Tailwind CSS v4 are not supported by tailwind-merge anymore by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518

##### New Features

-   Support for new important modifier position at the end of class by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   Support for arbitrary CSS variable syntax by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518
-   There are a bunch of new validators used by tailwind-merge, primarily for new Tailwind CSS v4 features like arbitrary CSS variables by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518

##### Bug Fixes

-   Previously some order-sensitive modifiers like `before:` were treated as not order-sensitive. This is now fixed by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518

##### Documentation

-   Added section explaining order-sensitive modifiers to [configuration docs](https://github.com/dcastil/tailwind-merge/blob/v3.0.0/docs/configuration.md#order-sensitive-modifiers) by [@&#8203;dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518

**Full Changelog**: https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.0.0

Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "every weekend" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMTUuNCIsInVwZGF0ZWRJblZlciI6IjM5LjIzMC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Reviewed-on: #12
Co-authored-by: Renovate Bot <renovatebot@schulze.network>
Co-committed-by: Renovate Bot <renovatebot@schulze.network>
2025-05-10 20:07:28 +02:00
5cde37e4e8 fix(deps): update dependency lucide-react to ^0.509.0
All checks were successful
Lint / Lint (push) Successful in 33s
2025-05-10 05:02:46 +00:00
1b158bbfb4 fix(deps): update nextjs monorepo to v15.3.2
All checks were successful
Lint / Lint (push) Successful in 28s
2025-05-10 04:02:54 +00:00
74e3ca29a9 fix(deps): update dependency cssnano to v7.0.7
All checks were successful
Lint / Lint (push) Successful in 30s
2025-05-10 03:03:25 +00:00
13ceffe8da chore(deps): update dependency turbo to v2.5.3
All checks were successful
Lint / Lint (push) Successful in 30s
2025-05-10 02:03:32 +00:00
c1dc30eb1e chore(deps): update dependency @types/react to v19.1.3
All checks were successful
Lint / Lint (push) Successful in 27s
2025-05-10 01:05:09 +00:00
e938003245 chore(deps): update dependency @types/node to v22.15.17
All checks were successful
Lint / Lint (push) Successful in 29s
2025-05-10 00:03:26 +00:00
b1090af605 Merge branch 'dev'
All checks were successful
Lint / Lint (push) Successful in 29s
2025-05-05 11:47:33 +02:00
5 changed files with 1207 additions and 1119 deletions

View File

@ -1,7 +1,78 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import 'tailwindcss';
@custom-variant dark (&:is(.dark *));
@theme {
--font-sans: var(--font-sans);
--background-image-gradient-radial: radial-gradient(var(--tw-gradient-stops));
--background-image-gradient-conic: conic-gradient(
from 180deg at 50% 50%,
var(--tw-gradient-stops)
);
--radius-lg: var(--radius);
--radius-md: calc(var(--radius) - 2px);
--radius-sm: calc(var(--radius) - 4px);
--color-background: hsl(var(--background));
--color-foreground: hsl(var(--foreground));
--color-card: hsl(var(--card));
--color-card-foreground: hsl(var(--card-foreground));
--color-popover: hsl(var(--popover));
--color-popover-foreground: hsl(var(--popover-foreground));
--color-primary: hsl(var(--primary));
--color-primary-foreground: hsl(var(--primary-foreground));
--color-secondary: hsl(var(--secondary));
--color-secondary-foreground: hsl(var(--secondary-foreground));
--color-muted: hsl(var(--muted));
--color-muted-foreground: hsl(var(--muted-foreground));
--color-accent: hsl(var(--accent));
--color-accent-foreground: hsl(var(--accent-foreground));
--color-destructive: hsl(var(--destructive));
--color-destructive-foreground: hsl(var(--destructive-foreground));
--color-border: hsl(var(--border));
--color-input: hsl(var(--input));
--color-ring: hsl(var(--ring));
--color-chart-1: hsl(var(--chart-1));
--color-chart-2: hsl(var(--chart-2));
--color-chart-3: hsl(var(--chart-3));
--color-chart-4: hsl(var(--chart-4));
--color-chart-5: hsl(var(--chart-5));
}
/*
The default border color has changed to `currentcolor` in Tailwind CSS v4,
so we've added these compatibility styles to make sure everything still
looks the same as it did with Tailwind CSS v3.
If we ever want to remove these styles, we need to add an explicit border
color utility to any element that depends on these defaults.
*/
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentcolor);
}
}
@utility text-balance {
text-wrap: balance;
}
@layer utilities {
:root {
--foreground-rgb: 0, 0, 0;
--background-start-rgb: 214, 219, 220;
@ -15,11 +86,6 @@
--background-end-rgb: 0, 0, 0;
}
}
@layer utilities {
.text-balance {
text-wrap: balance;
}
}
@layer base {

2141
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -9,30 +9,30 @@
"lint": "next lint && npx tsc --noEmit"
},
"dependencies": {
"autoprefixer": "^10.4.19",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cssnano": "^7.0.1",
"lucide-react": "^0.507.0",
"next": "15.3.1",
"lucide-react": "^0.509.0",
"next": "15.3.2",
"next-plausible": "^3.12.0",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-preset-env": "^10.0.0",
"react": "19.1.0",
"react-dom": "19.1.0",
"sharp": "^0.34.0",
"tailwind-merge": "^2.5.2",
"tailwind-merge": "^3.0.0",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"@types/node": "22.15.3",
"@types/react": "19.1.2",
"@tailwindcss/postcss": "^4.1.6",
"@types/node": "22.15.17",
"@types/react": "19.1.3",
"@types/react-dom": "19.1.3",
"eslint": "8.57.1",
"eslint-config-next": "15.3.1",
"eslint-config-next": "15.3.2",
"postcss": "8.5.3",
"tailwindcss": "3.4.17",
"turbo": "2.5.2",
"tailwindcss": "^4.1.6",
"turbo": "2.5.3",
"typescript": "5.8.3"
},
"packageManager": "npm@11.3.0"

View File

@ -1,9 +1,8 @@
/** @type {import('postcss-load-config').Config} */
const config = {
plugins: {
tailwindcss: {},
'@tailwindcss/postcss': {},
autoprefixer: {},
"postcss-flexbugs-fixes": {
"postcss-preset-env": {
autoprefixer: {

View File

@ -1,70 +0,0 @@
import type { Config } from "tailwindcss";
const config: Config = {
darkMode: ["class"],
content: [
"./lib/**/*.{ts,tsx,js,jsx}",
"./components/**/*.{js,ts,jsx,tsx,mdx}",
"./app/**/*.{js,ts,jsx,tsx,mdx}",
],
theme: {
extend: {
fontFamily: {
sans: ["var(--font-sans)"]
},
backgroundImage: {
'gradient-radial': 'radial-gradient(var(--tw-gradient-stops))',
'gradient-conic': 'conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))'
},
borderRadius: {
lg: 'var(--radius)',
md: 'calc(var(--radius) - 2px)',
sm: 'calc(var(--radius) - 4px)'
},
colors: {
background: 'hsl(var(--background))',
foreground: 'hsl(var(--foreground))',
card: {
DEFAULT: 'hsl(var(--card))',
foreground: 'hsl(var(--card-foreground))'
},
popover: {
DEFAULT: 'hsl(var(--popover))',
foreground: 'hsl(var(--popover-foreground))'
},
primary: {
DEFAULT: 'hsl(var(--primary))',
foreground: 'hsl(var(--primary-foreground))'
},
secondary: {
DEFAULT: 'hsl(var(--secondary))',
foreground: 'hsl(var(--secondary-foreground))'
},
muted: {
DEFAULT: 'hsl(var(--muted))',
foreground: 'hsl(var(--muted-foreground))'
},
accent: {
DEFAULT: 'hsl(var(--accent))',
foreground: 'hsl(var(--accent-foreground))'
},
destructive: {
DEFAULT: 'hsl(var(--destructive))',
foreground: 'hsl(var(--destructive-foreground))'
},
border: 'hsl(var(--border))',
input: 'hsl(var(--input))',
ring: 'hsl(var(--ring))',
chart: {
'1': 'hsl(var(--chart-1))',
'2': 'hsl(var(--chart-2))',
'3': 'hsl(var(--chart-3))',
'4': 'hsl(var(--chart-4))',
'5': 'hsl(var(--chart-5))'
}
}
}
},
plugins: [require("tailwindcss-animate")],
};
export default config;