Skip to content

Commit 7d316df

Browse files
authored
Merge branch 'main' into fix/issue-19422
2 parents d4a0b01 + 0db226a commit 7d316df

65 files changed

Lines changed: 12642 additions & 10381 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
uses: actions/cache@v5
6262
with:
6363
path: |
64-
~/.cargo/bin/
6564
~/.cargo/registry/index/
6665
~/.cargo/registry/cache/
6766
~/.cargo/git/db/
@@ -88,7 +87,7 @@ jobs:
8887
run: rustup target add wasm32-wasip1-threads
8988

9089
- name: Install dependencies
91-
run: pnpm install
90+
run: pnpm install --frozen-lockfile
9291

9392
- name: Build
9493
run: pnpm run build

.github/workflows/integration-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ jobs:
7373
uses: actions/cache@v5
7474
with:
7575
path: |
76-
~/.cargo/bin/
7776
~/.cargo/registry/index/
7877
~/.cargo/registry/cache/
7978
~/.cargo/git/db/

.github/workflows/prepare-release.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ jobs:
104104
uses: actions/cache@v5
105105
with:
106106
path: |
107-
~/.cargo/bin/
108107
~/.cargo/registry/index/
109108
~/.cargo/registry/cache/
110109
~/.cargo/git/db/
@@ -146,7 +145,7 @@ jobs:
146145
run: rustup target add ${{ matrix.target }}
147146

