From 262079e1e5809d2a58e8d264d179c712e3d5d953 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Fri, 29 Jul 2022 17:03:38 -0400 Subject: [PATCH 01/13] Revert "Revert "Don't use `cursor: pointer` for buttons by default (#8962)"" This reverts commit e1aafc5df5e33e4fa69e4923ada23e683296dc14. --- CHANGELOG.md | 4 + src/css/preflight.css | 16 -- tests/__snapshots__/source-maps.test.js.snap | 198 +++++++++---------- 3 files changed, 98 insertions(+), 120 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4878730c49a..056881e81d5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added types for `resolveConfig` ([#8924](https://github.com/tailwindlabs/tailwindcss/pull/8924)) +### Changed + +- Don't use `cursor: pointer` for buttons by default ([#8962](https://github.com/tailwindlabs/tailwindcss/pull/8962)) + ## [3.1.6] - 2022-07-11 ### Fixed diff --git a/src/css/preflight.css b/src/css/preflight.css index bf36495d2371..a8e490a24d46 100644 --- a/src/css/preflight.css +++ b/src/css/preflight.css @@ -315,22 +315,6 @@ textarea::placeholder { color: theme('colors.gray.400', #9ca3af); /* 2 */ } -/* -Set the default cursor for buttons. -*/ - -button, -[role="button"] { - cursor: pointer; -} - -/* -Make sure disabled buttons don't get the pointer cursor. -*/ -:disabled { - cursor: default; -} - /* 1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14) 2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210) diff --git a/tests/__snapshots__/source-maps.test.js.snap b/tests/__snapshots__/source-maps.test.js.snap index fca9b258f533..6bab9007d240 100644 --- a/tests/__snapshots__/source-maps.test.js.snap +++ b/tests/__snapshots__/source-maps.test.js.snap @@ -242,119 +242,109 @@ Array [ "2:4-18 -> 317:2-24", "2:18 -> 318:0", "2:4 -> 320:0", - "2:18 -> 322:1", - "2:4 -> 324:0", - "2:4-18 -> 326:2-17", - "2:18 -> 327:0", - "2:4 -> 329:0", - "2:18 -> 331:1", - "2:4 -> 332:0", - "2:4-18 -> 333:2-17", - "2:18 -> 334:0", - "2:4 -> 336:0", + "2:18 -> 324:1", + "2:4 -> 326:0", + "2:4-18 -> 334:2-24", + "2:4-18 -> 335:2-32", + "2:18 -> 336:0", + "2:4 -> 338:0", "2:18 -> 340:1", "2:4 -> 342:0", - "2:4-18 -> 350:2-24", - "2:4-18 -> 351:2-32", - "2:18 -> 352:0", - "2:4 -> 354:0", - "2:18 -> 356:1", - "2:4 -> 358:0", - "2:4-18 -> 360:2-17", - "2:4-18 -> 361:2-14", - "2:18 -> 362:0", - "2:4 -> 364:0", - "2:4-18 -> 365:2-26", + "2:4-18 -> 344:2-17", + "2:4-18 -> 345:2-14", + "2:18 -> 346:0", + "2:4 -> 348:0", + "2:4-18 -> 349:2-26", + "2:4-18 -> 350:2-26", + "2:4-18 -> 351:2-21", + "2:4-18 -> 352:2-21", + "2:4-18 -> 353:2-16", + "2:4-18 -> 354:2-16", + "2:4-18 -> 355:2-16", + "2:4-18 -> 356:2-17", + "2:4-18 -> 357:2-17", + "2:4-18 -> 358:2-15", + "2:4-18 -> 359:2-15", + "2:4-18 -> 360:2-20", + "2:4-18 -> 361:2-40", + "2:4-18 -> 362:2-17", + "2:4-18 -> 363:2-22", + "2:4-18 -> 364:2-24", + "2:4-18 -> 365:2-25", "2:4-18 -> 366:2-26", - "2:4-18 -> 367:2-21", - "2:4-18 -> 368:2-21", - "2:4-18 -> 369:2-16", - "2:4-18 -> 370:2-16", - "2:4-18 -> 371:2-16", - "2:4-18 -> 372:2-17", - "2:4-18 -> 373:2-17", - "2:4-18 -> 374:2-15", - "2:4-18 -> 375:2-15", + "2:4-18 -> 367:2-20", + "2:4-18 -> 368:2-29", + "2:4-18 -> 369:2-30", + "2:4-18 -> 370:2-40", + "2:4-18 -> 371:2-36", + "2:4-18 -> 372:2-29", + "2:4-18 -> 373:2-24", + "2:4-18 -> 374:2-32", + "2:4-18 -> 375:2-14", "2:4-18 -> 376:2-20", - "2:4-18 -> 377:2-40", - "2:4-18 -> 378:2-17", - "2:4-18 -> 379:2-22", - "2:4-18 -> 380:2-24", - "2:4-18 -> 381:2-25", - "2:4-18 -> 382:2-26", - "2:4-18 -> 383:2-20", - "2:4-18 -> 384:2-29", - "2:4-18 -> 385:2-30", - "2:4-18 -> 386:2-40", - "2:4-18 -> 387:2-36", + "2:4-18 -> 377:2-18", + "2:4-18 -> 378:2-19", + "2:4-18 -> 379:2-20", + "2:4-18 -> 380:2-16", + "2:4-18 -> 381:2-18", + "2:4-18 -> 382:2-15", + "2:4-18 -> 383:2-21", + "2:4-18 -> 384:2-23", + "2:4-18 -> 385:2-29", + "2:4-18 -> 386:2-27", + "2:4-18 -> 387:2-28", "2:4-18 -> 388:2-29", - "2:4-18 -> 389:2-24", - "2:4-18 -> 390:2-32", - "2:4-18 -> 391:2-14", - "2:4-18 -> 392:2-20", - "2:4-18 -> 393:2-18", - "2:4-18 -> 394:2-19", - "2:4-18 -> 395:2-20", - "2:4-18 -> 396:2-16", - "2:4-18 -> 397:2-18", - "2:4-18 -> 398:2-15", + "2:4-18 -> 389:2-25", + "2:4-18 -> 390:2-26", + "2:4-18 -> 391:2-27", + "2:4 -> 392:2", + "2:18 -> 393:0", + "2:4 -> 395:0", + "2:4-18 -> 396:2-26", + "2:4-18 -> 397:2-26", + "2:4-18 -> 398:2-21", "2:4-18 -> 399:2-21", - "2:4-18 -> 400:2-23", - "2:4-18 -> 401:2-29", - "2:4-18 -> 402:2-27", - "2:4-18 -> 403:2-28", - "2:4-18 -> 404:2-29", - "2:4-18 -> 405:2-25", - "2:4-18 -> 406:2-26", - "2:4-18 -> 407:2-27", - "2:4 -> 408:2", - "2:18 -> 409:0", - "2:4 -> 411:0", - "2:4-18 -> 412:2-26", + "2:4-18 -> 400:2-16", + "2:4-18 -> 401:2-16", + "2:4-18 -> 402:2-16", + "2:4-18 -> 403:2-17", + "2:4-18 -> 404:2-17", + "2:4-18 -> 405:2-15", + "2:4-18 -> 406:2-15", + "2:4-18 -> 407:2-20", + "2:4-18 -> 408:2-40", + "2:4-18 -> 409:2-17", + "2:4-18 -> 410:2-22", + "2:4-18 -> 411:2-24", + "2:4-18 -> 412:2-25", "2:4-18 -> 413:2-26", - "2:4-18 -> 414:2-21", - "2:4-18 -> 415:2-21", - "2:4-18 -> 416:2-16", - "2:4-18 -> 417:2-16", - "2:4-18 -> 418:2-16", - "2:4-18 -> 419:2-17", - "2:4-18 -> 420:2-17", - "2:4-18 -> 421:2-15", - "2:4-18 -> 422:2-15", + "2:4-18 -> 414:2-20", + "2:4-18 -> 415:2-29", + "2:4-18 -> 416:2-30", + "2:4-18 -> 417:2-40", + "2:4-18 -> 418:2-36", + "2:4-18 -> 419:2-29", + "2:4-18 -> 420:2-24", + "2:4-18 -> 421:2-32", + "2:4-18 -> 422:2-14", "2:4-18 -> 423:2-20", - "2:4-18 -> 424:2-40", - "2:4-18 -> 425:2-17", - "2:4-18 -> 426:2-22", - "2:4-18 -> 427:2-24", - "2:4-18 -> 428:2-25", - "2:4-18 -> 429:2-26", - "2:4-18 -> 430:2-20", - "2:4-18 -> 431:2-29", - "2:4-18 -> 432:2-30", - "2:4-18 -> 433:2-40", - "2:4-18 -> 434:2-36", + "2:4-18 -> 424:2-18", + "2:4-18 -> 425:2-19", + "2:4-18 -> 426:2-20", + "2:4-18 -> 427:2-16", + "2:4-18 -> 428:2-18", + "2:4-18 -> 429:2-15", + "2:4-18 -> 430:2-21", + "2:4-18 -> 431:2-23", + "2:4-18 -> 432:2-29", + "2:4-18 -> 433:2-27", + "2:4-18 -> 434:2-28", "2:4-18 -> 435:2-29", - "2:4-18 -> 436:2-24", - "2:4-18 -> 437:2-32", - "2:4-18 -> 438:2-14", - "2:4-18 -> 439:2-20", - "2:4-18 -> 440:2-18", - "2:4-18 -> 441:2-19", - "2:4-18 -> 442:2-20", - "2:4-18 -> 443:2-16", - "2:4-18 -> 444:2-18", - "2:4-18 -> 445:2-15", - "2:4-18 -> 446:2-21", - "2:4-18 -> 447:2-23", - "2:4-18 -> 448:2-29", - "2:4-18 -> 449:2-27", - "2:4-18 -> 450:2-28", - "2:4-18 -> 451:2-29", - "2:4-18 -> 452:2-25", - "2:4-18 -> 453:2-26", - "2:4-18 -> 454:2-27", - "2:4 -> 455:2", - "2:18 -> 456:0", + "2:4-18 -> 436:2-25", + "2:4-18 -> 437:2-26", + "2:4-18 -> 438:2-27", + "2:4 -> 439:2", + "2:18 -> 440:0", ] `; From 2b73af5605f5e25fa4cb25133fce0aff203f9f4c Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sat, 30 Jul 2022 19:12:12 +0000 Subject: [PATCH 02/13] Update eslint to version 8.20.0 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6c09830494c2..6cc455125b79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "autoprefixer": "^10.4.7", "cssnano": "^5.1.12", "esbuild": "^0.14.48", - "eslint": "^8.19.0", + "eslint": "^8.20.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^28.1.3", @@ -3049,9 +3049,9 @@ } }, "node_modules/eslint": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz", - "integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz", + "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.0", @@ -8847,9 +8847,9 @@ "dev": true }, "eslint": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz", - "integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz", + "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.0", diff --git a/package.json b/package.json index faf09d7b2efc..eb355ecb7623 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "autoprefixer": "^10.4.7", "cssnano": "^5.1.12", "esbuild": "^0.14.48", - "eslint": "^8.19.0", + "eslint": "^8.20.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^28.1.3", From c6bac2d614350d54e4dfae14d922c5f7d5bcb0b8 Mon Sep 17 00:00:00 2001 From: Jeet <59134840+jeetto@users.noreply.github.com> Date: Sun, 31 Jul 2022 20:21:09 +0530 Subject: [PATCH 03/13] Centered the project name (#9000) A centered project name makes documentation much better looking and appealing. --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2ffaaf89400a..ff064632e89c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

+

Tailwind CSS @@ -7,9 +7,12 @@

-A utility-first CSS framework for rapidly building custom user interfaces. +

+ A utility-first CSS framework for rapidly building custom user interfaces. +

+ -

+

Build Status Total Downloads Latest Release From 0b5bfc8065e928caa7cf11a7bac37fda10411b6f Mon Sep 17 00:00:00 2001 From: Justin Wong <11310624+wongjn@users.noreply.github.com> Date: Sun, 31 Jul 2022 23:20:43 +0100 Subject: [PATCH 04/13] Remove class prefix in arbitrary variant that is used multiple times (#8992) * Remove prefix in multi-used arbitrary variant * Update changelog Co-authored-by: Jordan Pittman --- CHANGELOG.md | 4 ++- src/lib/generateRules.js | 5 +--- tests/arbitrary-variants.test.js | 49 ++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 056881e81d5a..e58f1db75e54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- Nothing yet! +### Fixed + +- Don’t prefix classes within reused arbitrary variants ([#8992](https://github.com/tailwindlabs/tailwindcss/pull/8992)) ## [3.1.7] - 2022-07-29 diff --git a/src/lib/generateRules.js b/src/lib/generateRules.js index b7843258108b..0f441fb18018 100644 --- a/src/lib/generateRules.js +++ b/src/lib/generateRules.js @@ -129,7 +129,6 @@ function applyVariant(variant, matches, context) { } let args - let isArbitraryVariant = false // Find partial arbitrary variants if (variant.endsWith(']') && !variant.startsWith('[')) { @@ -145,8 +144,6 @@ function applyVariant(variant, matches, context) { return [] } - isArbitraryVariant = true - let fn = parseVariant(selector) let sort = Array.from(context.variantOrder.values()).pop() << 1n @@ -303,7 +300,7 @@ function applyVariant(variant, matches, context) { ...meta, sort: variantSort | meta.sort, collectedFormats: (meta.collectedFormats ?? []).concat(collectedFormats), - isArbitraryVariant, + isArbitraryVariant: isArbitraryValue(variant), }, clone.nodes[0], ] diff --git a/tests/arbitrary-variants.test.js b/tests/arbitrary-variants.test.js index be9704e87b71..a145ee5b4731 100644 --- a/tests/arbitrary-variants.test.js +++ b/tests/arbitrary-variants.test.js @@ -566,3 +566,52 @@ test('classes in arbitrary variants should not be prefixed', () => { `) }) }) + +test('classes in the same arbitrary variant should not be prefixed', () => { + let config = { + prefix: 'tw-', + content: [ + { + raw: ` +

should not be red
+
+
should be red
+
+
+
should not be red
+
should be red
+
+ `, + }, + ], + corePlugins: { preflight: false }, + } + + let input = ` + @tailwind utilities; + ` + + return run(input, config).then((result) => { + expect(result.css).toMatchFormattedCss(css` + .foo .\[\.foo_\&\]\:tw-bg-white { + --tw-bg-opacity: 1; + background-color: rgb(255 255 255 / var(--tw-bg-opacity)); + } + + .foo .\[\.foo_\&\]\:tw-text-red-400 { + --tw-text-opacity: 1; + color: rgb(248 113 113 / var(--tw-text-opacity)); + } + + .\[\&_\.foo\]\:tw-bg-white .foo { + --tw-bg-opacity: 1; + background-color: rgb(255 255 255 / var(--tw-bg-opacity)); + } + + .\[\&_\.foo\]\:tw-text-red-400 .foo { + --tw-text-opacity: 1; + color: rgb(248 113 113 / var(--tw-text-opacity)); + } + `) + }) +}) From 89b960d77142e0e4697a1c9d8d4bbca65c77632d Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 2 Aug 2022 11:13:04 -0400 Subject: [PATCH 05/13] Fix resolution of alpha values inside color functions (#9008) * Fix resolution of alpha values inside color functions * Update changelog --- CHANGELOG.md | 1 + src/util/resolveConfig.js | 2 +- tests/opacity.test.js | 67 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e58f1db75e54..55df105ee3c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Don’t prefix classes within reused arbitrary variants ([#8992](https://github.com/tailwindlabs/tailwindcss/pull/8992)) +- Fix usage of alpha values inside single-named colors that are functions ([#9008](https://github.com/tailwindlabs/tailwindcss/pull/9008)) ## [3.1.7] - 2022-07-29 diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js index 5472da08876f..9a4845af5625 100644 --- a/src/util/resolveConfig.js +++ b/src/util/resolveConfig.js @@ -180,7 +180,7 @@ function resolveFunctionKeys(object) { val = val[path[index++]] let shouldResolveAsFn = - isFunction(val) && (path.alpha === undefined || index < path.length - 1) + isFunction(val) && (path.alpha === undefined || index <= path.length - 1) val = shouldResolveAsFn ? val(resolvePath, configUtils) : val } diff --git a/tests/opacity.test.js b/tests/opacity.test.js index 7215d14db332..c0cd3066e5ac 100644 --- a/tests/opacity.test.js +++ b/tests/opacity.test.js @@ -761,3 +761,70 @@ it('Theme functions can reference values with slashes in brackets', () => { `) }) }) + +it('works with opacity values defined as a placeholder or a function in when colors is a function', () => { + let config = { + content: [ + { + raw: html` +
+ `, + }, + ], + theme: { + colors: () => ({ + foobar1: ({ opacityValue }) => `rgb(255 100 0 / ${opacityValue ?? '100%'})`, + foobar2: `rgb(255 100 0 / )`, + foobar3: { + 100: ({ opacityValue }) => `rgb(255 100 0 / ${opacityValue ?? '100%'})`, + 200: `rgb(255 100 0 / )`, + }, + }), + extend: { + backgroundColor: ({ theme }) => ({ + foo10: theme('colors.foobar1'), + foo20: theme('colors.foobar2'), + foo30: theme('colors.foobar3.100'), + foo40: theme('colors.foobar3.200'), + foo11: theme('colors.foobar1 / 50%'), + foo21: theme('colors.foobar2 / 50%'), + foo31: theme('colors.foobar3.100 / 50%'), + foo41: theme('colors.foobar3.200 / 50%'), + }), + }, + }, + } + + return run('@tailwind utilities', config).then((result) => { + expect(result.css).toMatchCss(css` + .bg-foo10 { + background-color: rgb(255 100 0 / 100%); + } + .bg-foo20 { + --tw-bg-opacity: 1; + background-color: rgb(255 100 0 / var(--tw-bg-opacity)); + } + .bg-foo30 { + background-color: rgb(255 100 0 / 100%); + } + .bg-foo40 { + --tw-bg-opacity: 1; + background-color: rgb(255 100 0 / var(--tw-bg-opacity)); + } + .bg-foo11 { + background-color: rgb(255 100 0 / 50%); + } + .bg-foo21 { + background-color: rgb(255 100 0 / 50%); + } + .bg-foo31 { + background-color: rgb(255 100 0 / 50%); + } + .bg-foo41 { + background-color: rgb(255 100 0 / 50%); + } + `) + }) +}) From 23815e9f5af32780c05f5ec157a3376dfbb32095 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Wed, 3 Aug 2022 06:09:24 -0400 Subject: [PATCH 06/13] Update changelog --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55df105ee3c7..f73d1a950722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Don’t prefix classes within reused arbitrary variants ([#8992](https://github.com/tailwindlabs/tailwindcss/pull/8992)) - Fix usage of alpha values inside single-named colors that are functions ([#9008](https://github.com/tailwindlabs/tailwindcss/pull/9008)) +### Changed + +- Don't use `cursor: pointer` for buttons by default ([#8962](https://github.com/tailwindlabs/tailwindcss/pull/8962)) + ## [3.1.7] - 2022-07-29 ### Fixed @@ -22,10 +26,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added types for `resolveConfig` ([#8924](https://github.com/tailwindlabs/tailwindcss/pull/8924)) -### Changed - -- Don't use `cursor: pointer` for buttons by default ([#8962](https://github.com/tailwindlabs/tailwindcss/pull/8962)) - ## [3.1.6] - 2022-07-11 ### Fixed From 2bfd3e7423c71bb505c97949c57a7e3ef36530eb Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 4 Aug 2022 15:55:24 +0000 Subject: [PATCH 07/13] Update prettier-plugin-tailwindcss to version 0.1.13 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6cc455125b79..9d855ace98dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "jest": "^28.1.3", "jest-diff": "^28.1.3", "prettier": "^2.7.1", - "prettier-plugin-tailwindcss": "^0.1.12", + "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.0", "source-map-js": "^1.0.2" }, @@ -5982,9 +5982,9 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.12.tgz", - "integrity": "sha512-pEZ6tppwknCeq3ObR9g8t61AhWtVRRR3I0EQNeiRrrJ3D42FJGeUDxiFc/LJRYEeAx5JOxagsF0MICwuWOJa+w==", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.13.tgz", + "integrity": "sha512-/EKQURUrxLu66CMUg4+1LwGdxnz8of7IDvrSLqEtDqhLH61SAlNNUSr90UTvZaemujgl3OH/VHg+fyGltrNixw==", "dev": true, "engines": { "node": ">=12.17.0" @@ -11036,9 +11036,9 @@ } }, "prettier-plugin-tailwindcss": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.12.tgz", - "integrity": "sha512-pEZ6tppwknCeq3ObR9g8t61AhWtVRRR3I0EQNeiRrrJ3D42FJGeUDxiFc/LJRYEeAx5JOxagsF0MICwuWOJa+w==", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.13.tgz", + "integrity": "sha512-/EKQURUrxLu66CMUg4+1LwGdxnz8of7IDvrSLqEtDqhLH61SAlNNUSr90UTvZaemujgl3OH/VHg+fyGltrNixw==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index eb355ecb7623..0c8548ffba9f 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "jest": "^28.1.3", "jest-diff": "^28.1.3", "prettier": "^2.7.1", - "prettier-plugin-tailwindcss": "^0.1.12", + "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.0", "source-map-js": "^1.0.2" }, From 20456efae4e03a11b9210b8cf56aedab402a5542 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Thu, 4 Aug 2022 14:24:17 -0400 Subject: [PATCH 08/13] Fix `@apply` of user utilities when negative and non-negative versions both exist (#9027) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix application of rules with multiple matches of differing selectors `-foo-1` and `foo-1` are both matches for the class `-foo-1` but `@apply` only wants the first one. It would remove the second one and cause an error because it’s an entirely separate match that had it’s only rule removed. * Update changelog --- CHANGELOG.md | 1 + src/lib/expandApplyAtRules.js | 6 ++++++ tests/apply.test.js | 36 +++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f73d1a950722..0ef5bb4f64b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Don’t prefix classes within reused arbitrary variants ([#8992](https://github.com/tailwindlabs/tailwindcss/pull/8992)) - Fix usage of alpha values inside single-named colors that are functions ([#9008](https://github.com/tailwindlabs/tailwindcss/pull/9008)) +- Fix `@apply` of user utilities when negative and non-negative versions both exist ([#9027](https://github.com/tailwindlabs/tailwindcss/pull/9027)) ### Changed diff --git a/src/lib/expandApplyAtRules.js b/src/lib/expandApplyAtRules.js index f5e84a318147..7088337abbeb 100644 --- a/src/lib/expandApplyAtRules.js +++ b/src/lib/expandApplyAtRules.js @@ -499,6 +499,12 @@ function processApply(root, context, localCache) { }) } + // It could be that the node we were inserted was removed because the class didn't match + // If that was the *only* rule in the parent, then we have nothing add so we skip it + if (!root.nodes[0]) { + continue + } + // Insert it siblings.push([ // Ensure that when we are sorting, that we take the layer order into account diff --git a/tests/apply.test.js b/tests/apply.test.js index 6040aad22c38..b1a2ac461d2f 100644 --- a/tests/apply.test.js +++ b/tests/apply.test.js @@ -1548,3 +1548,39 @@ it('apply + user CSS + selector variants (like group) + important selector (2)', } `) }) + +it('can apply user utilities that start with a dash', async () => { + let config = { + content: [{ raw: html`
` }], + plugins: [], + } + + let input = css` + @tailwind utilities; + @layer utilities { + .foo-1 { + margin: 10px; + } + .-foo-1 { + margin: -15px; + } + .new-class { + @apply -foo-1; + } + } + ` + + let result = await run(input, config) + + expect(result.css).toMatchFormattedCss(css` + .foo-1 { + margin: 10px; + } + .-foo-1 { + margin: -15px; + } + .new-class { + margin: -15px; + } + `) +}) From a6d17835c85414e8b7dbb6ed2cf2653c6d725976 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 11:41:14 +0000 Subject: [PATCH 09/13] Update autoprefixer to version 10.4.8 --- package-lock.json | 124 +++++++++++++++++++++++++++++----------------- package.json | 2 +- 2 files changed, 80 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d855ace98dc..030bca3a9e6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "@swc/core": "^1.2.218", "@swc/jest": "^0.2.22", "@swc/register": "^0.1.10", - "autoprefixer": "^10.4.7", + "autoprefixer": "^10.4.8", "cssnano": "^5.1.12", "esbuild": "^0.14.48", "eslint": "^8.20.0", @@ -1870,9 +1870,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz", - "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==", + "version": "10.4.8", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz", + "integrity": "sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==", "dev": true, "funding": [ { @@ -1885,8 +1885,8 @@ } ], "dependencies": { - "browserslist": "^4.20.3", - "caniuse-lite": "^1.0.30001335", + "browserslist": "^4.21.3", + "caniuse-lite": "^1.0.30001373", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -2024,9 +2024,9 @@ } }, "node_modules/browserslist": { - "version": "4.20.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz", - "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", + "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", "dev": true, "funding": [ { @@ -2039,11 +2039,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001332", - "electron-to-chromium": "^1.4.118", - "escalade": "^3.1.1", - "node-releases": "^2.0.3", - "picocolors": "^1.0.0" + "caniuse-lite": "^1.0.30001370", + "electron-to-chromium": "^1.4.202", + "node-releases": "^2.0.6", + "update-browserslist-db": "^1.0.5" }, "bin": { "browserslist": "cli.js" @@ -2106,9 +2105,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001341", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz", - "integrity": "sha512-2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA==", + "version": "1.0.30001374", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz", + "integrity": "sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==", "dev": true, "funding": [ { @@ -2631,9 +2630,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.137", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz", - "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==", + "version": "1.4.211", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz", + "integrity": "sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A==", "dev": true }, "node_modules/emittery": { @@ -5143,9 +5142,9 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz", - "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", + "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", "dev": true }, "node_modules/normalize-path": { @@ -6542,6 +6541,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/update-browserslist-db": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", + "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "browserslist-lint": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -8088,13 +8113,13 @@ } }, "autoprefixer": { - "version": "10.4.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz", - "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==", + "version": "10.4.8", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz", + "integrity": "sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==", "dev": true, "requires": { - "browserslist": "^4.20.3", - "caniuse-lite": "^1.0.30001335", + "browserslist": "^4.21.3", + "caniuse-lite": "^1.0.30001373", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -8199,16 +8224,15 @@ } }, "browserslist": { - "version": "4.20.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz", - "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", + "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001332", - "electron-to-chromium": "^1.4.118", - "escalade": "^3.1.1", - "node-releases": "^2.0.3", - "picocolors": "^1.0.0" + "caniuse-lite": "^1.0.30001370", + "electron-to-chromium": "^1.4.202", + "node-releases": "^2.0.6", + "update-browserslist-db": "^1.0.5" } }, "bser": { @@ -8256,9 +8280,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001341", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz", - "integrity": "sha512-2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA==", + "version": "1.0.30001374", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz", + "integrity": "sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==", "dev": true }, "chalk": { @@ -8634,9 +8658,9 @@ } }, "electron-to-chromium": { - "version": "1.4.137", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz", - "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==", + "version": "1.4.211", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz", + "integrity": "sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A==", "dev": true }, "emittery": { @@ -10507,9 +10531,9 @@ "dev": true }, "node-releases": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz", - "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", + "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", "dev": true }, "normalize-path": { @@ -11418,6 +11442,16 @@ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, + "update-browserslist-db": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", + "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "dev": true, + "requires": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + } + }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", diff --git a/package.json b/package.json index 0c8548ffba9f..3e557e54c5f7 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@swc/core": "^1.2.218", "@swc/jest": "^0.2.22", "@swc/register": "^0.1.10", - "autoprefixer": "^10.4.7", + "autoprefixer": "^10.4.8", "cssnano": "^5.1.12", "esbuild": "^0.14.48", "eslint": "^8.20.0", From 0a3aad95115685b31c25cb48bb3b5d0bcb8429d3 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Fri, 5 Aug 2022 10:05:04 -0400 Subject: [PATCH 10/13] Revert "Don't use `cursor: pointer` for buttons by default (#8962)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’re undecided on whether or not this should be released right now so we’ll revert it and revisit it later. --- src/css/preflight.css | 16 ++ tests/__snapshots__/source-maps.test.js.snap | 198 ++++++++++--------- 2 files changed, 120 insertions(+), 94 deletions(-) diff --git a/src/css/preflight.css b/src/css/preflight.css index a8e490a24d46..bf36495d2371 100644 --- a/src/css/preflight.css +++ b/src/css/preflight.css @@ -315,6 +315,22 @@ textarea::placeholder { color: theme('colors.gray.400', #9ca3af); /* 2 */ } +/* +Set the default cursor for buttons. +*/ + +button, +[role="button"] { + cursor: pointer; +} + +/* +Make sure disabled buttons don't get the pointer cursor. +*/ +:disabled { + cursor: default; +} + /* 1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14) 2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210) diff --git a/tests/__snapshots__/source-maps.test.js.snap b/tests/__snapshots__/source-maps.test.js.snap index 6bab9007d240..fca9b258f533 100644 --- a/tests/__snapshots__/source-maps.test.js.snap +++ b/tests/__snapshots__/source-maps.test.js.snap @@ -242,109 +242,119 @@ Array [ "2:4-18 -> 317:2-24", "2:18 -> 318:0", "2:4 -> 320:0", - "2:18 -> 324:1", - "2:4 -> 326:0", - "2:4-18 -> 334:2-24", - "2:4-18 -> 335:2-32", - "2:18 -> 336:0", - "2:4 -> 338:0", + "2:18 -> 322:1", + "2:4 -> 324:0", + "2:4-18 -> 326:2-17", + "2:18 -> 327:0", + "2:4 -> 329:0", + "2:18 -> 331:1", + "2:4 -> 332:0", + "2:4-18 -> 333:2-17", + "2:18 -> 334:0", + "2:4 -> 336:0", "2:18 -> 340:1", "2:4 -> 342:0", - "2:4-18 -> 344:2-17", - "2:4-18 -> 345:2-14", - "2:18 -> 346:0", - "2:4 -> 348:0", - "2:4-18 -> 349:2-26", - "2:4-18 -> 350:2-26", - "2:4-18 -> 351:2-21", - "2:4-18 -> 352:2-21", - "2:4-18 -> 353:2-16", - "2:4-18 -> 354:2-16", - "2:4-18 -> 355:2-16", - "2:4-18 -> 356:2-17", - "2:4-18 -> 357:2-17", - "2:4-18 -> 358:2-15", - "2:4-18 -> 359:2-15", - "2:4-18 -> 360:2-20", - "2:4-18 -> 361:2-40", - "2:4-18 -> 362:2-17", - "2:4-18 -> 363:2-22", - "2:4-18 -> 364:2-24", - "2:4-18 -> 365:2-25", + "2:4-18 -> 350:2-24", + "2:4-18 -> 351:2-32", + "2:18 -> 352:0", + "2:4 -> 354:0", + "2:18 -> 356:1", + "2:4 -> 358:0", + "2:4-18 -> 360:2-17", + "2:4-18 -> 361:2-14", + "2:18 -> 362:0", + "2:4 -> 364:0", + "2:4-18 -> 365:2-26", "2:4-18 -> 366:2-26", - "2:4-18 -> 367:2-20", - "2:4-18 -> 368:2-29", - "2:4-18 -> 369:2-30", - "2:4-18 -> 370:2-40", - "2:4-18 -> 371:2-36", - "2:4-18 -> 372:2-29", - "2:4-18 -> 373:2-24", - "2:4-18 -> 374:2-32", - "2:4-18 -> 375:2-14", + "2:4-18 -> 367:2-21", + "2:4-18 -> 368:2-21", + "2:4-18 -> 369:2-16", + "2:4-18 -> 370:2-16", + "2:4-18 -> 371:2-16", + "2:4-18 -> 372:2-17", + "2:4-18 -> 373:2-17", + "2:4-18 -> 374:2-15", + "2:4-18 -> 375:2-15", "2:4-18 -> 376:2-20", - "2:4-18 -> 377:2-18", - "2:4-18 -> 378:2-19", - "2:4-18 -> 379:2-20", - "2:4-18 -> 380:2-16", - "2:4-18 -> 381:2-18", - "2:4-18 -> 382:2-15", - "2:4-18 -> 383:2-21", - "2:4-18 -> 384:2-23", - "2:4-18 -> 385:2-29", - "2:4-18 -> 386:2-27", - "2:4-18 -> 387:2-28", + "2:4-18 -> 377:2-40", + "2:4-18 -> 378:2-17", + "2:4-18 -> 379:2-22", + "2:4-18 -> 380:2-24", + "2:4-18 -> 381:2-25", + "2:4-18 -> 382:2-26", + "2:4-18 -> 383:2-20", + "2:4-18 -> 384:2-29", + "2:4-18 -> 385:2-30", + "2:4-18 -> 386:2-40", + "2:4-18 -> 387:2-36", "2:4-18 -> 388:2-29", - "2:4-18 -> 389:2-25", - "2:4-18 -> 390:2-26", - "2:4-18 -> 391:2-27", - "2:4 -> 392:2", - "2:18 -> 393:0", - "2:4 -> 395:0", - "2:4-18 -> 396:2-26", - "2:4-18 -> 397:2-26", - "2:4-18 -> 398:2-21", + "2:4-18 -> 389:2-24", + "2:4-18 -> 390:2-32", + "2:4-18 -> 391:2-14", + "2:4-18 -> 392:2-20", + "2:4-18 -> 393:2-18", + "2:4-18 -> 394:2-19", + "2:4-18 -> 395:2-20", + "2:4-18 -> 396:2-16", + "2:4-18 -> 397:2-18", + "2:4-18 -> 398:2-15", "2:4-18 -> 399:2-21", - "2:4-18 -> 400:2-16", - "2:4-18 -> 401:2-16", - "2:4-18 -> 402:2-16", - "2:4-18 -> 403:2-17", - "2:4-18 -> 404:2-17", - "2:4-18 -> 405:2-15", - "2:4-18 -> 406:2-15", - "2:4-18 -> 407:2-20", - "2:4-18 -> 408:2-40", - "2:4-18 -> 409:2-17", - "2:4-18 -> 410:2-22", - "2:4-18 -> 411:2-24", - "2:4-18 -> 412:2-25", + "2:4-18 -> 400:2-23", + "2:4-18 -> 401:2-29", + "2:4-18 -> 402:2-27", + "2:4-18 -> 403:2-28", + "2:4-18 -> 404:2-29", + "2:4-18 -> 405:2-25", + "2:4-18 -> 406:2-26", + "2:4-18 -> 407:2-27", + "2:4 -> 408:2", + "2:18 -> 409:0", + "2:4 -> 411:0", + "2:4-18 -> 412:2-26", "2:4-18 -> 413:2-26", - "2:4-18 -> 414:2-20", - "2:4-18 -> 415:2-29", - "2:4-18 -> 416:2-30", - "2:4-18 -> 417:2-40", - "2:4-18 -> 418:2-36", - "2:4-18 -> 419:2-29", - "2:4-18 -> 420:2-24", - "2:4-18 -> 421:2-32", - "2:4-18 -> 422:2-14", + "2:4-18 -> 414:2-21", + "2:4-18 -> 415:2-21", + "2:4-18 -> 416:2-16", + "2:4-18 -> 417:2-16", + "2:4-18 -> 418:2-16", + "2:4-18 -> 419:2-17", + "2:4-18 -> 420:2-17", + "2:4-18 -> 421:2-15", + "2:4-18 -> 422:2-15", "2:4-18 -> 423:2-20", - "2:4-18 -> 424:2-18", - "2:4-18 -> 425:2-19", - "2:4-18 -> 426:2-20", - "2:4-18 -> 427:2-16", - "2:4-18 -> 428:2-18", - "2:4-18 -> 429:2-15", - "2:4-18 -> 430:2-21", - "2:4-18 -> 431:2-23", - "2:4-18 -> 432:2-29", - "2:4-18 -> 433:2-27", - "2:4-18 -> 434:2-28", + "2:4-18 -> 424:2-40", + "2:4-18 -> 425:2-17", + "2:4-18 -> 426:2-22", + "2:4-18 -> 427:2-24", + "2:4-18 -> 428:2-25", + "2:4-18 -> 429:2-26", + "2:4-18 -> 430:2-20", + "2:4-18 -> 431:2-29", + "2:4-18 -> 432:2-30", + "2:4-18 -> 433:2-40", + "2:4-18 -> 434:2-36", "2:4-18 -> 435:2-29", - "2:4-18 -> 436:2-25", - "2:4-18 -> 437:2-26", - "2:4-18 -> 438:2-27", - "2:4 -> 439:2", - "2:18 -> 440:0", + "2:4-18 -> 436:2-24", + "2:4-18 -> 437:2-32", + "2:4-18 -> 438:2-14", + "2:4-18 -> 439:2-20", + "2:4-18 -> 440:2-18", + "2:4-18 -> 441:2-19", + "2:4-18 -> 442:2-20", + "2:4-18 -> 443:2-16", + "2:4-18 -> 444:2-18", + "2:4-18 -> 445:2-15", + "2:4-18 -> 446:2-21", + "2:4-18 -> 447:2-23", + "2:4-18 -> 448:2-29", + "2:4-18 -> 449:2-27", + "2:4-18 -> 450:2-28", + "2:4-18 -> 451:2-29", + "2:4-18 -> 452:2-25", + "2:4-18 -> 453:2-26", + "2:4-18 -> 454:2-27", + "2:4 -> 455:2", + "2:18 -> 456:0", ] `; From f92665cb83f5997f7c0d4bea055b1d12d2eaaded Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Fri, 5 Aug 2022 10:33:00 -0400 Subject: [PATCH 11/13] Update changelog --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ef5bb4f64b5..9ae48217675a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,10 +13,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix usage of alpha values inside single-named colors that are functions ([#9008](https://github.com/tailwindlabs/tailwindcss/pull/9008)) - Fix `@apply` of user utilities when negative and non-negative versions both exist ([#9027](https://github.com/tailwindlabs/tailwindcss/pull/9027)) -### Changed - -- Don't use `cursor: pointer` for buttons by default ([#8962](https://github.com/tailwindlabs/tailwindcss/pull/8962)) - ## [3.1.7] - 2022-07-29 ### Fixed From 7cfbc8cb53c02022d3bcbf19a309aa58b4446d2a Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Fri, 5 Aug 2022 10:33:22 -0400 Subject: [PATCH 12/13] update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ae48217675a..20a836572b36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Nothing yet! + +## [3.1.8] - 2022-08-05 + ### Fixed - Don’t prefix classes within reused arbitrary variants ([#8992](https://github.com/tailwindlabs/tailwindcss/pull/8992)) @@ -2025,7 +2029,8 @@ No release notes - Everything! -[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.7...HEAD +[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.8...HEAD +[3.1.8]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.7...v3.1.8 [3.1.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.6...v3.1.7 [3.1.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.5...v3.1.6 [3.1.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.4...v3.1.5 From 99b53b416085413a0b0459a37d57daac53cb9d4d Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Fri, 5 Aug 2022 10:33:22 -0400 Subject: [PATCH 13/13] 3.1.8 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 030bca3a9e6b..ef6fae6d5131 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tailwindcss", - "version": "3.1.7", + "version": "3.1.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tailwindcss", - "version": "3.1.7", + "version": "3.1.8", "license": "MIT", "dependencies": { "arg": "^5.0.2", diff --git a/package.json b/package.json index 3e557e54c5f7..b3ac1a9193b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tailwindcss", - "version": "3.1.7", + "version": "3.1.8", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "lib/index.js",