tailwindcss 0.0.0-insiders.ebc1c7a → 0.0.0-insiders.ec0049a

package/src/lib/expandApplyAtRules.js

@@ -1,251 +0,0 @@
-import postcss from 'postcss'
-import { resolveMatches } from './generateRules'
-import bigSign from '../util/bigSign'
-import escapeClassName from '../util/escapeClassName'
-
-function prefix(context, selector) {
-  let prefix = context.tailwindConfig.prefix
-  return typeof prefix === 'function' ? prefix(selector) : prefix + selector
-}
-
-function buildApplyCache(applyCandidates, context) {
-  for (let candidate of applyCandidates) {
-    if (context.notClassCache.has(candidate) || context.applyClassCache.has(candidate)) {
-      continue
-    }
-
-    if (context.classCache.has(candidate)) {
-      context.applyClassCache.set(
-        candidate,
-        context.classCache.get(candidate).map(([meta, rule]) => [meta, rule.clone()])
-      )
-      continue
-    }
-
-    let matches = Array.from(resolveMatches(candidate, context))
-
-    if (matches.length === 0) {
-      context.notClassCache.add(candidate)
-      continue
-    }
-
-    context.applyClassCache.set(candidate, matches)
-  }
-
-  return context.applyClassCache
-}
-
-function extractApplyCandidates(params) {
-  let candidates = params.split(/[\s\t\n]+/g)
-
-  if (candidates[candidates.length - 1] === '!important') {
-    return [candidates.slice(0, -1), true]
-  }
-
-  return [candidates, false]
-}
-
-function partitionApplyParents(root) {
-  let applyParents = new Set()
-
-  root.walkAtRules('apply', (rule) => {
-    applyParents.add(rule.parent)
-  })
-
-  for (let rule of applyParents) {
-    let nodeGroups = []
-    let lastGroup = []
-
-    for (let node of rule.nodes) {
-      if (node.type === 'atrule' && node.name === 'apply') {
-        if (lastGroup.length > 0) {
-          nodeGroups.push(lastGroup)
-          lastGroup = []
-        }
-        nodeGroups.push([node])
-      } else {
-        lastGroup.push(node)
-      }
-    }
-
-    if (lastGroup.length > 0) {
-      nodeGroups.push(lastGroup)
-    }
-
-    if (nodeGroups.length === 1) {
-      continue
-    }
-
-    for (let group of [...nodeGroups].reverse()) {
-      let newParent = rule.clone({ nodes: [] })
-      newParent.append(group)
-      rule.after(newParent)
-    }
-
-    rule.remove()
-  }
-}
-
-function processApply(root, context) {
-  let applyCandidates = new Set()
-
-  // Collect all @apply rules and candidates
-  let applies = []
-  root.walkAtRules('apply', (rule) => {
-    let [candidates] = extractApplyCandidates(rule.params)
-
-    for (let util of candidates) {
-      applyCandidates.add(util)
-    }
-
-    applies.push(rule)
-  })
-
-  // Start the @apply process if we have rules with @apply in them
-  if (applies.length > 0) {
-    // Fill up some caches!
-    let applyClassCache = buildApplyCache(applyCandidates, context)
-
-    /**
-     * When we have an apply like this:
-     *
-     * .abc {
-     *    @apply hover:font-bold;
-     * }
-     *
-     * What we essentially will do is resolve to this:
-     *
-     * .abc {
-     *    @apply .hover\:font-bold:hover {
-     *      font-weight: 500;
-     *    }
-     * }
-     *
-     * Notice that the to-be-applied class is `.hover\:font-bold:hover` and that the utility candidate was `hover:font-bold`.
-     * What happens in this function is that we prepend a `.` and escape the candidate.
-     * This will result in `.hover\:font-bold`
-     * Which means that we can replace `.hover\:font-bold` with `.abc` in `.hover\:font-bold:hover` resulting in `.abc:hover`
-     */
-    // TODO: Should we use postcss-selector-parser for this instead?
-    function replaceSelector(selector, utilitySelectors, candidate) {
-      let needle = `.${escapeClassName(candidate)}`
-      let utilitySelectorsList = utilitySelectors.split(/\s*,\s*/g)
-
-      return selector
-        .split(/\s*,\s*/g)
-        .map((s) => {
-          let replaced = []
-
-          for (let utilitySelector of utilitySelectorsList) {
-            let replacedSelector = utilitySelector.replace(needle, s)
-            if (replacedSelector === utilitySelector) {
-              continue
-            }
-            replaced.push(replacedSelector)
-          }
-          return replaced.join(', ')
-        })
-        .join(', ')
-    }
-
-    let perParentApplies = new Map()
-
-    // Collect all apply candidates and their rules
-    for (let apply of applies) {
-      let candidates = perParentApplies.get(apply.parent) || []
-
-      perParentApplies.set(apply.parent, candidates)
-
-      let [applyCandidates, important] = extractApplyCandidates(apply.params)
-
-      if (apply.parent.type === 'atrule') {
-        if (apply.parent.name === 'screen') {
-          const screenType = apply.parent.params
-
-          throw apply.error(
-            `@apply is not supported within nested at-rules like @screen. We suggest you write this as @apply ${applyCandidates
-              .map((c) => `${screenType}:${c}`)
-              .join(' ')} instead.`
-          )
-        }
-
-        throw apply.error(
-          `@apply is not supported within nested at-rules like @${apply.parent.name}. You can fix this by un-nesting @${apply.parent.name}.`
-        )
-      }
-
-      for (let applyCandidate of applyCandidates) {
-        if (!applyClassCache.has(applyCandidate)) {
-          if (applyCandidate === prefix(context, 'group')) {
-            // TODO: Link to specific documentation page with error code.
-            throw apply.error(`@apply should not be used with the '${applyCandidate}' utility`)
-          }
-
-          throw apply.error(
-            `The \`${applyCandidate}\` class does not exist. If \`${applyCandidate}\` is a custom class, make sure it is defined within a \`@layer\` directive.`
-          )
-        }
-
-        let rules = applyClassCache.get(applyCandidate)
-
-        candidates.push([applyCandidate, important, rules])
-      }
-    }
-
-    for (const [parent, candidates] of perParentApplies) {
-      let siblings = []
-
-      for (let [applyCandidate, important, rules] of candidates) {
-        for (let [meta, node] of rules) {
-          let root = postcss.root({ nodes: [node.clone()] })
-          let canRewriteSelector =
-            node.type !== 'atrule' || (node.type === 'atrule' && node.name !== 'keyframes')
-
-          if (canRewriteSelector) {
-            root.walkRules((rule) => {
-              rule.selector = replaceSelector(parent.selector, rule.selector, applyCandidate)
-
-              rule.walkDecls((d) => {
-                d.important = meta.important || important
-              })
-            })
-          }
-
-          // Insert it
-          siblings.push([
-            // Ensure that when we are sorting, that we take the layer order into account
-            { ...meta, sort: meta.sort | context.layerOrder[meta.layer] },
-            root.nodes[0],
-          ])
-        }
-      }
-
-      // Inject the rules, sorted, correctly
-      let nodes = siblings.sort(([a], [z]) => bigSign(a.sort - z.sort)).map((s) => s[1])
-
-      // console.log(parent)
-      // `parent` refers to the node at `.abc` in: .abc { @apply mt-2 }
-      parent.after(nodes)
-    }
-
-    for (let apply of applies) {
-      // If there are left-over declarations, just remove the @apply
-      if (apply.parent.nodes.length > 1) {
-        apply.remove()
-      } else {
-        // The node is empty, drop the full node
-        apply.parent.remove()
-      }
-    }
-
-    // Do it again, in case we have other `@apply` rules
-    processApply(root, context)
-  }
-}
-
-export default function expandApplyAtRules(context) {
-  return (root) => {
-    partitionApplyParents(root)
-    processApply(root, context)
-  }
-}

