tailwindcss 3.0.2 → 3.0.6

package/src/lib/generateRules.js

@@ -248,6 +248,21 @@ function parseRules(rule, cache, options = {}) {
   return [cache.get(rule), options]
 }
 
+const IS_VALID_PROPERTY_NAME = /^[a-z_-]/
+
+function isValidPropName(name) {
+  return IS_VALID_PROPERTY_NAME.test(name)
+}
+
+function isParsableCssValue(property, value) {
+  try {
+    postcss.parse(`a{${property}:${value}}`).toResult()
+    return true
+  } catch (err) {
+    return false
+  }
+}
+
 function extractArbitraryProperty(classCandidate, context) {
   let [, property, value] = classCandidate.match(/^\[([a-zA-Z0-9-_]+):(\S+)\]$/) ?? []
 
@@ -255,9 +270,17 @@ function extractArbitraryProperty(classCandidate, context) {
     return null
   }
 
+  if (!isValidPropName(property)) {
+    return null
+  }
+
+  if (!isValidArbitraryValue(value)) {
+    return null
+  }
+
   let normalized = normalize(value)
 
-  if (!isValidArbitraryValue(normalized)) {
+  if (!isParsableCssValue(property, normalized)) {
     return null
   }
 
@@ -302,7 +325,6 @@ function* resolveMatchedPlugins(classCandidate, context) {
   for (let [prefix, modifier] of candidatePermutations(candidatePrefix)) {
     if (context.candidateRuleMap.has(prefix)) {
       yield [context.candidateRuleMap.get(prefix), negative ? `-${modifier}` : modifier]
-      return
     }
   }
 }

package/src/lib/setupContextUtils.js

@@ -233,6 +233,28 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
           .push([{ sort: offset, layer: 'base' }, rule])
       }
     },
