Skip to content

Commit 8ed9a80

Browse files
authored
Merge branch 'main' into fix/accidental-removal
2 parents 603b135 + cec7f05 commit 8ed9a80

File tree

5 files changed

+38
-0
lines changed

5 files changed

+38
-0
lines changed

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
- vite
3131
- cli
3232
- postcss
33+
- workers
3334

3435
# Exclude windows and macos from being built on feature branches
3536
on-main-branch:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2727
- Use the `oklab(…)` function when applying opacity to `currentColor` to work around a crash in Safari 16.4 and 16.5 ([#17247](https://github.com/tailwindlabs/tailwindcss/pull/17247))
2828
- Pre-process `<template lang="…">` in Vue files ([#17252](https://github.com/tailwindlabs/tailwindcss/pull/17252))
2929
- Remove redundant `line-height: initial` from Preflight ([#15212](https://github.com/tailwindlabs/tailwindcss/pull/15212))
30+
- Prevent segfault when loaded in a worker thread on Linux ([#17276](https://github.com/tailwindlabs/tailwindcss/pull/17276))
3031
- Ensure multiple `--value(…)` or `--modifier(…)` calls don't delete subsequent declarations ([#17273](https://github.com/tailwindlabs/tailwindcss/pull/17273))
3132

3233
## [4.0.14] - 2025-03-13

crates/node/.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ linker = "arm-linux-gnueabihf-gcc"
1010
rustflags = ["-C", "target-feature=+crt-static"]
1111
[target.aarch64-pc-windows-msvc]
1212
rustflags = ["-C", "target-feature=+crt-static"]
13+
[target.'cfg(target_env = "gnu")']
14+
rustflags = ["-C", "link-args=-Wl,-z,nodelete"]

integrations/workers/index.test.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { js, json, test } from '../utils'
2+
3+
test(
4+
'@tailwindcss/oxide can be loaded into a Node.js worker thread',
5+
{
6+
fs: {
7+
'package.json': json`
8+
{
9+
"dependencies": {
10+
"@tailwindcss/oxide": "workspace:^"
11+
}
12+
}
13+
`,
14+
'start.js': js`
15+
let { Worker } = require('worker_threads')
16+
new Worker('./worker.js')
17+
`,
18+
'worker.js': js`
19+
require('@tailwindcss/oxide')
20+
process.on('exit', () => console.log('worker thread exited'))
21+
`,
22+
},
23+
},
24+
async ({ exec, expect }) => {
25+
let output = await exec('node ./start.js').then(
26+
(out) => out.trim(),
27+
(err) => `${err}`,
28+
)
29+
30+
expect(output).toEqual('worker thread exited')
31+
},
32+
)

turbo.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"./build.rs",
1111
"./package.json",
1212
"./Cargo.toml",
13+
"./.cargo/config.toml",
1314
"../oxide/src/**/*",
1415
"../oxide/Cargo.toml",
1516
"../Cargo.toml",
@@ -24,6 +25,7 @@
2425
"./build.rs",
2526
"./package.json",
2627
"./Cargo.toml",
28+
"./.cargo/config.toml",
2729
"../oxide/src/**/*",
2830
"../oxide/Cargo.toml",
2931
"../Cargo.toml",

0 commit comments

Comments
 (0)