Skip to content

Commit 1b6230f

Browse files
Rework scripting variants (#17431)
This replaces the `scripting`, `scripting-none`, and `scripting-initial` variants with one `noscript` variant that matches the name of the HTML `<noscript>` element. The previous `scripting` can then be represented as `not-noscript` e.g. `not-noscript:flex`.
1 parent 9cceeaa commit 1b6230f

File tree

4 files changed

+13
-44
lines changed

4 files changed

+13
-44
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- _Experimental_: Add `details-content` variant ([#15319](https://github.com/tailwindlabs/tailwindcss/pull/15319))
1313
- _Experimental_: Add `inverted-colors` variant ([#11693](https://github.com/tailwindlabs/tailwindcss/pull/11693))
14-
- _Experimental_: Add `scripting`, `scripting-none`, and `scripting-initial` variants ([#11929](https://github.com/tailwindlabs/tailwindcss/pull/11929))
14+
- _Experimental_: Add `noscript` variant ([#11929](https://github.com/tailwindlabs/tailwindcss/pull/11929), [#17431](https://github.com/tailwindlabs/tailwindcss/pull/17431))
1515
- _Experimental_: Add `items-baseline-last` utility ([#13888](https://github.com/tailwindlabs/tailwindcss/pull/13888))
1616
- _Experimental_: Add `pointer-none`, `pointer-coarse`, and `pointer-fine` variant ([#16946](https://github.com/tailwindlabs/tailwindcss/pull/16946))
1717
- _Experimental_: Add `any-pointer-none`, `any-pointer-coarse`, and `any-pointer-fine` variants ([#16941](https://github.com/tailwindlabs/tailwindcss/pull/16941))

packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap

+2-18
Original file line numberDiff line numberDiff line change
@@ -8472,9 +8472,7 @@ exports[`getVariants 1`] = `
84728472
"any-pointer-none",
84738473
"any-pointer-coarse",
84748474
"any-pointer-fine",
8475-
"scripting-initial",
8476-
"scripting-none",
8477-
"scripting",
8475+
"noscript",
84788476
],
84798477
},
84808478
{
@@ -9255,21 +9253,7 @@ exports[`getVariants 1`] = `
92559253
{
92569254
"hasDash": true,
92579255
"isArbitrary": false,
9258-
"name": "scripting-initial",
9259-
"selectors": [Function],
9260-
"values": [],
9261-
},
9262-
{
9263-
"hasDash": true,
9264-
"isArbitrary": false,
9265-
"name": "scripting-none",
9266-
"selectors": [Function],
9267-
"values": [],
9268-
},
9269-
{
9270-
"hasDash": true,
9271-
"isArbitrary": false,
9272-
"name": "scripting",
9256+
"name": "noscript",
92739257
"selectors": [Function],
92749258
"values": [],
92759259
},

packages/tailwindcss/src/variants.test.ts

+9-22
Original file line numberDiff line numberDiff line change
@@ -1449,6 +1449,7 @@ test('not', async () => {
14491449
'not-contrast-less:flex',
14501450
'not-forced-colors:flex',
14511451
'not-nth-2:flex',
1452+
'not-noscript:flex',
14521453

14531454
'not-sm:flex',
14541455
'not-min-sm:flex',
@@ -1560,6 +1561,12 @@ test('not', async () => {
15601561
}
15611562
}
15621563
1564+
@media not (scripting: none) {
1565+
.not-noscript\\:flex {
1566+
display: flex;
1567+
}
1568+
}
1569+
15631570
.not-hocus\\:flex:not(:hover, :focus), .not-device-hocus\\:flex:not(:hover, :focus) {
15641571
display: flex;
15651572
}
@@ -1987,30 +1994,10 @@ test('any-pointer-fine', async () => {
19871994
`)
19881995
})
19891996

1990-
test('scripting-initial', async () => {
1991-
expect(await run(['scripting-initial:flex'])).toMatchInlineSnapshot(`
1992-
"@media (scripting: initial-only) {
1993-
.scripting-initial\\:flex {
1994-
display: flex;
1995-
}
1996-
}"
1997-
`)
1998-
})
1999-
20001997
test('scripting-none', async () => {
2001-
expect(await run(['scripting-none:flex'])).toMatchInlineSnapshot(`
1998+
expect(await run(['noscript:flex'])).toMatchInlineSnapshot(`
20021999
"@media (scripting: none) {
2003-
.scripting-none\\:flex {
2004-
display: flex;
2005-
}
2006-
}"
2007-
`)
2008-
})
2009-
2010-
test('scripting', async () => {
2011-
expect(await run(['scripting:flex'])).toMatchInlineSnapshot(`
2012-
"@media (scripting: enabled) {
2013-
.scripting\\:flex {
2000+
.noscript\\:flex {
20142001
display: flex;
20152002
}
20162003
}"

packages/tailwindcss/src/variants.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1165,9 +1165,7 @@ export function createVariants(theme: Theme): Variants {
11651165
}
11661166

11671167
if (enableScripting) {
1168-
staticVariant('scripting-initial', ['@media (scripting: initial-only)'])
1169-
staticVariant('scripting-none', ['@media (scripting: none)'])
1170-
staticVariant('scripting', ['@media (scripting: enabled)'])
1168+
staticVariant('noscript', ['@media (scripting: none)'])
11711169
}
11721170

11731171
return variants

0 commit comments

Comments
 (0)