+    /**
+     * @param {string} group
+     * @param {Record<string, string | string[]>} declarations
+     */
+    addDefaults(group, declarations) {
+      const groups = {
+        [`@defaults ${group}`]: declarations,
+      }
+
+      for (let [identifier, rule] of withIdentifiers(groups)) {
+        let prefixedIdentifier = prefixIdentifier(identifier, {})
+        let offset = offsets.base++
+
+        if (!context.candidateRuleMap.has(prefixedIdentifier)) {
+          context.candidateRuleMap.set(prefixedIdentifier, [])
+        }
+
+        context.candidateRuleMap
+          .get(prefixedIdentifier)
+          .push([{ sort: offset, layer: 'defaults' }, rule])
+      }
+    },
     addComponents(components, options) {
       let defaultOptions = {
         respectPrefix: true,
@@ -528,6 +550,7 @@ function registerPlugins(plugins, context) {
   let variantList = []
   let variantMap = new Map()
   let offsets = {
+    defaults: 0n,
     base: 0n,
     components: 0n,
     utilities: 0n,
@@ -555,6 +578,7 @@ function registerPlugins(plugins, context) {
 
   let highestOffset = ((args) => args.reduce((m, e) => (e > m ? e : m)))([
     offsets.base,
+    offsets.defaults,
     offsets.components,
     offsets.utilities,
     offsets.user,
@@ -566,13 +590,14 @@ function registerPlugins(plugins, context) {
   context.arbitraryPropertiesSort = ((1n << reservedBits) << 0n) - 1n
 
   context.layerOrder = {
-    base: (1n << reservedBits) << 0n,
-    components: (1n << reservedBits) << 1n,
-    utilities: (1n << reservedBits) << 2n,
-    user: (1n << reservedBits) << 3n,
+    defaults: (1n << reservedBits) << 0n,
+    base: (1n << reservedBits) << 1n,
+    components: (1n << reservedBits) << 2n,
+    utilities: (1n << reservedBits) << 3n,
+    user: (1n << reservedBits) << 4n,
   }
 
-  reservedBits += 4n
+  reservedBits += 5n
 
   let offset = 0
   context.variantOrder = new Map(
@@ -626,7 +651,15 @@ function registerPlugins(plugins, context) {
         let utils = Array.isArray(util)
           ? (() => {
               let [utilName, options] = util
-              return Object.keys(options?.values ?? {}).map((value) => formatClass(utilName, value))
+              let classes = Object.keys(options?.values ?? {}).map((value) =>
+                formatClass(utilName, value)
+              )
+
+              if (options?.supportsNegativeValues) {
+                classes = [...classes, ...classes.map((cls) => '-' + cls)]
+              }
+
+              return classes
             })()
           : [util]
 

package/src/util/defaults.js

@@ -5,6 +5,12 @@ export function defaults(target, ...sources) {
         target[k] = source[k]
       }
     }
+
+    for (let k of Object.getOwnPropertySymbols(source)) {
+      if (!target?.hasOwnProperty?.(k)) {
+        target[k] = source[k]
+      }
+    }
   }
 
   return target

package/src/util/log.js

@@ -12,6 +12,10 @@ function log(chalk, messages, key) {
   messages.forEach((message) => console.warn(chalk, '-', message))
 }
 
+export function dim(input) {
+  return chalk.dim(input)
+}
+
 export default {
   info(key, messages) {
     log(chalk.bold.cyan('info'), ...(Array.isArray(key) ? [key] : [messages, key]))

package/src/util/normalizeConfig.js

@@ -1,4 +1,4 @@
-import log from './log'
+import log, { dim } from './log'
 
 export function normalizeConfig(config) {
   // Quick structure validation
@@ -245,5 +245,18 @@ export function normalizeConfig(config) {
     })(),
   }
 
+  // Validate globs to prevent bogus globs.
+  // E.g.: `./src/*.{html}` is invalid, the `{html}` should just be `html`
+  for (let file of config.content.files) {
+    if (typeof file === 'string' && /{([^,]*?)}/g.test(file)) {
+      log.warn('invalid-glob-braces', [
+        `The glob pattern ${dim(file)} in your config is invalid.`,
+        `    Update it to ${dim(file.replace(/{([^,]*?)}/g, '$1'))} to silence this warning.`,
+        // TODO: Add https://tw.wtf/invalid-glob-braces
+      ])
+      break
+    }
+  }
+
   return config
 }

package/src/util/toPath.js

@@ -1,4 +1,26 @@
+/**
+ * Parse a path string into an array of path segments.
+ *
+ * Square bracket notation `a[b]` may be used to "escape" dots that would otherwise be interpreted as path separators.
+ *
+ * Example:
+ * a -> ['a]
+ * a.b.c -> ['a', 'b', 'c']
+ * a[b].c -> ['a', 'b', 'c']
+ * a[b.c].e.f -> ['a', 'b.c', 'e', 'f']
+ * a[b][c][d] -> ['a', 'b', 'c', 'd']
+ *
+ * @param {string|string[]} path
+ **/
 export function toPath(path) {
   if (Array.isArray(path)) return path
-  return path.split(/[\.\]\[]+/g)
+
+  let openBrackets = path.split('[').length - 1
+  let closedBrackets = path.split(']').length - 1
+
+  if (openBrackets !== closedBrackets) {
+    throw new Error(`Path is invalid. Has unbalanced brackets: ${path}`)
+  }
+
+  return path.split(/\.(?![^\[]*\])|[\[\]]/g).filter(Boolean)
 }

package/stubs/defaultConfig.stub.js

@@ -854,8 +854,8 @@ module.exports = {
       none: 'none',
       all: 'all',
       DEFAULT:
-        'background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter',
-      colors: 'background-color, border-color, color, fill, stroke',
+        'color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter',
+      colors: 'color, background-color, border-color, text-decoration-color, fill, stroke',
       opacity: 'opacity',
       shadow: 'box-shadow',
       transform: 'transform',

package/peers/.svgo.yml

@@ -1,75 +0,0 @@
-# replace default config
-
-# multipass: true
-# full: true
-
-plugins:
-
-  # - name
-  #
-  # or:
-  # - name: false
-  # - name: true
-  #
-  # or:
-  # - name:
-  #     param1: 1
-  #     param2: 2
-
-  - removeDoctype
-  - removeXMLProcInst
-  - removeComments
-  - removeMetadata
-  - removeXMLNS
-  - removeEditorsNSData
-  - cleanupAttrs
-  - inlineStyles
-  - minifyStyles
-  - convertStyleToAttrs
-  - cleanupIDs
-  - prefixIds
-  - removeRasterImages
-  - removeUselessDefs
-  - cleanupNumericValues
-  - cleanupListOfValues
-  - convertColors
-  - removeUnknownsAndDefaults
-  - removeNonInheritableGroupAttrs
-  - removeUselessStrokeAndFill
-  - removeViewBox
-  - cleanupEnableBackground
-  - removeHiddenElems
-  - removeEmptyText
-  - convertShapeToPath
-  - convertEllipseToCircle
-  - moveElemsAttrsToGroup
-  - moveGroupAttrsToElems
-  - collapseGroups
-  - convertPathData
-  - convertTransform
-  - removeEmptyAttrs
-  - removeEmptyContainers
-  - mergePaths
-  - removeUnusedNS
-  - sortAttrs
-  - sortDefsChildren
-  - removeTitle
-  - removeDesc
-  - removeDimensions
-  - removeAttrs
-  - removeAttributesBySelector
-  - removeElementsByAttr
-  - addClassesToSVGElement
-  - removeStyleElement
-  - removeScriptElement
-  - addAttributesToSVGElement
-  - removeOffCanvasPaths
-  - reusePaths
-
-# configure the indent (default 4 spaces) used by `--pretty` here:
-#
-# @see https://github.com/svg/svgo/blob/master/lib/svgo/js2svg.js#L6 for more config options
-#
-# js2svg:
-#  pretty: true
-#  indent: '  '

package/peers/orders/concentric-css.json

@@ -1,299 +0,0 @@
-[
-  "all",
-  "display",
-  "position",
-  "top",
-  "right",
-  "bottom",
-  "left",
-  "offset-inline-start",
-  "offset-inline-end",
-  "offset-block-start",
-  "offset-block-end",
-  "grid",
-  "grid-area",
-  "grid-auto-columns",
-  "grid-auto-flow",
-  "grid-auto-rows",
-  "grid-column",
-  "grid-column-end",
-  "grid-column-start",
-  "grid-row",
-  "grid-row-end",
-  "grid-row-start",
-  "grid-template",
-  "grid-template-areas",
-  "grid-template-columns",
-  "grid-template-rows",
-  "flex",
-  "flex-basis",
-  "flex-direction",
-  "flex-flow",
-  "flex-grow",
-  "flex-shrink",
-  "flex-wrap",
-  "box-decoration-break",
-  "place-content",
-  "place-items",
-  "place-self",
-  "align-content",
-  "align-items",
-  "align-self",
-  "justify-content",
-  "justify-items",
-  "justify-self",
-  "vertical-align",
-  "order",
-  "float",
-  "clear",
-  "shape-margin",
-  "shape-outside",
-  "shape-image-threshold",
-  "orphans",
-  "columns",
-  "column-gap",
-  "column-fill",
-  "column-rule",
-  "column-rule-color",
-  "column-rule-style",
-  "column-rule-width",
-  "column-span",
-  "column-count",
-  "column-width",
-  "break-before",
-  "break-after",
-  "break-inside",
-  "page-break-before",
-  "page-break-after",
-  "page-break-inside",
-  "transform",
-  "transform-box",
-  "transform-origin",
-  "transform-style",
-  "rotate",
-  "scale",
-
-  "perspective",
-  "perspective-origin",
-  "visibility",
-  "opacity",
-  "z-index",
-  "mix-blend-mode",
-  "backface-visibility",
-  "backdrop-filter",
-  "clip-path",
-  "mask",
-  "mask-clip",
-  "mask-image",
-  "mask-origin",
-  "mask-position",
-  "mask-repeat",
-  "mask-size",
-  "mask-type",
-  "filter",
-  "animation",
-  "animation-name",
-  "animation-duration",
-  "animation-fill-mode",
-  "animation-play-state",
-  "animation-timing-function",
-  "animation-delay",
-  "animation-iteration-count",
-  "animation-direction",
-  "transition",
-  "transition-delay",
-  "transition-duration",
-  "transition-property",
-  "transition-timing-function",
-  "will-change",
-  "counter-increment",
-  "counter-reset",
-  "cursor",
-
-  "box-sizing",
-  "margin",
-  "margin-top",
-  "margin-right",
-  "margin-bottom",
-  "margin-left",
-  "margin-inline-start",
-  "margin-inline-end",
-  "margin-block-start",
-  "margin-block-end",
-  "outline",
-  "outline-color",
-  "outline-offset",
-  "outline-style",
-  "outline-width",
-  "box-shadow",
-  "border",
-  "border-top",
-  "border-right",
-  "border-bottom",
-  "border-left",
-  "border-width",
-  "border-top-width",
-  "border-right-width",
-  "border-bottom-width",
-  "border-left-width",
-  "border-style",
-  "border-top-style",
-  "border-right-style",
-  "border-bottom-style",
-  "border-left-style",
-  "border-radius",
-  "border-top-right-radius",
-  "border-top-left-radius",
-  "border-bottom-right-radius",
-  "border-bottom-left-radius",
-  "border-color",
-  "border-top-color",
-  "border-right-color",
-  "border-bottom-color",
-  "border-left-color",
-  "border-inline-start",
-  "border-inline-start-color",
-  "border-inline-start-style",
-  "border-inline-start-width",
-  "border-inline-end",
-  "border-inline-end-color",
-  "border-inline-end-style",
-  "border-inline-end-width",
-  "border-block-start",
-  "border-block-start-color",
-  "border-block-start-style",
-  "border-block-start-width",
-  "border-block-end",
-  "border-block-end-color",
-  "border-block-end-style",
-  "border-block-end-width",
-  "border-image",
-  "border-image-outset",
-  "border-image-repeat",
-  "border-image-slice",
-  "border-image-source",
-  "border-image-width",
-  "border-collapse",
-  "border-spacing",
-  "background",
-  "background-attachment",
-  "background-blend-mode",
-  "background-clip",
-  "background-color",
-  "background-image",
-  "background-origin",
-  "background-position",
-  "background-position-x",
-  "background-position-y",
-  "background-repeat",
-  "background-size",
-  "isolation",
-  "padding",
-  "padding-top",
-  "padding-right",
-  "padding-bottom",
-  "padding-left",
-  "padding-inline-start",
-  "padding-inline-end",
-  "padding-block-start",
-  "padding-block-end",
-  "image-orientation",
-  "image-rendering",
-
-  "width",
-  "min-width",
-  "max-width",
-  "height",
-  "min-height",
-  "max-height",
-  "inline-size",
-  "min-inline-size",
-  "max-inline-size",
-  "block-size",
-  "min-block-size",
-  "max-block-size",
-  "table-layout",
-  "caption-side",
-  "empty-cells",
-  "overflow",
-  "overflow-x",
-  "overflow-y",
-  "resize",
-  "object-fit",
-  "object-position",
-  "scroll-behavior",
-  "scroll-snap-coordinate",
-  "scroll-snap-destination",
-  "scroll-snap-type",
-  "touch-action",
-  "pointer-events",
-
-  "ruby-align",
-  "ruby-position",
-  "color",
-  "caret-color",
-  "font",
-  "font-family",
-  "font-feature-settings",
-  "font-kerning",
-  "font-language-override",
-  "font-size",
-  "font-optical-sizing",
-  "font-size-adjust",
-  "font-stretch",
-  "font-style",
-  "font-synthesis",
-  "font-variant",
-  "font-variant-alternates",
-  "font-variant-caps",
-  "font-variant-east-asian",
-  "font-variant-ligatures",
-  "font-variant-numeric",
-  "font-variant-position",
-  "font-weight",
-  "hyphens",
-  "initial-letter",
-  "initial-letter-align",
-  "letter-spacing",
-  "line-break",
-  "line-height",
-  "list-style",
-  "list-style-image",
-  "list-style-position",
-  "list-style-type",
-  "writing-mode",
-  "direction",
-  "unicode-bidi",
-  "unicode-range",
-  "user-select",
-  "text-combine-upright",
-  "text-align",
-  "text-align-last",
-  "text-decoration",
-  "text-decoration-color",
-  "text-decoration-line",
-  "text-decoration-skip",
-  "text-decoration-style",
-  "text-decoration-skip-ink",
-  "text-emphasis",
-  "text-emphasis-position",
-  "text-emphasis-color",
-  "text-emphasis-style",
-  "text-indent",
-  "text-justify",
-  "text-underline-position",
-  "text-orientation",
-  "text-overflow",
-  "text-rendering",
-  "text-shadow",
-  "text-size-adjust",
-  "text-transform",
-  "white-space",
-  "word-break",
-  "word-spacing",
-  "overflow-wrap",
-  "quotes",
-  "tab-size",
-  "content",
-  "widows"
-]