Skip to content

Commit 8dcdb66

Browse files
authored
Bump dependencies (tailwindlabs#20095)
This PR bumps some of our dependencies, common dependencies were moved to pnpm's `catalog` feature. Closes tailwindlabs#20092 Closes tailwindlabs#20085 Closes tailwindlabs#20075 Closes tailwindlabs#20066 Closes tailwindlabs#20062 ## Test plan - All tests still pass - Each dependency was published some time ago. Webpack has an even newer version that was published <15min ago. Will update that one later. [ci-all]
1 parent 161569a commit 8dcdb66

16 files changed

Lines changed: 580 additions & 564 deletions

File tree

integrations/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"devDependencies": {
6-
"dedent": "1.7.1",
6+
"dedent": "catalog:",
77
"fast-glob": "^3.3.3",
88
"source-map-js": "^1.2.1"
99
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848
},
4949
"license": "MIT",
5050
"devDependencies": {
51-
"@playwright/test": "^1.59.1",
51+
"@playwright/test": "^1.60.0",
5252
"@types/node": "catalog:",
53-
"postcss": "8.5.14",
53+
"postcss": "catalog:",
5454
"postcss-import": "^16.1.1",
5555
"prettier": "catalog:",
5656
"prettier-plugin-embed": "^0.5.1",
5757
"prettier-plugin-organize-imports": "^4.3.0",
5858
"tsup": "^8.5.1",
59-
"turbo": "^2.9.6",
59+
"turbo": "^2.9.14",
6060
"typescript": "^5.9.3",
61-
"vitest": "^4.1.5"
61+
"vitest": "^4.1.7"
6262
},
6363
"packageManager": "pnpm@9.6.0",
6464
"pnpm": {

packages/@tailwindcss-browser/playwright.config.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default defineConfig({
1414
/* Opt out of parallel tests on CI. */
1515
workers: process.env.CI ? 1 : undefined,
1616
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
17-
reporter: 'html',
17+
reporter: [['html', { open: 'never' }]],
1818
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
1919
use: {
2020
/* Base URL to use in actions like `await page.goto('/')`. */
@@ -30,10 +30,11 @@ export default defineConfig({
3030
name: 'chromium',
3131
use: { ...devices['Desktop Chrome'] },
3232
},
33-
{
34-
name: 'webkit',
35-
use: { ...devices['Desktop Safari'] },
36-
},
33+
// Playwright 1.60's Windows WebKit worker hangs on shutdown after all tests
34+
// pass, causing CI to fail with a worker force-kill error.
35+
...(process.platform === 'win32'
36+
? []
37+
: [{ name: 'webkit', use: { ...devices['Desktop Safari'] } }]),
3738
{
3839
name: 'firefox',
3940
use: {

packages/@tailwindcss-browser/tests/ui.spec.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ test.beforeAll(async ({}, info) => {
99
server = await createServer()
1010
})
1111

12+
test.afterAll(async () => {
13+
await server.close()
14+
})
15+
1216
test('basic', async ({ page }) => {
1317
await server.render({
1418
page,
@@ -166,6 +170,7 @@ async function createServer() {
166170
return {
167171
app,
168172
url: listener.url,
173+
close: listener.close,
169174
render,
170175
}
171176
}

packages/@tailwindcss-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@parcel/watcher": "^2.5.1",
3333
"@tailwindcss/node": "workspace:*",
3434
"@tailwindcss/oxide": "workspace:*",
35-
"enhanced-resolve": "^5.21.0",
35+
"enhanced-resolve": "catalog:",
3636
"mri": "^1.2.0",
3737
"picocolors": "^1.1.1",
3838
"tailwindcss": "workspace:*"

packages/@tailwindcss-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
},
5555
"dependencies": {
5656
"@jridgewell/remapping": "^2.3.5",
57-
"enhanced-resolve": "^5.21.0",
57+
"enhanced-resolve": "catalog:",
5858
"jiti": "^2.7.0",
5959
"lightningcss": "catalog:",
6060
"magic-string": "^0.30.21",

packages/@tailwindcss-postcss/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
"@alloc/quick-lru": "^5.2.0",
3434
"@tailwindcss/node": "workspace:*",
3535
"@tailwindcss/oxide": "workspace:*",
36-
"postcss": "^8.5.10",
36+
"postcss": "catalog:",
3737
"tailwindcss": "workspace:*"
3838
},
3939
"devDependencies": {
4040
"@types/node": "catalog:",
4141
"@types/postcss-import": "14.0.3",
42-
"dedent": "1.7.2",
42+
"dedent": "catalog:",
4343
"internal-example-plugin": "workspace:*",
4444
"postcss-import": "^16.1.1"
4545
}

packages/@tailwindcss-standalone/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@tailwindcss/forms": "^0.5.11",
3131
"@tailwindcss/typography": "^0.5.19",
3232
"detect-libc": "1.0.3",
33-
"enhanced-resolve": "^5.21.0",
33+
"enhanced-resolve": "catalog:",
3434
"tailwindcss": "workspace:*"
3535
},
3636
"__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.",
@@ -42,8 +42,8 @@
4242
"@parcel/watcher-linux-x64-glibc": "^2.5.6",
4343
"@parcel/watcher-linux-x64-musl": "^2.5.6",
4444
"@parcel/watcher-win32-x64": "^2.5.6",
45-
"@types/bun": "^1.3.13",
46-
"bun": "^1.3.13",
45+
"@types/bun": "^1.3.14",
46+
"bun": "^1.3.14",
4747
"lightningcss-darwin-arm64": "catalog:",
4848
"lightningcss-darwin-x64": "catalog:",
4949
"lightningcss-linux-arm64-gnu": "catalog:",

packages/@tailwindcss-upgrade/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
"dependencies": {
3030
"@tailwindcss/node": "workspace:*",
3131
"@tailwindcss/oxide": "workspace:*",
32-
"dedent": "1.7.2",
33-
"enhanced-resolve": "^5.21.0",
32+
"dedent": "catalog:",
33+
"enhanced-resolve": "catalog:",
3434
"globby": "^16.2.0",
3535
"jiti": "^2.7.0",
3636
"mri": "^1.2.0",
3737
"picocolors": "^1.1.1",
38-
"postcss": "^8.5.10",
38+
"postcss": "catalog:",
3939
"postcss-import": "^16.1.1",
4040
"postcss-selector-parser": "^7.1.1",
4141
"prettier": "catalog:",
42-
"semver": "^7.7.4",
42+
"semver": "^7.8.0",
4343
"tailwindcss": "workspace:*",
4444
"tree-sitter": "^0.22.4",
4545
"tree-sitter-typescript": "^0.23.2"

packages/tailwindcss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
"@jridgewell/remapping": "^2.3.5",
131131
"@tailwindcss/oxide": "workspace:^",
132132
"@types/node": "catalog:",
133-
"dedent": "1.7.2",
133+
"dedent": "catalog:",
134134
"lightningcss": "catalog:",
135135
"magic-string": "^0.30.21",
136136
"source-map-js": "^1.2.1"

0 commit comments

Comments
 (0)