tailwindcss 3.1.1 → 3.1.4

package/peers/index.js

@@ -25862,6 +25862,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 +26030,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 +26100,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 +26169,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 +26222,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 +26503,7 @@ var require_main = __commonJS({
       "columns",
       "contain",
       "content",
+      "content-visibility",
       "counter-increment",
       "counter-reset",
       "counter-set",
@@ -26413,6 +26562,7 @@ var require_main = __commonJS({
       "height",
       "hyphenate-character",
       "hyphens",
+      "image-orientation",
       "image-rendering",
       "inline-size",
       "inset",
@@ -26699,6 +26849,7 @@ var require_main = __commonJS({
       "perspective-origin",
       "appearance",
       "visibility",
+      "content-visibility",
       "opacity",
       "z-index",
       "paint-order",
@@ -26853,6 +27004,7 @@ var require_main = __commonJS({
       "padding-block",
       "padding-block-start",
       "padding-block-end",
+      "image-orientation",
       "image-rendering",
       "aspect-ratio",
       "width",
@@ -27004,6 +27156,7 @@ var require_main = __commonJS({
       "display",
       "appearance",
       "visibility",
+      "content-visibility",
       "z-index",
       "paint-order",
       "position",
@@ -27303,6 +27456,7 @@ var require_main = __commonJS({
       "cursor",
       "empty-cells",
       "filter",
+      "image-orientation",
       "image-rendering",
       "mask",
       "mask-border",
@@ -27484,7 +27638,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") {
@@ -73219,7 +73373,7 @@ var require_src11 = __commonJS({
       if (node.type !== "function") {
         return false;
       }
-      return ["var", "env"].includes(node.value.toLowerCase());
+      return ["var", "env", "constant"].includes(node.value.toLowerCase());
     }
     function shouldAbort(parsed) {
       let abort = false;
@@ -73386,15 +73540,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)) {
@@ -76531,7 +76687,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 +76705,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 +76831,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 +76880,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;

package/src/cli.js

@@ -484,6 +484,45 @@ async function build() {
     return [beforePlugins, afterPlugins, config.options]
   }
 
+  function loadBuiltinPostcssPlugins() {
+    let postcss = loadPostcss()
+    let IMPORT_COMMENT = '__TAILWIND_RESTORE_IMPORT__: '
+    return [
+      [
+        (root) => {
+          root.walkAtRules('import', (rule) => {
+            if (rule.params.slice(1).startsWith('tailwindcss/')) {
+              rule.after(postcss.comment({ text: IMPORT_COMMENT + rule.params }))
+              rule.remove()
+            }
+          })
+        },
+        (() => {
+          try {
+            return require('postcss-import')
+          } catch {}
+
+          return lazyPostcssImport()
+        })(),
+        (root) => {
+          root.walkComments((rule) => {
+            if (rule.text.startsWith(IMPORT_COMMENT)) {
+              rule.after(
+                postcss.atRule({
+                  name: 'import',
+                  params: rule.text.replace(IMPORT_COMMENT, ''),
+                })
+              )
+              rule.remove()
+            }
+          })
+        },
+      ],
+      [],
+      {},
+    ]
+  }
+
   function resolveConfig() {
     let config = configPath ? require(configPath) : {}
 
@@ -568,44 +607,9 @@ async function build() {
 
     tailwindPlugin.postcss = true
 
-    let IMPORT_COMMENT = '__TAILWIND_RESTORE_IMPORT__: '
-
     let [beforePlugins, afterPlugins, postcssOptions] = includePostCss
       ? await loadPostCssPlugins()
-      : [
-          [
-            (root) => {
-              root.walkAtRules('import', (rule) => {
-                if (rule.params.slice(1).startsWith('tailwindcss/')) {
-                  rule.after(postcss.comment({ text: IMPORT_COMMENT + rule.params }))
-                  rule.remove()
-                }
-              })
-            },
-            (() => {
-              try {
-                return require('postcss-import')
-              } catch {}
-
-              return lazyPostcssImport()
-            })(),
-            (root) => {
-              root.walkComments((rule) => {
-                if (rule.text.startsWith(IMPORT_COMMENT)) {
-                  rule.after(
-                    postcss.atRule({
-                      name: 'import',
-                      params: rule.text.replace(IMPORT_COMMENT, ''),
-                    })
-                  )
-                  rule.remove()
-                }
-              })
-            },
-          ],
-          [],
-          {},
-        ]
+      : loadBuiltinPostcssPlugins()
 
     let plugins = [
       ...beforePlugins,
@@ -705,7 +709,9 @@ async function build() {
       return resolveConfig()
     }
 
-    let [beforePlugins, afterPlugins] = includePostCss ? await loadPostCssPlugins() : [[], []]
+    let [beforePlugins, afterPlugins] = includePostCss
+      ? await loadPostCssPlugins()
+      : loadBuiltinPostcssPlugins()
 
     let plugins = [
       ...beforePlugins,

package/src/corePlugins.js

@@ -14,6 +14,7 @@ import { version as tailwindVersion } from '../package.json'
 import log from './util/log'
 import { normalizeScreens } from './util/normalizeScreens'
 import { formatBoxShadowValue, parseBoxShadowValue } from './util/parseBoxShadowValue'
+import { removeAlphaVariables } from './util/removeAlphaVariables'
 import { flagEnabled } from './featureFlags'
 
 export let variantPlugins = {
@@ -21,7 +22,19 @@ export let variantPlugins = {
     addVariant('first-letter', '&::first-letter')
     addVariant('first-line', '&::first-line')
 
-    addVariant('marker', ['& *::marker', '&::marker'])
+    addVariant('marker', [
+      ({ container }) => {
+        removeAlphaVariables(container, ['--tw-text-opacity'])
+
+        return '& *::marker'
+      },
+      ({ container }) => {
+        removeAlphaVariables(container, ['--tw-text-opacity'])
+
+        return '&::marker'
+      },
+    ])
+
     addVariant('selection', ['& *::selection', '&::selection'])
 
     addVariant('file', '&::file-selector-button')
@@ -77,21 +90,11 @@ export let variantPlugins = {
       [
         'visited',
         ({ container }) => {
-          let toRemove = ['--tw-text-opacity', '--tw-border-opacity', '--tw-bg-opacity']
-
-          container.walkDecls((decl) => {
-            if (toRemove.includes(decl.prop)) {
-              decl.remove()
-
-              return
-            }
-
-            for (const varName of toRemove) {
-              if (decl.value.includes(`/ var(${varName})`)) {
-                decl.value = decl.value.replace(`/ var(${varName})`, '')
-              }
-            }
-          })
+          removeAlphaVariables(container, [
+            '--tw-text-opacity',
+            '--tw-border-opacity',
+            '--tw-bg-opacity',
+          ])
 
           return '&:visited'
         },