package/src/lib/expandTailwindAtRules.js

@@ -1,262 +0,0 @@
-import * as sharedState from './sharedState'
-import { generateRules } from './generateRules'
-import bigSign from '../util/bigSign'
-import cloneNodes from '../util/cloneNodes'
-
-let env = sharedState.env
-let contentMatchCache = sharedState.contentMatchCache
-
-const PATTERNS = [
-  "([^<>\"'`\\s]*\\['[^<>\"'`\\s]*'\\])", // `content-['hello']` but not `content-['hello']']`
-  '([^<>"\'`\\s]*\\["[^<>"\'`\\s]*"\\])', // `content-["hello"]` but not `content-["hello"]"]`
-  '([^<>"\'`\\s]*\\[[^<>"\'`\\s]+\\])', // `fill-[#bada55]`
-  '([^<>"\'`\\s]*[^<>"\'`\\s:])', // `px-1.5`, `uppercase` but not `uppercase:`
-].join('|')
-const BROAD_MATCH_GLOBAL_REGEXP = new RegExp(PATTERNS, 'g')
-const INNER_MATCH_GLOBAL_REGEXP = /[^<>"'`\s.(){}[\]#=%]*[^<>"'`\s.(){}[\]#=%:]/g
-
-const builtInExtractors = {
-  DEFAULT: (content) => {
-    let broadMatches = content.match(BROAD_MATCH_GLOBAL_REGEXP) || []
-    let innerMatches = content.match(INNER_MATCH_GLOBAL_REGEXP) || []
-
-    return [...broadMatches, ...innerMatches]
-  },
-}
-
-const builtInTransformers = {
-  DEFAULT: (content) => content,
-  svelte: (content) => content.replace(/(?:^|\s)class:/g, ' '),
-}
-
-function getExtractor(tailwindConfig, fileExtension) {
-  let extractors = tailwindConfig.content.extract
-  let contentOptions = tailwindConfig.content.options
-
-  if (typeof extractors === 'function') {
-    extractors = {
-      DEFAULT: extractors,
-    }
-  }
-  if (contentOptions.defaultExtractor) {
-    extractors.DEFAULT = contentOptions.defaultExtractor
-  }
-  for (let { extensions, extractor } of contentOptions.extractors || []) {
-    for (let extension of extensions) {
-      extractors[extension] = extractor
-    }
-  }
-
-  return (
-    extractors[fileExtension] ||
-    extractors.DEFAULT ||
-    builtInExtractors[fileExtension] ||
-    builtInExtractors.DEFAULT
-  )
-}
-
-function getTransformer(tailwindConfig, fileExtension) {
-  let transformers = tailwindConfig.content.transform
-
-  if (typeof transformers === 'function') {
-    transformers = {
-      DEFAULT: transformers,
-    }
-  }
-
-  return (
-    transformers[fileExtension] ||
-    transformers.DEFAULT ||
-    builtInTransformers[fileExtension] ||
-    builtInTransformers.DEFAULT
-  )
-}
-
-// Scans template contents for possible classes. This is a hot path on initial build but
-// not too important for subsequent builds. The faster the better though — if we can speed
-// up these regexes by 50% that could cut initial build time by like 20%.
-function getClassCandidates(content, extractor, contentMatchCache, candidates, seen) {
-  for (let line of content.split('\n')) {
-    line = line.trim()
-
-    if (seen.has(line)) {
-      continue
-    }
-    seen.add(line)
-
-    if (contentMatchCache.has(line)) {
-      for (let match of contentMatchCache.get(line)) {
-        candidates.add(match)
-      }
-    } else {
-      let extractorMatches = extractor(line).filter((s) => s !== '!*')
-      let lineMatchesSet = new Set(extractorMatches)
-
-      for (let match of lineMatchesSet) {
-        candidates.add(match)
-      }
-
-      contentMatchCache.set(line, lineMatchesSet)
-    }
-  }
-}
-
-function buildStylesheet(rules, context) {
-  let sortedRules = rules.sort(([a], [z]) => bigSign(a - z))
-
-  let returnValue = {
-    base: new Set(),
-    components: new Set(),
-    utilities: new Set(),
-    variants: new Set(),
-
-    // All the CSS that is not Tailwind related can be put in this bucket. This
-    // will make it easier to later use this information when we want to
-    // `@apply` for example. The main reason we do this here is because we
-    // still need to make sure the order is correct. Last but not least, we
-    // will make sure to always re-inject this section into the css, even if
-    // certain rules were not used. This means that it will look like a no-op
-    // from the user's perspective, but we gathered all the useful information
-    // we need.
-    user: new Set(),
-  }
-
-  for (let [sort, rule] of sortedRules) {
-    if (sort >= context.minimumScreen) {
-      returnValue.variants.add(rule)
-      continue
-    }
-
-    if (sort & context.layerOrder.base) {
-      returnValue.base.add(rule)
-      continue
-    }
-
-    if (sort & context.layerOrder.components) {
-      returnValue.components.add(rule)
-      continue
-    }
-
-    if (sort & context.layerOrder.utilities) {
-      returnValue.utilities.add(rule)
-      continue
-    }
-
-    if (sort & context.layerOrder.user) {
-      returnValue.user.add(rule)
-      continue
-    }
-  }
-
-  return returnValue
-}
-
-export default function expandTailwindAtRules(context) {
-  return (root) => {
-    let layerNodes = {
-      base: null,
-      components: null,
-      utilities: null,
-      variants: null,
-    }
-
-    // Make sure this file contains Tailwind directives. If not, we can save
-    // a lot of work and bail early. Also we don't have to register our touch
-    // file as a dependency since the output of this CSS does not depend on
-    // the source of any templates. Think Vue <style> blocks for example.
-    root.walkAtRules('tailwind', (rule) => {
-      if (Object.keys(layerNodes).includes(rule.params)) {
-        layerNodes[rule.params] = rule
-      }
-    })
-
-    if (Object.values(layerNodes).every((n) => n === null)) {
-      return root
-    }
-
-    // ---
-
-    // Find potential rules in changed files
-    let candidates = new Set(['*'])
-    let seen = new Set()
-
-    env.DEBUG && console.time('Reading changed files')
-
-    for (let { content, extension } of context.changedContent) {
-      let transformer = getTransformer(context.tailwindConfig, extension)
-      let extractor = getExtractor(context.tailwindConfig, extension)
-      getClassCandidates(transformer(content), extractor, contentMatchCache, candidates, seen)
-    }
-
-    // ---
-
-    // Generate the actual CSS
-    let classCacheCount = context.classCache.size
-
-    env.DEBUG && console.time('Generate rules')
-    let rules = generateRules(candidates, context)
-    env.DEBUG && console.timeEnd('Generate rules')
-
-    // We only ever add to the classCache, so if it didn't grow, there is nothing new.
-    env.DEBUG && console.time('Build stylesheet')
-    if (context.stylesheetCache === null || context.classCache.size !== classCacheCount) {
-      for (let rule of rules) {
-        context.ruleCache.add(rule)
-      }
-
-      context.stylesheetCache = buildStylesheet([...context.ruleCache], context)
-    }
-    env.DEBUG && console.timeEnd('Build stylesheet')
-
-    let {
-      base: baseNodes,
-      components: componentNodes,
-      utilities: utilityNodes,
-      variants: screenNodes,
-    } = context.stylesheetCache
-
-    // ---
-
-    // Replace any Tailwind directives with generated CSS
-
-    if (layerNodes.base) {
-      layerNodes.base.before(cloneNodes([...baseNodes], layerNodes.base.source))
-      layerNodes.base.remove()
-    }
-
-    if (layerNodes.components) {
-      layerNodes.components.before(cloneNodes([...componentNodes], layerNodes.components.source))
-      layerNodes.components.remove()
-    }
-
-    if (layerNodes.utilities) {
-      layerNodes.utilities.before(cloneNodes([...utilityNodes], layerNodes.utilities.source))
-      layerNodes.utilities.remove()
-    }
-
-    if (layerNodes.variants) {
-      layerNodes.variants.before(cloneNodes([...screenNodes], layerNodes.variants.source))
-      layerNodes.variants.remove()
-    } else {
-      root.append(cloneNodes([...screenNodes], root.source))
-    }
-
-    // ---
-
-    if (env.DEBUG) {
-      console.log('Potential classes: ', candidates.size)
-      console.log('Active contexts: ', sharedState.contextSourcesMap.size)
-      console.log('Content match entries', contentMatchCache.size)
-    }
-
-    // Clear the cache for the changed files
-    context.changedContent = []
-
-    // Cleanup any leftover @layer atrules
-    root.walkAtRules('layer', (rule) => {
-      if (Object.keys(layerNodes).includes(rule.params)) {
-        rule.remove()
-      }
-    })
-  }
-}