@ht-rnd/merge-conflict-viewer 1.0.0 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -221,7 +221,7 @@ The variables are optional. If your CSS does not define one (you copied the file
|
|
|
221
221
|
|
|
222
222
|
### Tailwind v3.4 and v4
|
|
223
223
|
|
|
224
|
-
The same file works with both. It only uses utilities that exist in both (typed arbitrary values such as `bg-[color:var(--
|
|
224
|
+
The same file works with both. It only uses utilities that exist in both (typed arbitrary values such as `bg-[color:var(--mcv-modified)]`, `size-*`, no v4-only syntax) and computes the colour classes per cell in JavaScript, so there are no variant-order surprises. The registry test installs the component into a fresh Tailwind v3.4 project and a fresh v4 project, type-checks them and builds the CSS.
|
|
225
225
|
|
|
226
226
|
Tailwind v3 projects keep their theme in `tailwind.config.js`; the `--merge-*` variables are plain CSS variables referenced through arbitrary values, so nothing needs to be added to the config.
|
|
227
227
|
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ht-rnd/merge-conflict-viewer",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.1",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"description": "Headless merge conflict viewer for JSON (React hooks and merge model), with a shadcn/ui registry component",
|
|
7
7
|
"author": "ht-rnd",
|