Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ pnpm-lock.yaml
target/
crates/node/index.d.ts
crates/node/index.js
crates/ignore/
.next
.fingerprint
6 changes: 3 additions & 3 deletions crates/node/npm/wasm32-wasi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"browser": "tailwindcss-oxide.wasi-browser.js",
"dependencies": {
"@napi-rs/wasm-runtime": "^1.1.1",
"@emnapi/core": "^1.7.1",
"@emnapi/runtime": "^1.7.1",
"@emnapi/core": "^1.8.1",
"@emnapi/runtime": "^1.8.1",
"@tybys/wasm-util": "^0.10.1",
"@emnapi/wasi-threads": "^1.1.0",
"tslib": "^2.4.0"
"tslib": "^2.8.1"
},
"bundledDependencies": [
"@napi-rs/wasm-runtime",
Expand Down
2 changes: 1 addition & 1 deletion crates/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"devDependencies": {
"@napi-rs/cli": "3.4.1",
"@napi-rs/wasm-runtime": "^1.1.1",
"emnapi": "1.7.1"
"emnapi": "1.8.1"
},
"engines": {
"node": ">= 20"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@
},
"license": "MIT",
"devDependencies": {
"@playwright/test": "^1.57.0",
"@playwright/test": "^1.58.0",
"@types/node": "catalog:",
"postcss": "8.5.6",
"postcss-import": "^16.1.1",
"prettier": "catalog:",
"prettier-plugin-embed": "^0.5.1",
"prettier-plugin-organize-imports": "^4.3.0",
"tsup": "^8.5.1",
"turbo": "^2.7.2",
"turbo": "^2.7.6",
"typescript": "^5.5.4",
"vitest": "^4.0.3"
"vitest": "^4.0.18"
},
"packageManager": "pnpm@9.6.0",
"pnpm": {
"patchedDependencies": {
"lightningcss@1.30.2": "patches/lightningcss@1.30.2.patch",
"lightningcss@1.31.1": "patches/lightningcss@1.31.1.patch",
"@parcel/watcher@2.5.1": "patches/@parcel__watcher@2.5.1.patch"
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@tailwindcss-browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"access": "public"
},
"devDependencies": {
"h3": "^1.15.4",
"h3": "^1.15.5",
"listhen": "^1.9.0",
"tailwindcss": "workspace:*"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@tailwindcss-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}
},
"dependencies": {
"@jridgewell/remapping": "^2.3.4",
"@jridgewell/remapping": "^2.3.5",
"enhanced-resolve": "^5.18.4",
"jiti": "^2.6.1",
"lightningcss": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/@tailwindcss-postcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@alloc/quick-lru": "^5.2.0",
"@tailwindcss/node": "workspace:*",
"@tailwindcss/oxide": "workspace:*",
"postcss": "^8.4.41",
"postcss": "^8.5.6",
"tailwindcss": "workspace:*"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `

@layer theme {
:root, :host {
--font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",
"Noto Color Emoji";
--font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
monospace;
--color-black: #000;
--text-2xl: 1.5rem;
--text-2xl--line-height: calc(2 / 1.5);
Expand Down
18 changes: 9 additions & 9 deletions packages/@tailwindcss-standalone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
},
"__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": {
"@parcel/watcher-darwin-arm64": "^2.5.1",
"@parcel/watcher-darwin-x64": "^2.5.1",
"@parcel/watcher-linux-arm64-glibc": "^2.5.1",
"@parcel/watcher-linux-arm64-musl": "^2.5.1",
"@parcel/watcher-linux-x64-glibc": "^2.5.1",
"@parcel/watcher-linux-x64-musl": "^2.5.1",
"@parcel/watcher-win32-x64": "^2.5.1",
"@types/bun": "^1.3.5",
"bun": "^1.3.5",
"@parcel/watcher-darwin-arm64": "^2.5.6",
"@parcel/watcher-darwin-x64": "^2.5.6",
"@parcel/watcher-linux-arm64-glibc": "^2.5.6",
"@parcel/watcher-linux-arm64-musl": "^2.5.6",
"@parcel/watcher-linux-x64-glibc": "^2.5.6",
"@parcel/watcher-linux-x64-musl": "^2.5.6",
"@parcel/watcher-win32-x64": "^2.5.6",
"@types/bun": "^1.3.7",
"bun": "^1.3.7",
"lightningcss-darwin-arm64": "catalog:",
"lightningcss-darwin-x64": "catalog:",
"lightningcss-linux-arm64-gnu": "catalog:",
Expand Down
10 changes: 4 additions & 6 deletions packages/@tailwindcss-standalone/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,10 @@ Bun.plugin({
'tailwindcss/plugin': await import('tailwindcss/plugin'),
'tailwindcss/plugin.js': await import('tailwindcss/plugin'),
'tailwindcss/package.json': await import('tailwindcss/package.json'),
'tailwindcss/lib/util/flattenColorPalette': await import(
'tailwindcss/lib/util/flattenColorPalette'
),
'tailwindcss/lib/util/flattenColorPalette.js': await import(
'tailwindcss/lib/util/flattenColorPalette'
),
'tailwindcss/lib/util/flattenColorPalette':
await import('tailwindcss/lib/util/flattenColorPalette'),
'tailwindcss/lib/util/flattenColorPalette.js':
await import('tailwindcss/lib/util/flattenColorPalette'),
'tailwindcss/defaultTheme': await import('tailwindcss/defaultTheme'),
'tailwindcss/defaultTheme.js': await import('tailwindcss/defaultTheme'),
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@tailwindcss-upgrade/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"jiti": "^2.0.0-beta.3",
"mri": "^1.2.0",
"picocolors": "^1.1.1",
"postcss": "^8.4.41",
"postcss": "^8.5.6",
"postcss-import": "^16.1.1",
"postcss-selector-parser": "^7.1.1",
"prettier": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"utilities.css"
],
"devDependencies": {
"@jridgewell/remapping": "^2.3.4",
"@jridgewell/remapping": "^2.3.5",
"@tailwindcss/oxide": "workspace:^",
"@types/node": "catalog:",
"dedent": "1.7.1",
Expand Down
6 changes: 4 additions & 2 deletions packages/tailwindcss/src/__snapshots__/index.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
exports[`compiling CSS > prefix all CSS variables inside preflight 1`] = `
"@layer theme {
:root, :host {
--tw-font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--tw-font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--tw-font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",
"Noto Color Emoji";
--tw-font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
monospace;
--tw-default-font-family: var(--tw-font-sans);
--tw-default-mono-font-family: var(--tw-font-mono);
}
Expand Down
3 changes: 2 additions & 1 deletion packages/tailwindcss/src/css-functions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ describe('--theme(…)', () => {
),
).toMatchInlineSnapshot(`
":root, :host {
--tw-font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--tw-font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
"Segoe UI Symbol", "Noto Color Emoji";
--tw-default-font-family: var(--tw-font-sans);
}

Expand Down
5 changes: 3 additions & 2 deletions packages/tailwindcss/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,8 @@ describe('Parsing theme values from CSS', () => {
),
).toMatchInlineSnapshot(`
":root, :host {
--animate-very-long-animation-name: very-long-animation-name var(--very-long-animation-name-configuration, 2.5s ease-in-out 0s infinite normal none running);
--animate-very-long-animation-name: very-long-animation-name
var(--very-long-animation-name-configuration, 2.5s ease-in-out 0s infinite normal none running);
Comment on lines +1564 to +1565
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The weird formatting here is because it's formatted this way in the input of the test above. The latest version of Lightning CSS doesn't normalize whitespace in custom properties anymore, which maps to the spec https://drafts.csswg.org/css-variables/#serializing-custom-props

Specified values of custom properties must be serialized exactly as specified by the author (with one exception, below). Simplifications that might occur in other properties, such as dropping comments, normalizing whitespace, reserializing numeric tokens from their value, etc., must not occur.

The one exception to serialization being precisely as specified in the source file is that an empty custom property (such as --foo:;) must serialize with a single space as its value.

}

.animate-very-long-animation-name {
Expand Down Expand Up @@ -5650,7 +5651,7 @@ describe('`color-mix(…)` polyfill', () => {

@supports (color: color-mix(in lab, red, red)) {
.text-red-500\\/50 {
color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
color: color-mix(in oklab,var(--color-red-500)50%,transparent);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The input doesn't contain spaces, so this one doesn't contain spaces either. While this looks a little bit odd, it's correct. This is also the output we would produce in Tailwind Play or the CDN because we don't use Lightning CSS there.

}
}"
`)
Expand Down
Loading