tailwindcss 3.1.3 → 3.1.6

package/peers/index.js

@@ -5978,6 +5978,7 @@ var require_core = __commonJS({
       "node:string_decoder": [">= 14.18 && < 15", ">= 16"],
       sys: [">= 0.4 && < 0.7", ">= 0.8"],
       "node:sys": [">= 14.18 && < 15", ">= 16"],
+      "node:test": ">= 18",
       timers: true,
       "node:timers": [">= 14.18 && < 15", ">= 16"],
       "timers/promises": ">= 15",
@@ -6092,7 +6093,7 @@ var require_async = __commonJS({
     var nodeModulesPaths = require_node_modules_paths();
     var normalizeOptions = require_normalize_options();
     var isCore = require_is_core_module();
-    var realpathFS = fs.realpath && typeof fs.realpath.native === "function" ? fs.realpath.native : fs.realpath;
+    var realpathFS = process.platform !== "win32" && fs.realpath && typeof fs.realpath.native === "function" ? fs.realpath.native : fs.realpath;
     var homedir = getHomedir();
     var defaultPaths = function() {
       return [
@@ -6525,6 +6526,7 @@ var require_core2 = __commonJS({
       "node:string_decoder": [">= 14.18 && < 15", ">= 16"],
       sys: [">= 0.4 && < 0.7", ">= 0.8"],
       "node:sys": [">= 14.18 && < 15", ">= 16"],
+      "node:test": ">= 18",
       timers: true,
       "node:timers": [">= 14.18 && < 15", ">= 16"],
       "timers/promises": ">= 15",
@@ -6647,7 +6649,7 @@ var require_sync = __commonJS({
     var caller = require_caller();
     var nodeModulesPaths = require_node_modules_paths();
     var normalizeOptions = require_normalize_options();
-    var realpathFS = fs.realpathSync && typeof fs.realpathSync.native === "function" ? fs.realpathSync.native : fs.realpathSync;
+    var realpathFS = process.platform !== "win32" && fs.realpathSync && typeof fs.realpathSync.native === "function" ? fs.realpathSync.native : fs.realpathSync;
     var homedir = getHomedir();
     var defaultPaths = function() {
       return [
@@ -25862,6 +25864,155 @@ var require_main = __commonJS({
         "background-attachment",
         "background-color"
       ],
+      "columns": [
+        "column-width",
+        "column-count"
+      ],
+      "column-rule": [
+        "column-rule-width",
+        "column-rule-style",
+        "column-rule-color"
+      ],
+      "flex": [
+        "flex-grow",
+        "flex-shrink",
+        "flex-basis"
+      ],
+      "flex-flow": [
+        "flex-direction",
+        "flex-wrap"
+      ],
+      "font": [
+        "font-style",
+        "font-variant",
+        "font-weight",
+        "font-stretch",
+        "font-size",
+        "font-family",
+        "line-height"
+      ],
+      "grid": [
+        "grid-template-rows",
+        "grid-template-columns",
+        "grid-template-areas",
+        "grid-auto-rows",
+        "grid-auto-columns",
+        "grid-auto-flow",
+        "column-gap",
+        "row-gap"
+      ],
+      "grid-area": [
+        "grid-row-start",
+        "grid-column-start",
+        "grid-row-end",
+        "grid-column-end"
+      ],
+      "grid-column": [
+        "grid-column-start",
+        "grid-column-end"
+      ],
+      "grid-row": [
+        "grid-row-start",
+        "grid-row-end"
+      ],
+      "grid-template": [
+        "grid-template-columns",
+        "grid-template-rows",
+        "grid-template-areas"
+      ],
+      "list-style": [
+        "list-style-type",
+        "list-style-position",
+        "list-style-image"
+      ],
+      "padding": [
+        "padding-block",
+        "padding-block-start",
+        "padding-block-end",
+        "padding-inline",
+        "padding-inline-start",
+        "padding-inline-end",
+        "padding-top",
+        "padding-right",
+        "padding-bottom",
+        "padding-left"
+      ],
+      "padding-block": [
+        "padding-block-start",
+        "padding-block-end",
+        "padding-top",
+        "padding-right",
+        "padding-bottom",
+        "padding-left"
+      ],
+      "padding-block-start": [
+        "padding-top",
+        "padding-right",
+        "padding-left"
+      ],
+      "padding-block-end": [
+        "padding-right",
+        "padding-bottom",
+        "padding-left"
+      ],
+      "padding-inline": [
+        "padding-inline-start",
+        "padding-inline-end",
+        "padding-top",
+        "padding-right",
+        "padding-bottom",
+        "padding-left"
+      ],
+      "padding-inline-start": [
+        "padding-top",
+        "padding-right",
+        "padding-left"
+      ],
+      "padding-inline-end": [
+        "padding-right",
+        "padding-bottom",
+        "padding-left"
+      ],
+      "margin": [
+        "margin-block",
+        "margin-block-start",
+        "margin-block-end",
+        "margin-inline",
+        "margin-inline-start",
+        "margin-inline-end",
+        "margin-top",
+        "margin-right",
+        "margin-bottom",
+        "margin-left"
+      ],
+      "margin-block": [
+        "margin-block-start",
+        "margin-block-end",
+        "margin-top",
+        "margin-right",
+        "margin-bottom",
+        "margin-left"
+      ],
+      "margin-inline": [
+        "margin-inline-start",
+        "margin-inline-end",
+        "margin-top",
+        "margin-right",
+        "margin-bottom",
+        "margin-left"
+      ],
+      "margin-inline-start": [
+        "margin-top",
+        "margin-right",
+        "margin-bottom",
+        "margin-left"
+      ],
+      "margin-inline-end": [
+        "margin-top",
+        "margin-right",
+        "margin-bottom",
+        "margin-left"
+      ],
       "border": [
         "border-top",
         "border-right",
@@ -25881,7 +26032,19 @@ var require_main = __commonJS({
         "border-top-color",
         "border-right-color",
         "border-bottom-color",
-        "border-left-color"
+        "border-left-color",
+        "border-block",
+        "border-block-start",
+        "border-block-end",
+        "border-block-width",
+        "border-block-style",
+        "border-block-color",
+        "border-inline",
+        "border-inline-start",
+        "border-inline-end",
+        "border-inline-width",
+        "border-inline-style",
+        "border-inline-color"
       ],
       "border-top": [
         "border-width",
@@ -25939,99 +26102,64 @@ var require_main = __commonJS({
         "border-bottom-right-radius",
         "border-bottom-left-radius"
       ],
+      "border-block": [
+        "border-block-start",
+        "border-block-end",
+        "border-block-width",
+        "border-width",
+        "border-block-style",
+        "border-style",
+        "border-block-color",
+        "border-color"
+      ],
       "border-block-start": [
         "border-block-start-width",
+        "border-width",
         "border-block-start-style",
-        "border-block-start-color"
+        "border-style",
+        "border-block-start-color",
+        "border-color"
       ],
       "border-block-end": [
         "border-block-end-width",
+        "border-width",
         "border-block-end-style",
-        "border-block-end-color"
+        "border-style",
+        "border-block-end-color",
+        "border-color"
       ],
-      "border-image": [
-        "border-image-source",
-        "border-image-slice",
-        "border-image-width",
-        "border-image-outset",
-        "border-image-repeat"
+      "border-inline": [
+        "border-inline-start",
+        "border-inline-end",
+        "border-inline-width",
+        "border-width",
+        "border-inline-style",
+        "border-style",
+        "border-inline-color",
+        "border-color"
       ],
       "border-inline-start": [
         "border-inline-start-width",
+        "border-width",
         "border-inline-start-style",
-        "border-inline-start-color"
+        "border-style",
+        "border-inline-start-color",
+        "border-color"
       ],
       "border-inline-end": [
         "border-inline-end-width",
+        "border-width",
         "border-inline-end-style",
-        "border-inline-end-color"
-      ],
-      "columns": [
-        "column-width",
-        "column-count"
-      ],
-      "column-rule": [
-        "column-rule-width",
-        "column-rule-style",
-        "column-rule-color"
-      ],
-      "flex": [
-        "flex-grow",
-        "flex-shrink",
-        "flex-basis"
-      ],
-      "flex-flow": [
-        "flex-direction",
-        "flex-wrap"
-      ],
-      "font": [
-        "font-style",
-        "font-variant",
-        "font-weight",
-        "font-stretch",
-        "font-size",
-        "font-family",
-        "line-height"
-      ],
-      "grid": [
-        "grid-template-rows",
-        "grid-template-columns",
-        "grid-template-areas",
-        "grid-auto-rows",
-        "grid-auto-columns",
-        "grid-auto-flow",
-        "column-gap",
-        "row-gap"
-      ],
-      "grid-area": [
-        "grid-row-start",
-        "grid-column-start",
-        "grid-row-end",
-        "grid-column-end"
-      ],
-      "grid-column": [
-        "grid-column-start",
-        "grid-column-end"
-      ],
-      "grid-row": [
-        "grid-row-start",
-        "grid-row-end"
-      ],
-      "grid-template": [
-        "grid-template-columns",
-        "grid-template-rows",
-        "grid-template-areas"
-      ],
-      "list-style": [
-        "list-style-type",
-        "list-style-position",
-        "list-style-image"
+        "border-style",
+        "border-inline-end-color",
+        "border-color"
       ],
-      "margin": [
-        "margin-top",
-        "margin-right",
-        "margin-bottom",
-        "margin-left"
+      "border-image": [
+        "border-image-source",
+        "border-image-slice",
+        "border-image-width",
+        "border-image-outset",
+        "border-image-repeat"
       ],
       "mask": [
         "mask-image",
@@ -26043,6 +26171,50 @@ var require_main = __commonJS({
         "mask-clip",
         "mask-composite"
       ],
+      "inline-size": [
+        "width",
+        "height"
+      ],
+      "block-size": [
+        "width",
+        "height"
+      ],
+      "max-inline-size": [
+        "max-width",
+        "max-height"
+      ],
+      "max-block-size": [
+        "max-width",
+        "max-height"
+      ],
+      "inset": [
+        "inset-block",
+        "inset-block-start",
+        "inset-block-end",
+        "inset-inline",
+        "inset-inline-start",
+        "inset-inline-end",
+        "top",
+        "right",
+        "bottom",
+        "left"
+      ],
+      "inset-block": [
+        "inset-block-start",
+        "inset-block-end",
+        "top",
+        "right",
+        "bottom",
+        "left"
+      ],
+      "inset-inline": [
+        "inset-inline-start",
+        "inset-inline-end",
+        "top",
+        "right",
+        "bottom",
+        "left"
+      ],
       "outline": [
         "outline-color",
         "outline-style",
@@ -26052,28 +26224,6 @@ var require_main = __commonJS({
         "overflow-x",
         "overflow-y"
       ],
-      "padding": [
-        "padding-top",
-        "padding-right",
-        "padding-bottom",
-        "padding-left"
-      ],
-      "padding-inline": [
-        "padding-inline-start",
-        "padding-inline-end"
-      ],
-      "padding-inline-start": [
-        "padding-top",
-        "padding-right",
-        "padding-bottom",
-        "padding-left"
-      ],
-      "padding-inline-end": [
-        "padding-top",
-        "padding-right",
-        "padding-bottom",
-        "padding-left"
-      ],
       "place-content": [
         "align-content",
         "justify-content"
@@ -26355,6 +26505,7 @@ var require_main = __commonJS({
       "columns",
       "contain",
       "content",
+      "content-visibility",
       "counter-increment",
       "counter-reset",
       "counter-set",
@@ -26413,6 +26564,7 @@ var require_main = __commonJS({
       "height",
       "hyphenate-character",
       "hyphens",
+      "image-orientation",
       "image-rendering",
       "inline-size",
       "inset",
@@ -26699,6 +26851,7 @@ var require_main = __commonJS({
       "perspective-origin",
       "appearance",
       "visibility",
+      "content-visibility",
       "opacity",
       "z-index",
       "paint-order",
@@ -26853,6 +27006,7 @@ var require_main = __commonJS({
       "padding-block",
       "padding-block-start",
       "padding-block-end",
+      "image-orientation",
       "image-rendering",
       "aspect-ratio",
       "width",
@@ -27004,6 +27158,7 @@ var require_main = __commonJS({
       "display",
       "appearance",
       "visibility",
+      "content-visibility",
       "z-index",
       "paint-order",
       "position",
@@ -27303,6 +27458,7 @@ var require_main = __commonJS({
       "cursor",
       "empty-cells",
       "filter",
+      "image-orientation",
       "image-rendering",
       "mask",
       "mask-border",
@@ -27484,7 +27640,7 @@ var require_src2 = __commonJS({
               node.remove();
               return;
             }
-            if (node.raws.between) {
+            if (typeof node.raws.between === "string") {
               node.raws.between = replaceComments(node.raws.between, list.space);
             }
             if (node.type === "decl") {
@@ -73215,11 +73371,12 @@ var require_src11 = __commonJS({
       ...grid,
       ...columnRules
     ]);
+    var variableFunctions = /* @__PURE__ */ new Set(["var", "env", "constant"]);
     function isVariableFunctionNode(node) {
       if (node.type !== "function") {
         return false;
       }
-      return ["var", "env"].includes(node.value.toLowerCase());
+      return variableFunctions.has(node.value.toLowerCase());
     }
     function shouldAbort(parsed) {
       let abort = false;
@@ -73386,15 +73543,17 @@ var require_src12 = __commonJS({
         }
         return;
       }
-      const uniques = /* @__PURE__ */ new Set();
       selector.walk((child) => {
-        if (child.type === "selector") {
-          const childStr = String(child);
-          if (!uniques.has(childStr)) {
-            uniques.add(childStr);
-          } else {
-            child.remove();
-          }
+        if (child.type === "selector" && child.parent) {
+          const uniques = /* @__PURE__ */ new Set();
+          child.parent.each((sibling) => {
+            const siblingStr = String(sibling);
+            if (!uniques.has(siblingStr)) {
+              uniques.add(siblingStr);
+            } else {
+              sibling.remove();
+            }
+          });
         }
       });
       if (pseudoElements.has(value)) {
@@ -75163,7 +75322,7 @@ var require_parseWsc = __commonJS({
     var { list } = require_postcss();
     var { isWidth, isStyle, isColor } = require_validateWsc();
     var none = /^\s*(none|medium)(\s+none(\s+(none|currentcolor))?)?\s*$/i;
-    var varRE = /--(\w|[^\x00-\x7F])+/g;
+    var varRE = /--(\w|-|[^\x00-\x7F])+/g;
     var toLower = (v) => {
       let match;
       let lastIndex = 0;
@@ -76246,11 +76405,12 @@ var require_src21 = __commonJS({
     function isCommaNode(node) {
       return node.type === "div" && node.value === ",";
     }
+    var variableFunctions = /* @__PURE__ */ new Set(["var", "env", "constant"]);
     function isVariableFunctionNode(node) {
       if (node.type !== "function") {
         return false;
       }
-      return ["var", "env"].includes(node.value.toLowerCase());
+      return variableFunctions.has(node.value.toLowerCase());
     }
     function transform(value) {
       const parsed = valueParser(value);
@@ -76531,7 +76691,7 @@ var require_src22 = __commonJS({
     }
     function intersect(a, b, not) {
       return a.filter((c) => {
-        const index = ~indexOfDeclaration(b, c);
+        const index = indexOfDeclaration(b, c) !== -1;
         return not ? !index : index;
       });
     }
@@ -76549,14 +76709,16 @@ var require_src22 = __commonJS({
         return false;
       }
       const parent = sameParent(ruleA, ruleB);
-      const { name } = ruleA.parent;
-      if (parent && name && name.includes("keyframes")) {
+      if (parent && ruleA.parent && ruleA.parent.type === "atrule" && ruleA.parent.name.includes("keyframes")) {
         return false;
       }
       return parent && (selectors.every(noVendor) || sameVendor(a, b));
     }
+    function isDeclaration(node) {
+      return node.type === "decl";
+    }
     function getDecls(rule) {
-      return rule.nodes.filter((node) => node.type === "decl");
+      return rule.nodes.filter(isDeclaration);
     }
     var joinSelectors = (...rules) => rules.map((s) => s.selector).join();
     function ruleLength(...rules) {
@@ -76673,7 +76835,7 @@ var require_src22 = __commonJS({
       const secondClone = second.clone();
       function moveDecl(callback) {
         return (decl) => {
-          if (~indexOfDeclaration(intersection, decl)) {
+          if (indexOfDeclaration(intersection, decl) !== -1) {
             callback.call(this, decl);
           }
         };
@@ -76722,12 +76884,12 @@ var require_src22 = __commonJS({
         }
         if (cache.selector === rule.selector) {
           const cached = getDecls(cache);
-          rule.walk((decl) => {
-            if (~indexOfDeclaration(cached, decl)) {
-              decl.remove();
+          rule.walk((node) => {
+            if (node.type === "decl" && indexOfDeclaration(cached, node) !== -1) {
+              node.remove();
               return;
             }
-            cache.append(decl);
+            cache.append(node);
           });
           rule.remove();
           return;
@@ -77058,6 +77220,7 @@ var require_src26 = __commonJS({
       ["top", "0"]
     ]);
     var mathFunctions = /* @__PURE__ */ new Set(["calc", "min", "max", "clamp"]);
+    var variableFunctions = /* @__PURE__ */ new Set(["var", "env", "constant"]);
     function isCommaNode(node) {
       return node.type === "div" && node.value === ",";
     }
@@ -77065,7 +77228,7 @@ var require_src26 = __commonJS({
       if (node.type !== "function") {
         return false;
       }
-      return ["var", "env"].includes(node.value.toLowerCase());
+      return variableFunctions.has(node.value.toLowerCase());
     }
     function isMathFunctionNode(node) {
       if (node.type !== "function") {

package/scripts/generate-types.js

@@ -1,8 +1,10 @@
 import prettier from 'prettier'
 import { corePlugins } from '../src/corePlugins'
 import colors from '../src/public/colors'
+import defaultTheme from '../src/public/default-theme'
 import fs from 'fs'
 import path from 'path'
+import * as types from './type-utils'
 
 fs.writeFileSync(
   path.join(process.cwd(), 'types', 'generated', 'corePluginList.d.ts'),
@@ -50,3 +52,54 @@ fs.writeFileSync(
     }
   )
 )
+
+const defaultThemeTypes = Object.entries(defaultTheme)
+  .map(([name, value]) => {
+    // Special cases for slightly more accurate types
+    if (name === 'keyframes') {
+      return [name, `Record<${types.forKeys(value)}, Record<string, CSSDeclarationList>>`]
+    }
+
+    if (name === 'fontSize') {
+      return [name, `Record<${types.forKeys(value)}, [string, { lineHeight: string }]>`]
+    }
+
+    // General cases
+    if (typeof value === 'string') {
+      return [name, `string`]
+    }
+
+    if (typeof value === 'function') {
+      return [name, null]
+    }
+
+    if (typeof value === 'object') {
+      if (Object.keys(value).length === 0) {
+        return [name, null]
+      }
+
+      return [name, types.forValue(value)]
+    }
+
+    return [name, `unknown`]
+  })
+  .filter(([, type]) => type !== null)
+  .map(([name, type]) => `${name}: ${type}`)
+  .join('\n')
+
+fs.writeFileSync(
+  path.join(process.cwd(), 'types', 'generated', 'default-theme.d.ts'),
+  prettier.format(
+    `
+    import { Config } from '../../types'
+    type CSSDeclarationList = Record<string, string>
+    export type DefaultTheme = Config['theme'] & { ${defaultThemeTypes} }
+  `,
+    {
+      semi: false,
+      singleQuote: true,
+      printWidth: 100,
+      parser: 'typescript',
+    }
+  )
+)