148147
- name: Install dependencies
149-
run: pnpm install --ignore-scripts --filter=!./playgrounds/*
148+
run: pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/*
150149

151150
- name: Build release
152151
run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform --target=${{ matrix.target }} ${{ matrix.build-flags }}
@@ -204,7 +203,7 @@ jobs:
204203
chmod +x rustup-init
205204
./rustup-init -y --profile minimal
206205
source "$HOME/.cargo/env"
207-
pnpm install --ignore-scripts --filter=!./playgrounds/* || true
206+
pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/* || true
208207
echo "~~~~ rustc --version ~~~~"
209208
rustc --version
210209
echo "~~~~ node -v ~~~~"
@@ -227,8 +226,6 @@ jobs:
227226

228227
permissions:
229228
contents: write # for softprops/action-gh-release to create GitHub release
230-
# https://docs.npmjs.com/generating-provenance-statements#publishing-packages-with-provenance-via-github-actions
231-
id-token: write
232229

233230
needs:
234231
- build
@@ -262,7 +259,6 @@ jobs:
262259
uses: actions/cache@v5
263260
with:
264261
path: |
265-
~/.cargo/bin/
266262
~/.cargo/registry/index/
267263
~/.cargo/registry/cache/
268264
~/.cargo/git/db/
@@ -289,7 +285,7 @@ jobs:
289285
run: rustup target add wasm32-wasip1-threads
290286

291287
- name: Install dependencies
292-
run: pnpm --filter=!./playgrounds/* install
288+
run: pnpm --filter=!./playgrounds/* install --frozen-lockfile
293289

294290
- name: Download artifacts
295291
uses: actions/download-artifact@v7

.github/workflows/release.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ jobs:
108108
uses: actions/cache@v5
109109
with:
110110
path: |
111-
~/.cargo/bin/
112111
~/.cargo/registry/index/
113112
~/.cargo/registry/cache/
114113
~/.cargo/git/db/
@@ -150,7 +149,7 @@ jobs:
150149
run: rustup target add ${{ matrix.target }}
151150

152151
- name: Install dependencies
153-
run: pnpm install --ignore-scripts --filter=!./playgrounds/*
152+
run: pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/*
154153

155154
- name: Build release
156155
run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform --target=${{ matrix.target }} ${{ matrix.build-flags }}
@@ -214,7 +213,7 @@ jobs:
214213
node -v
215214
echo "~~~~ pnpm --version ~~~~"
216215
pnpm --version
217-
pnpm install --ignore-scripts --filter=!./playgrounds/* || true
216+
pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/* || true
218217
pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform
219218
strip -x ${{ env.OXIDE_LOCATION }}/*.node
220219
ls -la ${{ env.OXIDE_LOCATION }}
@@ -230,7 +229,7 @@ jobs:
230229
name: Build and publish Tailwind CSS
231230

232231
permissions:
233-
contents: write # for softprops/action-gh-release to create GitHub release
232+
contents: read
234233
# https://docs.npmjs.com/generating-provenance-statements#publishing-packages-with-provenance-via-github-actions
235234
id-token: write
236235

@@ -280,7 +279,6 @@ jobs:
280279
uses: actions/cache@v5
281280
with:
282281
path: |
283-
~/.cargo/bin/
284282
~/.cargo/registry/index/
285283
~/.cargo/registry/cache/
286284
~/.cargo/git/db/
@@ -307,7 +305,7 @@ jobs:
307305
run: rustup target add wasm32-wasip1-threads
308306

309307
- name: Install dependencies
310-
run: pnpm --filter=!./playgrounds/* install
308+
run: pnpm --filter=!./playgrounds/* install --frozen-lockfile
311309

312310
- name: Download artifacts
313311
uses: actions/download-artifact@v7

CHANGELOG.md

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Fixed
11+
12+
- Remove deprecation warnings by using `Module#registerHooks` instead of `Module#register` on Node 26+ ([#20028](https://github.com/tailwindlabs/tailwindcss/pull/20028))
13+
- Canonicalization: don't crash when plugin utilities throw for unsupported values ([#20052](https://github.com/tailwindlabs/tailwindcss/pull/20052))
14+
15+
## [4.3.0] - 2026-05-08
16+
1017
### Added
1118

12-
- _Experimental_: add `@container-size` utility ([#18901](https://github.com/tailwindlabs/tailwindcss/pull/18901))
19+
- Add `@container-size` utility ([#18901](https://github.com/tailwindlabs/tailwindcss/pull/18901))
20+
- Add `scrollbar-{auto,thin,none}` utilities for `scrollbar-width`, and `scrollbar-thumb-*` / `scrollbar-track-*` color utilities for `scrollbar-color` ([#19981](https://github.com/tailwindlabs/tailwindcss/pull/19981), [#20019](https://github.com/tailwindlabs/tailwindcss/pull/20019))
21+
- Add `scrollbar-gutter-*` utilities ([#20018](https://github.com/tailwindlabs/tailwindcss/pull/20018))
22+
- Add `zoom-*` utilities ([#20020](https://github.com/tailwindlabs/tailwindcss/pull/20020))
23+
- Add `tab-*` utilities ([#20022](https://github.com/tailwindlabs/tailwindcss/pull/20022))
1324
- Allow using `@variant` with stacked variants (e.g. `@variant hover:focus { … }`) ([#19996](https://github.com/tailwindlabs/tailwindcss/pull/19996))
1425
- Allow using `@variant` with compound variants (e.g. `@variant hover, focus { … }`) ([#19996](https://github.com/tailwindlabs/tailwindcss/pull/19996))
26+
- Support `--default(…)` in `--value(…)` and `--modifier(…)` for functional `@utility` definitions ([#19989](https://github.com/tailwindlabs/tailwindcss/pull/19989))
1527

1628
### Fixed
1729

@@ -20,14 +32,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2032
- Ensure CSS files containing `@variant` are processed by `@tailwindcss/vite` ([#19966](https://github.com/tailwindlabs/tailwindcss/pull/19966))
2133
- Resolve imports relative to `base` when `result.opts.from` is not provided when using `@tailwindcss/postcss` ([#19980](https://github.com/tailwindlabs/tailwindcss/pull/19980))
2234
- Canonicalization: preserve significant `_` whitespace in arbitrary values ([#19986](https://github.com/tailwindlabs/tailwindcss/pull/19986))
23-
- Canonicalization: add parentheses when removing whitespace from arbitrary values would hurt readability ([#19986](https://github.com/tailwindlabs/tailwindcss/pull/19986))
35+
- Canonicalization: add parentheses when removing whitespace from arbitrary values would hurt readability (e.g. `w-[calc(100%---spacing(60))]``w-[calc(100%-(--spacing(60)))]`) ([#19986](https://github.com/tailwindlabs/tailwindcss/pull/19986))
2436
- Canonicalization: preserve the original unit in arbitrary values instead of normalizing to base units (e.g. `-mt-[20in]``mt-[-20in]`, not `mt-[-1920px]`) ([#19988](https://github.com/tailwindlabs/tailwindcss/pull/19988))
2537
- Canonicalization: migrate arbitrary `:has()` variants from `[&:has(…)]` to `has-[…]` ([#19991](https://github.com/tailwindlabs/tailwindcss/pull/19991))
26-
- Upgrade: don’t migrate inline `style` attributes ([#19918](https://github.com/tailwindlabs/tailwindcss/pull/19918))
38+
- Upgrade: don’t migrate inline `style` attributes (e.g. `style="flex-grow: 1"``style="flex-grow: 1"`, not `style="grow: 1"`) ([#19918](https://github.com/tailwindlabs/tailwindcss/pull/19918))
2739
- Allow multiple `@utility` definitions with the same name but different value types ([#19777](https://github.com/tailwindlabs/tailwindcss/pull/19777))
2840
- Export missing `PluginWithConfig` type from `tailwindcss/plugin` to fix errors when inferring plugin config types ([#19707](https://github.com/tailwindlabs/tailwindcss/pull/19707))
2941
- Allow `@apply` to be used with CSS mixins ([#19427](https://github.com/tailwindlabs/tailwindcss/pull/19427))
3042
- Ensure `start` and `end` legacy utilities without values do not generate CSS ([#20003](https://github.com/tailwindlabs/tailwindcss/pull/20003))
43+
- Ensure `--value(…)` is required in functional `@utility` definitions ([#20005](https://github.com/tailwindlabs/tailwindcss/pull/20005))
44+
- Canonicalization: preserve required whitespace around operators in negated arbitrary values (e.g. `-left-[(var(--a)+var(--b))]`) ([#20011](https://github.com/tailwindlabs/tailwindcss/pull/20011))
3145

3246
## [4.2.4] - 2026-04-21
3347

@@ -4011,7 +4025,8 @@ No release notes
40114025

40124026
- Everything!
40134027

4014-
[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.4...HEAD
4028+
[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v4.3.0...HEAD
4029+
[4.3.0]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.4...v4.3.0
40154030
[4.2.4]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.3...v4.2.4
40164031
[4.2.3]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.2...v4.2.3
40174032
[4.2.2]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.1...v4.2.2

crates/node/npm/android-arm-eabi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tailwindcss/oxide-android-arm-eabi",
3-
"version": "4.2.4",
3+
"version": "4.3.0",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/tailwindlabs/tailwindcss.git",

crates/node/npm/android-arm64/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tailwindcss/oxide-android-arm64",
3-
"version": "4.2.4",
3+
"version": "4.3.0",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/tailwindlabs/tailwindcss.git",

crates/node/npm/darwin-arm64/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tailwindcss/oxide-darwin-arm64",
3-
"version": "4.2.4",
3+
"version": "4.3.0",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/tailwindlabs/tailwindcss.git",

crates/node/npm/darwin-x64/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tailwindcss/oxide-darwin-x64",
3-
"version": "4.2.4",
3+
"version": "4.3.0",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/tailwindlabs/tailwindcss.git",

crates/node/npm/freebsd-x64/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tailwindcss/oxide-freebsd-x64",
3-
"version": "4.2.4",
3+
"version": "4.3.0",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/tailwindlabs/tailwindcss.git",

0 commit comments

Comments
 (0)