Re-enable new features

This reverts commits 1456ed9, d0269c2, and 57699a0.

Author: thecrypticace

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

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

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"
   ],

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']
 

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})`
     )

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)
       },

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) {

stubs/defaultConfig.stub.js

@@ -194,11 +194,9 @@ module.exports = {
       '3xl': '1.5rem',
       full: '9999px',
     },
-    /*
     borderSpacing: ({ theme }) => ({
       ...theme('spacing'),
     }),
-    */
     borderWidth: {
       DEFAULT: '1px',
       0: '0px',

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",
 ]
 `;

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;
 }