Skip to content

Commit 511d68a

Browse files
committed
1 parent 2461127 commit 511d68a

7 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div align="center">
66
<br />
77
<a href="https://github.com/dcastil/tailwind-merge">
8-
<img src="https://github.com/dcastil/tailwind-merge/raw/v3.6.0/assets/logo.svg" alt="tailwind-merge" height="150px" />
8+
<img src="https://github.com/dcastil/tailwind-merge/raw/[email protected]/packages/tailwind-merge/assets/logo.svg" alt="tailwind-merge" height="150px" />
99
</a>
1010
</div>
1111

@@ -22,22 +22,22 @@ twMerge('px-2 py-1 bg-red hover:bg-dark-red', 'p-3 bg-[#B91C1C]')
2222

2323
- Supports Tailwind v4.0 up to v4.3 (if you use Tailwind v3, use [tailwind-merge v2.6.0](https://github.com/dcastil/tailwind-merge/tree/v2.6.0))
2424
- Works in all modern browsers and maintained Node versions
25-
- Fully typed
25+
- Fully typed, with published declarations compatible with TypeScript 3.8 and newer
2626
- [Check bundle size on Bundlephobia](https://bundlephobia.com/package/tailwind-merge)
2727

2828
## Get started
2929

30-
- [What is it for](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/what-is-it-for.md)
31-
- [When and how to use it](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/when-and-how-to-use-it.md)
32-
- [Features](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/features.md)
33-
- [Limitations](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/limitations.md)
34-
- [Configuration](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/configuration.md)
35-
- [Recipes](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/recipes.md)
36-
- [API reference](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/api-reference.md)
37-
- [Writing plugins](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/writing-plugins.md)
38-
- [Versioning](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/versioning.md)
39-
- [Contributing](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/contributing.md)
40-
- [Similar packages](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/similar-packages.md)
30+
- [What is it for](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/what-is-it-for.md)
31+
- [When and how to use it](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/when-and-how-to-use-it.md)
32+
- [Features](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/features.md)
33+
- [Limitations](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/limitations.md)
34+
- [Configuration](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/configuration.md)
35+
- [Recipes](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/recipes.md)
36+
- [API reference](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/api-reference.md)
37+
- [Writing plugins](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/writing-plugins.md)
38+
- [Versioning](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/versioning.md)
39+
- [Contributing](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/contributing.md)
40+
- [Similar packages](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/similar-packages.md)
4141

4242
<!-- tailwind-merge-docs:end -->
4343

‎packages/tailwind-merge/README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div align="center">
44
<br />
55
<a href="https://github.com/dcastil/tailwind-merge">
6-
<img src="https://github.com/dcastil/tailwind-merge/raw/v3.6.0/assets/logo.svg" alt="tailwind-merge" height="150px" />
6+
<img src="https://github.com/dcastil/tailwind-merge/raw/[email protected]/packages/tailwind-merge/assets/logo.svg" alt="tailwind-merge" height="150px" />
77
</a>
88
</div>
99

@@ -20,19 +20,19 @@ twMerge('px-2 py-1 bg-red hover:bg-dark-red', 'p-3 bg-[#B91C1C]')
2020

2121
- Supports Tailwind v4.0 up to v4.3 (if you use Tailwind v3, use [tailwind-merge v2.6.0](https://github.com/dcastil/tailwind-merge/tree/v2.6.0))
2222
- Works in all modern browsers and maintained Node versions
23-
- Fully typed
23+
- Fully typed, with published declarations compatible with TypeScript 3.8 and newer
2424
- [Check bundle size on Bundlephobia](https://bundlephobia.com/package/tailwind-merge)
2525

2626
## Get started
2727

28-
- [What is it for](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/what-is-it-for.md)
29-
- [When and how to use it](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/when-and-how-to-use-it.md)
30-
- [Features](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/features.md)
31-
- [Limitations](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/limitations.md)
32-
- [Configuration](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/configuration.md)
33-
- [Recipes](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/recipes.md)
34-
- [API reference](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/api-reference.md)
35-
- [Writing plugins](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/writing-plugins.md)
36-
- [Versioning](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/versioning.md)
37-
- [Contributing](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/contributing.md)
38-
- [Similar packages](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/similar-packages.md)
28+
- [What is it for](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/what-is-it-for.md)
29+
- [When and how to use it](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/when-and-how-to-use-it.md)
30+
- [Features](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/features.md)
31+
- [Limitations](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/limitations.md)
32+
- [Configuration](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/configuration.md)
33+
- [Recipes](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/recipes.md)
34+
- [API reference](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/api-reference.md)
35+
- [Writing plugins](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/writing-plugins.md)
36+
- [Versioning](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/versioning.md)
37+
- [Contributing](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/contributing.md)
38+
- [Similar packages](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/similar-packages.md)

‎packages/tailwind-merge/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tailwind-merge",
3-
"version": "3.6.0",
3+
"version": "3.7.0",
44
"description": "Merge Tailwind CSS classes without style conflicts",
55
"keywords": [
66
"tailwindcss",

‎packages/tailwind-merge/src/lib/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ type NoInferString<T extends string> = T extends infer S ? S & string : never
205205
* If you want to use a scale that is not supported in the `ThemeObject` type,
206206
* consider using `classGroups` instead of `theme`.
207207
*
208-
* @see https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/configuration.md#theme
208+
* @see https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/configuration.md#theme
209209
* (the list of supported keys may vary between `tailwind-merge` versions)
210210
*/
211211
export type DefaultThemeGroupIds =

‎packages/vite/docs/api-reference.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ The stable import surface. While Vite runs, it serves the module generated from
4646

4747
### `twMerge`
4848

49-
[tailwind-merge's `twMerge`](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/api-reference.md#twmerge), configured for your theme.
49+
[tailwind-merge's `twMerge`](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/api-reference.md#twmerge), configured for your theme.
5050

5151
### `getConfig`
5252

5353
Returns the generated configuration object, freshly built per call. Useful for composing with wrapper libraries or inspecting what was generated.
5454

5555
### `extendTailwindMerge`
5656

57-
Like [tailwind-merge's `extendTailwindMerge`](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/api-reference.md#extendtailwindmerge), but it extends **your generated configuration** instead of the default one — which is what you want when adding class groups that don't come from your CSS:
57+
Like [tailwind-merge's `extendTailwindMerge`](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/api-reference.md#extendtailwindmerge), but it extends **your generated configuration** instead of the default one — which is what you want when adding class groups that don't come from your CSS:
5858

5959
```ts
6060
import { extendTailwindMerge } from '@tailwind-merge/vite/runtime'
@@ -72,7 +72,7 @@ Generated configurations carry resolved scales inline, so changing only `theme`
7272

7373
### `twJoin`, `createTailwindMerge`, `mergeConfigs`, `validators`
7474

75-
Re-exported unchanged from tailwind-merge, so customization never requires a direct tailwind-merge dependency. See the [tailwind-merge API reference](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/api-reference.md).
75+
Re-exported unchanged from tailwind-merge, so customization never requires a direct tailwind-merge dependency. See the [tailwind-merge API reference](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/api-reference.md).
7676

7777
### Types
7878

‎packages/vite/docs/versioning.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ This package follows [SemVer](https://semver.org), with the pre-1.0 reading spel
1111
- The stable surface the versioning promises apply to is the **plugin's options** and the **`@tailwind-merge/vite/runtime` exports**. Everything else — the shape of the generated module, the internal `/tailwind-merge` subpath, the config-generation machinery — is internal and may change in any release.
1212
- The tailwind-merge dependency is an implementation detail: plugin releases must select a compatible library version for both generation and runtime. Before the first release, local trials must supply matching checkout builds; the old registry library does not satisfy the generator's new API requirements.
1313

14-
Once 1.0.0 ships, breaking changes will only happen in major releases, following the same practice as [tailwind-merge's versioning](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/versioning.md).
14+
Once 1.0.0 ships, breaking changes will only happen in major releases, following the same practice as [tailwind-merge's versioning](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/versioning.md).

‎packages/vite/docs/what-is-it-for.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The standalone tailwind-merge package can't know *your* theme, so its default co
66

77
- A custom font size `--text-huge: 2.5rem` produces `text-huge`, which the default config misreads as a text **color** — so `twMerge('text-huge text-sm')` keeps both classes and your element gets an ambiguous font size ([tailwind-merge#684](https://github.com/dcastil/tailwind-merge/issues/684)).
88
- Whole namespaces the default config doesn't model — `--z-index-*`, `--border-width-*`, utility-specific colors like `--text-color-*` — silently fall through to wrong groups.
9-
- The manual fix is [configuring tailwind-merge by hand](https://github.com/dcastil/tailwind-merge/blob/v3.6.0/docs/configuration.md) and keeping that configuration in sync with your theme forever.
9+
- The manual fix is [configuring tailwind-merge by hand](https://github.com/dcastil/tailwind-merge/blob/[email protected]/packages/tailwind-merge/docs/configuration.md) and keeping that configuration in sync with your theme forever.
1010

1111
This plugin automates that configuration work. At dev-server start and at build time, it loads your CSS through Tailwind's APIs, including theme overrides, resets, `@utility`, `@plugin`, `@config`, and prefixes, and generates a configuration for that resolved theme. Custom utilities even get conflict inference: a `btn` utility that sets padding will correctly override an earlier `p-4`.
1212

0 commit comments

Comments
 (0)