From 43da8f12d8ebd9f392aef6887e9c2887b0b6acee Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Tue, 18 Feb 2025 11:36:15 +0100 Subject: [PATCH 1/3] pin versions of `tailwindcss` and `@tailwindcss/*` --- packages/@tailwindcss-cli/package.json | 4 ++-- packages/@tailwindcss-postcss/package.json | 4 ++-- packages/@tailwindcss-standalone/package.json | 4 ++-- packages/@tailwindcss-upgrade/package.json | 4 ++-- packages/@tailwindcss-vite/package.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/@tailwindcss-cli/package.json b/packages/@tailwindcss-cli/package.json index dabba012b23f..a335a85274e6 100644 --- a/packages/@tailwindcss-cli/package.json +++ b/packages/@tailwindcss-cli/package.json @@ -30,8 +30,8 @@ }, "dependencies": { "@parcel/watcher": "^2.5.1", - "@tailwindcss/node": "workspace:^", - "@tailwindcss/oxide": "workspace:^", + "@tailwindcss/node": "workspace:*", + "@tailwindcss/oxide": "workspace:*", "enhanced-resolve": "^5.18.1", "lightningcss": "catalog:", "mri": "^1.2.0", diff --git a/packages/@tailwindcss-postcss/package.json b/packages/@tailwindcss-postcss/package.json index 73235a0a2846..5170cbeb3072 100644 --- a/packages/@tailwindcss-postcss/package.json +++ b/packages/@tailwindcss-postcss/package.json @@ -31,8 +31,8 @@ }, "dependencies": { "@alloc/quick-lru": "^5.2.0", - "@tailwindcss/node": "workspace:^", - "@tailwindcss/oxide": "workspace:^", + "@tailwindcss/node": "workspace:*", + "@tailwindcss/oxide": "workspace:*", "lightningcss": "catalog:", "postcss": "^8.4.41", "tailwindcss": "workspace:*" diff --git a/packages/@tailwindcss-standalone/package.json b/packages/@tailwindcss-standalone/package.json index c8ade6050f6f..61b956714974 100644 --- a/packages/@tailwindcss-standalone/package.json +++ b/packages/@tailwindcss-standalone/package.json @@ -26,12 +26,12 @@ ], "dependencies": { "@tailwindcss/aspect-ratio": "^0.4.2", - "@tailwindcss/cli": "workspace:^", + "@tailwindcss/cli": "workspace:*", "@tailwindcss/forms": "^0.5.10", "@tailwindcss/typography": "^0.5.16", "detect-libc": "1.0.3", "enhanced-resolve": "^5.18.1", - "tailwindcss": "workspace:^" + "tailwindcss": "workspace:*" }, "__notes": "These binary packages must be included so Bun can build the CLI for all supported platforms. We also rely on Lightning CSS and Parcel being patched so Bun can statically analyze the executables.", "devDependencies": { diff --git a/packages/@tailwindcss-upgrade/package.json b/packages/@tailwindcss-upgrade/package.json index 12a24f57591d..729dfdf1b1fe 100644 --- a/packages/@tailwindcss-upgrade/package.json +++ b/packages/@tailwindcss-upgrade/package.json @@ -27,8 +27,8 @@ "access": "public" }, "dependencies": { - "@tailwindcss/node": "workspace:^", - "@tailwindcss/oxide": "workspace:^", + "@tailwindcss/node": "workspace:*", + "@tailwindcss/oxide": "workspace:*", "braces": "^3.0.3", "dedent": "1.5.3", "enhanced-resolve": "^5.18.1", diff --git a/packages/@tailwindcss-vite/package.json b/packages/@tailwindcss-vite/package.json index 3e7291b4dbf0..33de50cbf94b 100644 --- a/packages/@tailwindcss-vite/package.json +++ b/packages/@tailwindcss-vite/package.json @@ -28,8 +28,8 @@ } }, "dependencies": { - "@tailwindcss/node": "workspace:^", - "@tailwindcss/oxide": "workspace:^", + "@tailwindcss/node": "workspace:*", + "@tailwindcss/oxide": "workspace:*", "lightningcss": "catalog:", "tailwindcss": "workspace:*" }, From 2e9aedd27eb697d6f453903e2392d943263e7e72 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Tue, 18 Feb 2025 11:39:44 +0100 Subject: [PATCH 2/3] update pnpm-lock.yaml --- pnpm-lock.yaml | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 184dc4e98bf4..05f8d1a2327e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -156,10 +156,10 @@ importers: specifier: ^2.5.1 version: 2.5.1(patch_hash=zs2vvlrje3h42xp5ed2v44fep4) '@tailwindcss/node': - specifier: workspace:^ + specifier: workspace:* version: link:../@tailwindcss-node '@tailwindcss/oxide': - specifier: workspace:^ + specifier: workspace:* version: link:../../crates/node enhanced-resolve: specifier: ^5.18.1 @@ -195,10 +195,10 @@ importers: specifier: ^5.2.0 version: 5.2.0 '@tailwindcss/node': - specifier: workspace:^ + specifier: workspace:* version: link:../@tailwindcss-node '@tailwindcss/oxide': - specifier: workspace:^ + specifier: workspace:* version: link:../../crates/node lightningcss: specifier: 'catalog:' @@ -232,7 +232,7 @@ importers: specifier: ^0.4.2 version: 0.4.2(tailwindcss@packages+tailwindcss) '@tailwindcss/cli': - specifier: workspace:^ + specifier: workspace:* version: link:../@tailwindcss-cli '@tailwindcss/forms': specifier: ^0.5.10 @@ -247,7 +247,7 @@ importers: specifier: ^5.18.1 version: 5.18.1 tailwindcss: - specifier: workspace:^ + specifier: workspace:* version: link:../tailwindcss devDependencies: '@parcel/watcher-darwin-arm64': @@ -302,10 +302,10 @@ importers: packages/@tailwindcss-upgrade: dependencies: '@tailwindcss/node': - specifier: workspace:^ + specifier: workspace:* version: link:../@tailwindcss-node '@tailwindcss/oxide': - specifier: workspace:^ + specifier: workspace:* version: link:../../crates/node braces: specifier: ^3.0.3 @@ -363,10 +363,10 @@ importers: packages/@tailwindcss-vite: dependencies: '@tailwindcss/node': - specifier: workspace:^ + specifier: workspace:* version: link:../@tailwindcss-node '@tailwindcss/oxide': - specifier: workspace:^ + specifier: workspace:* version: link:../../crates/node lightningcss: specifier: 'catalog:' @@ -1400,7 +1400,6 @@ packages: '@parcel/watcher-darwin-arm64@2.5.1': resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==} engines: {node: '>= 10.0.0'} - cpu: [arm64] os: [darwin] '@parcel/watcher-darwin-x64@2.5.0': @@ -1412,7 +1411,6 @@ packages: '@parcel/watcher-darwin-x64@2.5.1': resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==} engines: {node: '>= 10.0.0'} - cpu: [x64] os: [darwin] '@parcel/watcher-freebsd-x64@2.5.0': @@ -1460,7 +1458,6 @@ packages: '@parcel/watcher-linux-arm64-glibc@2.5.1': resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==} engines: {node: '>= 10.0.0'} - cpu: [arm64] os: [linux] '@parcel/watcher-linux-arm64-musl@2.5.0': @@ -1472,7 +1469,6 @@ packages: '@parcel/watcher-linux-arm64-musl@2.5.1': resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==} engines: {node: '>= 10.0.0'} - cpu: [arm64] os: [linux] '@parcel/watcher-linux-x64-glibc@2.5.0': @@ -1484,7 +1480,6 @@ packages: '@parcel/watcher-linux-x64-glibc@2.5.1': resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==} engines: {node: '>= 10.0.0'} - cpu: [x64] os: [linux] '@parcel/watcher-linux-x64-musl@2.5.0': @@ -1496,7 +1491,6 @@ packages: '@parcel/watcher-linux-x64-musl@2.5.1': resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==} engines: {node: '>= 10.0.0'} - cpu: [x64] os: [linux] '@parcel/watcher-wasm@2.5.0': @@ -1538,7 +1532,6 @@ packages: '@parcel/watcher-win32-x64@2.5.1': resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==} engines: {node: '>= 10.0.0'} - cpu: [x64] os: [win32] '@parcel/watcher@2.5.0': @@ -1941,13 +1934,11 @@ packages: bun@1.1.29: resolution: {integrity: sha512-SKhpyKNZtgxrVel9ec9xon3LDv8mgpiuFhARgcJo1YIbggY2PBrKHRNiwQ6Qlb+x3ivmRurfuwWgwGexjpgBRg==} - cpu: [arm64, x64] os: [darwin, linux, win32] hasBin: true bun@1.1.43: resolution: {integrity: sha512-8Acq5NuECRXx62jVera3rnLcsaHh4/k5Res3dOQFv783nyRKo39W3DHlenGlXB9bNWbtRybBEvkKaH+zdwzLHw==} - cpu: [arm64, x64, aarch64] os: [darwin, linux, win32] hasBin: true @@ -2763,13 +2754,11 @@ packages: lightningcss-darwin-arm64@1.29.1: resolution: {integrity: sha512-HtR5XJ5A0lvCqYAoSv2QdZZyoHNttBpa5EP9aNuzBQeKGfbyH5+UipLWvVzpP4Uml5ej4BYs5I9Lco9u1fECqw==} engines: {node: '>= 12.0.0'} - cpu: [arm64] os: [darwin] lightningcss-darwin-x64@1.29.1: resolution: {integrity: sha512-k33G9IzKUpHy/J/3+9MCO4e+PzaFblsgBjSGlpAaFikeBFm8B/CkO3cKU9oI4g+fjS2KlkLM/Bza9K/aw8wsNA==} engines: {node: '>= 12.0.0'} - cpu: [x64] os: [darwin] lightningcss-freebsd-x64@1.29.1: @@ -2787,25 +2776,21 @@ packages: lightningcss-linux-arm64-gnu@1.29.1: resolution: {integrity: sha512-0+vClRIZ6mmJl/dxGuRsE197o1HDEeeRk6nzycSy2GofC2JsY4ifCRnvUWf/CUBQmlrvMzt6SMQNMSEu22csWQ==} engines: {node: '>= 12.0.0'} - cpu: [arm64] os: [linux] lightningcss-linux-arm64-musl@1.29.1: resolution: {integrity: sha512-UKMFrG4rL/uHNgelBsDwJcBqVpzNJbzsKkbI3Ja5fg00sgQnHw/VrzUTEc4jhZ+AN2BvQYz/tkHu4vt1kLuJyw==} engines: {node: '>= 12.0.0'} - cpu: [arm64] os: [linux] lightningcss-linux-x64-gnu@1.29.1: resolution: {integrity: sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==} engines: {node: '>= 12.0.0'} - cpu: [x64] os: [linux] lightningcss-linux-x64-musl@1.29.1: resolution: {integrity: sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==} engines: {node: '>= 12.0.0'} - cpu: [x64] os: [linux] lightningcss-win32-arm64-msvc@1.29.1: @@ -2817,7 +2802,6 @@ packages: lightningcss-win32-x64-msvc@1.29.1: resolution: {integrity: sha512-NygcbThNBe4JElP+olyTI/doBNGJvLs3bFCRPdvuCcxZCcCZ71B858IHpdm7L1btZex0FvCmM17FK98Y9MRy1Q==} engines: {node: '>= 12.0.0'} - cpu: [x64] os: [win32] lightningcss@1.29.1: @@ -5537,7 +5521,7 @@ snapshots: debug: 4.3.7 enhanced-resolve: 5.18.1 eslint: 9.19.0(jiti@2.4.2) - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@2.4.2)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@2.4.2)))(eslint@9.19.0(jiti@2.4.2)) fast-glob: 3.3.3 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 @@ -5556,7 +5540,7 @@ snapshots: debug: 4.3.7 enhanced-resolve: 5.18.1 eslint: 9.19.0(jiti@2.4.2) - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@2.4.2)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@2.4.2)))(eslint@9.19.0(jiti@2.4.2)) fast-glob: 3.3.3 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 @@ -5569,7 +5553,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@2.4.2)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@2.4.2)))(eslint@9.19.0(jiti@2.4.2)): dependencies: debug: 3.2.7 optionalDependencies: @@ -5580,7 +5564,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@2.4.2)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@2.4.2)))(eslint@9.19.0(jiti@2.4.2)): dependencies: debug: 3.2.7 optionalDependencies: @@ -5602,7 +5586,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.19.0(jiti@2.4.2) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@2.4.2)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@2.4.2)))(eslint@9.19.0(jiti@2.4.2)) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -5631,7 +5615,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.19.0(jiti@2.4.2) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@2.4.2)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.19.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@2.4.2)))(eslint@9.19.0(jiti@2.4.2)) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 From fb8ab3dda6b8b1e38b33c9f0a82458cf75738b0c Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Tue, 18 Feb 2025 11:40:02 +0100 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0022128f371..05fee5027c13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Ensure drop shadow utilities don't inherit unexpectedly ([#16471](https://github.com/tailwindlabs/tailwindcss/pull/16471)) - Export backwards compatible config and plugin types from `tailwindcss/plugin` ([#16505](https://github.com/tailwindlabs/tailwindcss/pull/16505)) - Ensure JavaScript plugins that emit nested rules referencing to the utility name work as expected ([#16539](https://github.com/tailwindlabs/tailwindcss/pull/16539)) +- Pin exact versions of `tailwindcss` and `@tailwindcss/*` ([#16623](https://github.com/tailwindlabs/tailwindcss/pull/16623)) - Upgrade: Report errors when updating dependencies ([#16504](https://github.com/tailwindlabs/tailwindcss/pull/16504)) - Upgrade: Ensure a `darkMode` JS config setting with block syntax converts to use `@slot` ([#16507](https://github.com/tailwindlabs/tailwindcss/pull/16507))