From 7ed46b6f520cb6a96a6bd0c78d4731ab9e54c196 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 12 Apr 2022 14:12:01 -0400 Subject: [PATCH] Re-enable new features This reverts commits 1456ed9021b3455dbb4458c2fb7d8ab66dfb3fed, d0269c24b3c7ad4557b7e3f2779bd15c5ac501f7, and 57699a04036c542d82e7b7102d775d4d2379493d. --- CHANGELOG.md | 14 +++ .../tailwindcss-cli/tests/cli.test.js | 1 + package.json | 5 +- src/cli.js | 7 -- src/corePlugins.js | 16 +--- src/index.js | 2 - src/util/resolveConfig.js | 2 - stubs/defaultConfig.stub.js | 2 - tests/__snapshots__/source-maps.test.js.snap | 86 ++++++++++--------- tests/basic-usage.test.css | 15 ++++ tests/basic-usage.test.js | 4 +- tests/collapse-adjacent-rules.test.css | 2 + tests/dark-mode.test.js | 2 - tests/import-syntax.test.css | 2 + tests/important-boolean.test.css | 2 + tests/important-modifier-prefix.test.css | 2 + tests/important-selector.test.css | 2 + tests/kitchen-sink.test.css | 2 + tests/opacity.test.js | 2 - tests/plugins/divide.test.js | 10 +++ tests/prefix.test.css | 2 + tests/util/defaults.js | 2 + tests/variants.test.css | 26 ++++++ tests/variants.test.js | 4 - 24 files changed, 134 insertions(+), 80 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8883cdc16..ca7f2dca0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Nothing yet! - Fix generation of `div:not(.foo)` if `.foo` is never defined ([#7815](https://github.com/tailwindlabs/tailwindcss/pull/7815)) - Allow for custom properties in `rgb`, `rgba`, `hsl` and `hsla` colors ([#7933](https://github.com/tailwindlabs/tailwindcss/pull/7933)) - Remove autoprefixer as explicit peer-dependency to avoid invalid warnings in situations where it isn't actually needed ([#7949](https://github.com/tailwindlabs/tailwindcss/pull/7949)) +- Types: allow for arbitrary theme values (for 3rd party plugins) ([#7926](https://github.com/tailwindlabs/tailwindcss/pull/7926)) - Ensure the `percentage` data type is validated correctly ([#8015](https://github.com/tailwindlabs/tailwindcss/pull/8015)) ### Changed @@ -34,6 +35,19 @@ Nothing yet! - Replace `cosmiconfig` with `lilconfig` ([#6039](https://github.com/tailwindlabs/tailwindcss/pull/6038)) - Update `cssnano` to avoid removing empty variables when minifying ([#7818](https://github.com/tailwindlabs/tailwindcss/pull/7818)) +### Added + +- Allow default ring color to be a function ([#7587](https://github.com/tailwindlabs/tailwindcss/pull/7587)) +- Add `rgb` and `hsl` color helpers for CSS variables ([#7665](https://github.com/tailwindlabs/tailwindcss/pull/7665)) +- Support PostCSS `Document` nodes ([#7291](https://github.com/tailwindlabs/tailwindcss/pull/7291)) +- Add `text-start` and `text-end` utilities ([#6656](https://github.com/tailwindlabs/tailwindcss/pull/6656)) +- Support customizing class name when using `darkMode: 'class'` ([#5800](https://github.com/tailwindlabs/tailwindcss/pull/5800)) +- Add `--poll` option to the CLI ([#7725](https://github.com/tailwindlabs/tailwindcss/pull/7725)) +- Add new `border-spacing` utilities ([#7102](https://github.com/tailwindlabs/tailwindcss/pull/7102)) +- Add `enabled` variant ([#7905](https://github.com/tailwindlabs/tailwindcss/pull/7905)) +- Add TypeScript types for the `tailwind.config.js` file ([#7891](https://github.com/tailwindlabs/tailwindcss/pull/7891)) +- Add `backdrop` variant ([#7924](https://github.com/tailwindlabs/tailwindcss/pull/7924)) + ## [3.0.23] - 2022-02-16 ### Fixed diff --git a/integrations/tailwindcss-cli/tests/cli.test.js b/integrations/tailwindcss-cli/tests/cli.test.js index c229ed17c..8289e65d0 100644 --- a/integrations/tailwindcss-cli/tests/cli.test.js +++ b/integrations/tailwindcss-cli/tests/cli.test.js @@ -291,6 +291,7 @@ describe('Build command', () => { -i, --input Input file -o, --output Output file -w, --watch Watch for changes and rebuild as needed + -p, --poll Use polling instead of filesystem events when watching --content Content paths to use for removing unused classes --postcss Load custom PostCSS configuration -m, --minify Minify the output diff --git a/package.json b/package.json index 2e35a65bc..14cf124c5 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "lib/index.js", + "types": "types/index.d.ts", "repository": "https://github.com/tailwindlabs/tailwindcss.git", "bugs": "https://github.com/tailwindlabs/tailwindcss/issues", "homepage": "https://tailwindcss.com", @@ -25,7 +26,7 @@ "posttest": "npm run style", "generate:plugin-list": "node -r @swc/register scripts/create-plugin-list.js", "generate:types": "node -r @swc/register scripts/generate-types.js", - "generate": "npm run generate:plugin-list" + "generate": "npm run generate:plugin-list && npm run generate:types" }, "files": [ "src/*", @@ -35,6 +36,8 @@ "scripts/*.js", "stubs/*.stub.js", "nesting/*", + "types/**/*", + "*.d.ts", "*.css", "*.js" ], diff --git a/src/cli.js b/src/cli.js index e9d10ebc6..5770546e8 100644 --- a/src/cli.js +++ b/src/cli.js @@ -165,12 +165,10 @@ let commands = { '--input': { type: String, description: 'Input file' }, '--output': { type: String, description: 'Output file' }, '--watch': { type: Boolean, description: 'Watch for changes and rebuild as needed' }, - /* '--poll': { type: Boolean, description: 'Use polling instead of filesystem events when watching', }, - */ '--content': { type: String, description: 'Content paths to use for removing unused classes', @@ -197,9 +195,7 @@ let commands = { '-o': '--output', '-m': '--minify', '-w': '--watch', - /* '-p': '--poll', - */ }, }, } @@ -387,10 +383,7 @@ async function build() { let input = args['--input'] let output = args['--output'] let shouldWatch = args['--watch'] - let shouldPoll = false - /* let shouldPoll = args['--poll'] - */ let shouldCoalesceWriteEvents = shouldPoll || process.platform === 'win32' let includePostCss = args['--postcss'] diff --git a/src/corePlugins.js b/src/corePlugins.js index 03ff5e238..f621b4799 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -27,9 +27,7 @@ export let variantPlugins = { addVariant('placeholder', '&::placeholder') - /* addVariant('backdrop', '&::backdrop') - */ addVariant('before', ({ container }) => { container.walkRules((rule) => { @@ -122,9 +120,7 @@ export let variantPlugins = { 'focus', 'focus-visible', 'active', - /* 'enabled', - */ 'disabled', ].map((variant) => (Array.isArray(variant) ? variant : [variant, `:${variant}`])) @@ -179,7 +175,7 @@ export let variantPlugins = { }, darkVariants: ({ config, addVariant }) => { - let [mode] = [].concat(config('darkMode', 'media')) + let [mode, className = '.dark'] = [].concat(config('darkMode', 'media')) if (mode === false) { mode = 'media' @@ -191,10 +187,7 @@ export let variantPlugins = { } if (mode === 'class') { - addVariant('dark', `.dark &`) - /* addVariant('dark', `${className} &`) - */ } else if (mode === 'media') { addVariant('dark', '@media (prefers-color-scheme: dark)') } @@ -539,7 +532,6 @@ export let corePlugins = { }) }, - /* borderSpacing: ({ addDefaults, matchUtilities, theme }) => { addDefaults('border-spacing', { '--tw-border-spacing-x': 0, @@ -574,7 +566,6 @@ export let corePlugins = { { values: theme('borderSpacing') } ) }, - */ transformOrigin: createUtilityPlugin('transformOrigin', [['origin', ['transformOrigin']]]), translate: createUtilityPlugin( @@ -1571,10 +1562,8 @@ export let corePlugins = { '.text-center': { 'text-align': 'center' }, '.text-right': { 'text-align': 'right' }, '.text-justify': { 'text-align': 'justify' }, - /* '.text-start': { 'text-align': 'start' }, '.text-end': { 'text-align': 'end' }, - */ }) }, @@ -1978,10 +1967,7 @@ export let corePlugins = { ringWidth: ({ matchUtilities, addDefaults, addUtilities, theme }) => { let ringOpacityDefault = theme('ringOpacity.DEFAULT', '0.5') let ringColorDefault = withAlphaValue( - /* theme('ringColor')?.DEFAULT, - */ - theme('ringColor.DEFAULT'), ringOpacityDefault, `rgb(147 197 253 / ${ringOpacityDefault})` ) diff --git a/src/index.js b/src/index.js index 5d12c5d8a..9e9e291eb 100644 --- a/src/index.js +++ b/src/index.js @@ -15,7 +15,6 @@ module.exports = function tailwindcss(configOrPath) { function (root, result) { let context = setupTrackingContext(configOrPath) - /* if (root.type === 'document') { let roots = root.nodes.filter((node) => node.type === 'root') @@ -27,7 +26,6 @@ module.exports = function tailwindcss(configOrPath) { return } - */ processTailwindFeatures(context)(root, result) }, diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js index 49da3f036..ad9c22529 100644 --- a/src/util/resolveConfig.js +++ b/src/util/resolveConfig.js @@ -66,7 +66,6 @@ const configUtils = { {} ) }, - /* rgb(property) { if (!property.startsWith('--')) { throw new Error( @@ -97,7 +96,6 @@ const configUtils = { return `hsl(var(${property}) / ${opacityValue})` } }, - */ } function value(valueToResolve, ...args) { diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index fbefe226e..cff789cb8 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -194,11 +194,9 @@ module.exports = { '3xl': '1.5rem', full: '9999px', }, - /* borderSpacing: ({ theme }) => ({ ...theme('spacing'), }), - */ borderWidth: { DEFAULT: '1px', 0: '0px', diff --git a/tests/__snapshots__/source-maps.test.js.snap b/tests/__snapshots__/source-maps.test.js.snap index 894feed1b..0c5a91b0f 100644 --- a/tests/__snapshots__/source-maps.test.js.snap +++ b/tests/__snapshots__/source-maps.test.js.snap @@ -268,48 +268,50 @@ Array [ "2:4-18 -> 368:2-15", "2:18 -> 369:0", "2:4 -> 371:0", - "2:4-18 -> 372:2-21", - "2:4-18 -> 373:2-21", - "2:4-18 -> 374:2-16", - "2:4-18 -> 375:2-16", + "2:4-18 -> 372:2-26", + "2:4-18 -> 373:2-26", + "2:4-18 -> 374:2-21", + "2:4-18 -> 375:2-21", "2:4-18 -> 376:2-16", - "2:4-18 -> 377:2-17", - "2:4-18 -> 378:2-17", - "2:4-18 -> 379:2-15", - "2:4-18 -> 380:2-15", - "2:4-18 -> 381:2-20", - "2:4-18 -> 382:2-40", - "2:4-18 -> 383:2-17", - "2:4-18 -> 384:2-22", - "2:4-18 -> 385:2-24", - "2:4-18 -> 386:2-25", - "2:4-18 -> 387:2-26", - "2:4-18 -> 388:2-20", - "2:4-18 -> 389:2-29", - "2:4-18 -> 390:2-30", - "2:4-18 -> 391:2-40", - "2:4-18 -> 392:2-36", - "2:4-18 -> 393:2-29", - "2:4-18 -> 394:2-24", - "2:4-18 -> 395:2-32", - "2:4-18 -> 396:2-14", - "2:4-18 -> 397:2-20", - "2:4-18 -> 398:2-18", - "2:4-18 -> 399:2-19", - "2:4-18 -> 400:2-20", - "2:4-18 -> 401:2-16", - "2:4-18 -> 402:2-18", - "2:4-18 -> 403:2-15", - "2:4-18 -> 404:2-21", - "2:4-18 -> 405:2-23", - "2:4-18 -> 406:2-29", - "2:4-18 -> 407:2-27", - "2:4-18 -> 408:2-28", - "2:4-18 -> 409:2-29", - "2:4-18 -> 410:2-25", - "2:4-18 -> 411:2-26", - "2:4-18 -> 412:2-27", - "2:4 -> 413:2", - "2:18 -> 414:0", + "2:4-18 -> 377:2-16", + "2:4-18 -> 378:2-16", + "2:4-18 -> 379:2-17", + "2:4-18 -> 380:2-17", + "2:4-18 -> 381:2-15", + "2:4-18 -> 382:2-15", + "2:4-18 -> 383:2-20", + "2:4-18 -> 384:2-40", + "2:4-18 -> 385:2-17", + "2:4-18 -> 386:2-22", + "2:4-18 -> 387:2-24", + "2:4-18 -> 388:2-25", + "2:4-18 -> 389:2-26", + "2:4-18 -> 390:2-20", + "2:4-18 -> 391:2-29", + "2:4-18 -> 392:2-30", + "2:4-18 -> 393:2-40", + "2:4-18 -> 394:2-36", + "2:4-18 -> 395:2-29", + "2:4-18 -> 396:2-24", + "2:4-18 -> 397:2-32", + "2:4-18 -> 398:2-14", + "2:4-18 -> 399:2-20", + "2:4-18 -> 400:2-18", + "2:4-18 -> 401:2-19", + "2:4-18 -> 402:2-20", + "2:4-18 -> 403:2-16", + "2:4-18 -> 404:2-18", + "2:4-18 -> 405:2-15", + "2:4-18 -> 406:2-21", + "2:4-18 -> 407:2-23", + "2:4-18 -> 408:2-29", + "2:4-18 -> 409:2-27", + "2:4-18 -> 410:2-28", + "2:4-18 -> 411:2-29", + "2:4-18 -> 412:2-25", + "2:4-18 -> 413:2-26", + "2:4-18 -> 414:2-27", + "2:4 -> 415:2", + "2:18 -> 416:0", ] `; diff --git a/tests/basic-usage.test.css b/tests/basic-usage.test.css index 0059eece2..cd6e1e16e 100644 --- a/tests/basic-usage.test.css +++ b/tests/basic-usage.test.css @@ -1,6 +1,8 @@ *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; @@ -252,6 +254,19 @@ .border-collapse { border-collapse: collapse; } +.border-spacing-4 { + --tw-border-spacing-x: 1rem; + --tw-border-spacing-y: 1rem; + border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y); +} +.border-spacing-x-6 { + --tw-border-spacing-x: 1.5rem; + border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y); +} +.border-spacing-y-8 { + --tw-border-spacing-y: 2rem; + border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y); +} .origin-top-right { transform-origin: top right; } diff --git a/tests/basic-usage.test.js b/tests/basic-usage.test.js index 8225466a6..a574ffc60 100644 --- a/tests/basic-usage.test.js +++ b/tests/basic-usage.test.js @@ -152,6 +152,8 @@ test('default ring color can be a function', () => { *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; @@ -171,7 +173,7 @@ test('default ring color can be a function', () => { --tw-ring-inset: ; --tw-ring-offset-width: 0px; --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(147 197 253 / 0.5); + --tw-ring-color: rgba(var(--red), 0.5); --tw-ring-offset-shadow: 0 0 #0000; --tw-ring-shadow: 0 0 #0000; --tw-shadow: 0 0 #0000; diff --git a/tests/collapse-adjacent-rules.test.css b/tests/collapse-adjacent-rules.test.css index 0c152eb59..5b72e0c91 100644 --- a/tests/collapse-adjacent-rules.test.css +++ b/tests/collapse-adjacent-rules.test.css @@ -10,6 +10,8 @@ *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/dark-mode.test.js b/tests/dark-mode.test.js index 3c4536986..592a1d8f0 100644 --- a/tests/dark-mode.test.js +++ b/tests/dark-mode.test.js @@ -23,7 +23,6 @@ it('should be possible to use the darkMode "class" mode', () => { }) }) -/* it('should be possible to change the class name', () => { let config = { darkMode: ['class', '.test-dark'], @@ -46,7 +45,6 @@ it('should be possible to change the class name', () => { `) }) }) -*/ it('should be possible to use the darkMode "media" mode', () => { let config = { diff --git a/tests/import-syntax.test.css b/tests/import-syntax.test.css index 7c690fded..b678a1510 100644 --- a/tests/import-syntax.test.css +++ b/tests/import-syntax.test.css @@ -4,6 +4,8 @@ h1 { *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/important-boolean.test.css b/tests/important-boolean.test.css index ed4b99df5..7b0de1c66 100644 --- a/tests/important-boolean.test.css +++ b/tests/important-boolean.test.css @@ -1,6 +1,8 @@ *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/important-modifier-prefix.test.css b/tests/important-modifier-prefix.test.css index 0cb8249fb..e1cfc168a 100644 --- a/tests/important-modifier-prefix.test.css +++ b/tests/important-modifier-prefix.test.css @@ -1,6 +1,8 @@ *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/important-selector.test.css b/tests/important-selector.test.css index 7bfef7e66..f57fb5cd5 100644 --- a/tests/important-selector.test.css +++ b/tests/important-selector.test.css @@ -1,6 +1,8 @@ *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/kitchen-sink.test.css b/tests/kitchen-sink.test.css index ece88f25f..ba799314b 100644 --- a/tests/kitchen-sink.test.css +++ b/tests/kitchen-sink.test.css @@ -139,6 +139,8 @@ div { *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/opacity.test.js b/tests/opacity.test.js index 4a0ca29e8..cd18c4796 100644 --- a/tests/opacity.test.js +++ b/tests/opacity.test.js @@ -96,7 +96,6 @@ test('colors defined as functions work when opacity plugins are disabled', () => }) }) -/* it('can use rgb helper when defining custom properties for colors (opacity plugins enabled)', () => { let config = { content: [ @@ -428,4 +427,3 @@ it('the hsl helper throws when not passing custom properties', () => { 'The hsl() helper requires a custom property name to be passed as the first argument.' ) }) -*/ diff --git a/tests/plugins/divide.test.js b/tests/plugins/divide.test.js index 08ad34146..6629f7239 100644 --- a/tests/plugins/divide.test.js +++ b/tests/plugins/divide.test.js @@ -11,6 +11,8 @@ it('should add the divide styles for divide-y and a default border color', () => *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; @@ -75,6 +77,8 @@ it('should add the divide styles for divide-x and a default border color', () => *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; @@ -139,6 +143,8 @@ it('should add the divide styles for divide-y-reverse and a default border color *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; @@ -201,6 +207,8 @@ it('should add the divide styles for divide-x-reverse and a default border color *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; @@ -263,6 +271,8 @@ it('should only inject the base styles once if we use divide and border at the s *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/prefix.test.css b/tests/prefix.test.css index b2a66f6fe..97d535cda 100644 --- a/tests/prefix.test.css +++ b/tests/prefix.test.css @@ -1,6 +1,8 @@ *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/util/defaults.js b/tests/util/defaults.js index c4f3ccb5c..c233ef60d 100644 --- a/tests/util/defaults.js +++ b/tests/util/defaults.js @@ -10,6 +10,8 @@ export function defaults({ defaultRingColor = `rgb(59 130 246 / 0.5)` } = {}) { *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; diff --git a/tests/variants.test.css b/tests/variants.test.css index f0a57328a..67faee4c3 100644 --- a/tests/variants.test.css +++ b/tests/variants.test.css @@ -1,6 +1,8 @@ *, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; @@ -106,6 +108,12 @@ --tw-text-opacity: 1; color: rgb(239 68 68 / var(--tw-text-opacity)); } +.backdrop\:shadow-md::backdrop { + --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), + var(--tw-shadow); +} .before\:block::before { content: var(--tw-content); display: block; @@ -311,6 +319,12 @@ box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } +.enabled\:shadow-md:enabled { + --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), + var(--tw-shadow); +} .disabled\:shadow-md:disabled { --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); @@ -498,6 +512,12 @@ box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } +.group:enabled .group-enabled\:shadow-md { + --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), + var(--tw-shadow); +} .group:disabled .group-disabled\:shadow-md { --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); @@ -685,6 +705,12 @@ box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } +.peer:enabled ~ .peer-enabled\:shadow-md { + --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), + var(--tw-shadow); +} .peer:disabled ~ .peer-disabled\:shadow-md { --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); diff --git a/tests/variants.test.js b/tests/variants.test.js index f65ce3884..3f3eea73a 100644 --- a/tests/variants.test.js +++ b/tests/variants.test.js @@ -1,8 +1,6 @@ import fs from 'fs' import path from 'path' -/* import postcss from 'postcss' -*/ import { run, css, html, defaults } from './util/run' @@ -572,7 +570,6 @@ test('The visited variant removes opacity support', () => { }) }) -/* it('appends variants to the correct place when using postcss documents', () => { let config = { content: [{ raw: html`
` }], @@ -606,4 +603,3 @@ it('appends variants to the correct place when using postcss documents', () => { `) }) }) -*/