Skip to content

Commit 77f6fca

Browse files
authored
Merge branch 'main' into fix/lock-builders
2 parents f550c72 + 298ad08 commit 77f6fca

File tree

5 files changed

+17
-45
lines changed

5 files changed

+17
-45
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- Handle when `process.env.DEBUG` is a boolean in `@tailwindcss/node` ([#18485](https://github.com/tailwindlabs/tailwindcss/pull/18485))
1717
- Ignore consecutive semicolons in the CSS parser ([#18532](https://github.com/tailwindlabs/tailwindcss/pull/18532))
1818
- Center the dropdown icon added to an input with a paired datalist ([#18511](https://github.com/tailwindlabs/tailwindcss/pull/18511))
19+
- Extract candidates in Slang templates ([#18565](https://github.com/tailwindlabs/tailwindcss/pull/18565))
1920

2021
## [4.1.11] - 2025-06-26
2122

crates/node/npm/wasm32-wasi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"browser": "tailwindcss-oxide.wasi-browser.js",
2929
"dependencies": {
30-
"@napi-rs/wasm-runtime": "^0.2.11",
30+
"@napi-rs/wasm-runtime": "^0.2.12",
3131
"@emnapi/core": "^1.4.4",
3232
"@emnapi/runtime": "^1.4.4",
3333
"@tybys/wasm-util": "^0.10.0",

crates/node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"devDependencies": {
4040
"@napi-rs/cli": "^3.0.0-alpha.78",
41-
"@napi-rs/wasm-runtime": "^0.2.11",
41+
"@napi-rs/wasm-runtime": "^0.2.12",
4242
"emnapi": "1.4.4"
4343
},
4444
"engines": {

crates/oxide/src/scanner/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ pub fn pre_process_input(content: &[u8], extension: &str) -> Vec<u8> {
488488
"json" => Json.process(content),
489489
"pug" => Pug.process(content),
490490
"rb" | "erb" => Ruby.process(content),
491-
"slim" => Slim.process(content),
491+
"slim" | "slang" => Slim.process(content),
492492
"svelte" | "rs" => Svelte.process(content),
493493
"vue" => Vue.process(content),
494494
_ => content.to_vec(),

pnpm-lock.yaml

Lines changed: 13 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)