tailwindcss 0.0.0-insiders.df011dc → 0.0.0-insiders.e2d5f21

package/lib/lib/getModuleDependencies.js

@@ -1,53 +1,48 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 exports.default = getModuleDependencies;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _resolve = _interopRequireDefault(require("resolve"));
-
 var _detective = _interopRequireDefault(require("detective"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function createModule(file) {
-  const source = _fs.default.readFileSync(file, 'utf-8');
-
-  const requires = (0, _detective.default)(source);
-  return {
-    file,
-    requires
-  };
+    const source = _fs.default.readFileSync(file, 'utf-8');
+    const requires = (0, _detective).default(source);
+    return {
+        file,
+        requires
+    };
 }
-
 function getModuleDependencies(entryFile) {
-  const rootModule = createModule(entryFile);
-  const modules = [rootModule]; // Iterate over the modules, even when new
-  // ones are being added
-
-  for (const mdl of modules) {
-    mdl.requires.filter(dep => {
-      // Only track local modules, not node_modules
-      return dep.startsWith('./') || dep.startsWith('../');
-    }).forEach(dep => {
-      try {
-        const basedir = _path.default.dirname(mdl.file);
-
-        const depPath = _resolve.default.sync(dep, {
-          basedir
+    const rootModule = createModule(entryFile);
+    const modules = [
+        rootModule
+    ];
+    // Iterate over the modules, even when new
+    // ones are being added
+    for (const mdl of modules){
+        mdl.requires.filter((dep)=>{
+            // Only track local modules, not node_modules
+            return dep.startsWith('./') || dep.startsWith('../');
+        }).forEach((dep)=>{
+            try {
+                const basedir = _path.default.dirname(mdl.file);
+                const depPath = _resolve.default.sync(dep, {
+                    basedir
+                });
+                const depModule = createModule(depPath);
+                modules.push(depModule);
+            } catch (_err) {
+            // eslint-disable-next-line no-empty
+            }
         });
-
-        const depModule = createModule(depPath);
-        modules.push(depModule);
-      } catch (_err) {// eslint-disable-next-line no-empty
-      }
-    });
-  }
-
-  return modules;
-}
+    }
+    return modules;
+}

package/lib/lib/normalizeTailwindDirectives.js

@@ -1,68 +1,76 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 exports.default = normalizeTailwindDirectives;
-
 var _log = _interopRequireDefault(require("../util/log"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function normalizeTailwindDirectives(root) {
-  let tailwindDirectives = new Set();
-  let layerDirectives = new Set();
-  root.walkAtRules(atRule => {
-    if (atRule.name === 'import') {
-      if (atRule.params === '"tailwindcss/base"' || atRule.params === "'tailwindcss/base'") {
-        atRule.name = 'tailwind';
-        atRule.params = 'base';
-      } else if (atRule.params === '"tailwindcss/components"' || atRule.params === "'tailwindcss/components'") {
-        atRule.name = 'tailwind';
-        atRule.params = 'components';
-      } else if (atRule.params === '"tailwindcss/utilities"' || atRule.params === "'tailwindcss/utilities'") {
-        atRule.name = 'tailwind';
-        atRule.params = 'utilities';
-      } else if (atRule.params === '"tailwindcss/screens"' || atRule.params === "'tailwindcss/screens'" || atRule.params === '"tailwindcss/variants"' || atRule.params === "'tailwindcss/variants'") {
-        atRule.name = 'tailwind';
-        atRule.params = 'variants';
-      }
-    }
-
-    if (atRule.name === 'tailwind') {
-      if (atRule.params === 'screens') {
-        atRule.params = 'variants';
-      }
-
-      tailwindDirectives.add(atRule.params);
-    }
-
-    if (['layer', 'responsive', 'variants'].includes(atRule.name)) {
-      if (['responsive', 'variants'].includes(atRule.name)) {
-        _log.default.warn([`'@${atRule.name}' is deprecated, use '@layer utilities' or '@layer components' instead.`]);
-      }
-
-      layerDirectives.add(atRule);
-    }
-  });
-
-  if (!tailwindDirectives.has('base') || !tailwindDirectives.has('components') || !tailwindDirectives.has('utilities')) {
-    for (let rule of layerDirectives) {
-      if (rule.name === 'layer' && ['base', 'components', 'utilities'].includes(rule.params)) {
-        if (!tailwindDirectives.has(rule.params)) {
-          throw rule.error(`\`@layer ${rule.params}\` is used but no matching \`@tailwind ${rule.params}\` directive is present.`);
+    let tailwindDirectives = new Set();
+    let layerDirectives = new Set();
+    root.walkAtRules((atRule)=>{
+        if (atRule.name === 'import') {
+            if (atRule.params === '"tailwindcss/base"' || atRule.params === "'tailwindcss/base'") {
+                atRule.name = 'tailwind';
+                atRule.params = 'base';
+            } else if (atRule.params === '"tailwindcss/components"' || atRule.params === "'tailwindcss/components'") {
+                atRule.name = 'tailwind';
+                atRule.params = 'components';
+            } else if (atRule.params === '"tailwindcss/utilities"' || atRule.params === "'tailwindcss/utilities'") {
+                atRule.name = 'tailwind';
+                atRule.params = 'utilities';
+            } else if (atRule.params === '"tailwindcss/screens"' || atRule.params === "'tailwindcss/screens'" || atRule.params === '"tailwindcss/variants"' || atRule.params === "'tailwindcss/variants'") {
+                atRule.name = 'tailwind';
+                atRule.params = 'variants';
+            }
+        }
+        if (atRule.name === 'tailwind') {
+            if (atRule.params === 'screens') {
+                atRule.params = 'variants';
+            }
+            tailwindDirectives.add(atRule.params);
         }
-      } else if (rule.name === 'responsive') {
-        if (!tailwindDirectives.has('utilities')) {
-          throw rule.error('`@responsive` is used but `@tailwind utilities` is missing.');
+        if ([
+            'layer',
+            'responsive',
+            'variants'
+        ].includes(atRule.name)) {
+            if ([
+                'responsive',
+                'variants'
+            ].includes(atRule.name)) {
+                _log.default.warn(`${atRule.name}-at-rule-deprecated`, [
+                    `The \`@${atRule.name}\` directive has been deprecated in Tailwind CSS v3.0.`,
+                    `Use \`@layer utilities\` or \`@layer components\` instead.`, 
+                ]);
+            }
+            layerDirectives.add(atRule);
         }
-      } else if (rule.name === 'variants') {
-        if (!tailwindDirectives.has('utilities')) {
-          throw rule.error('`@variants` is used but `@tailwind utilities` is missing.');
+    });
+    if (!tailwindDirectives.has('base') || !tailwindDirectives.has('components') || !tailwindDirectives.has('utilities')) {
+        for (let rule of layerDirectives){
+            if (rule.name === 'layer' && [
+                'base',
+                'components',
+                'utilities'
+            ].includes(rule.params)) {
+                if (!tailwindDirectives.has(rule.params)) {
+                    throw rule.error(`\`@layer ${rule.params}\` is used but no matching \`@tailwind ${rule.params}\` directive is present.`);
+                }
+            } else if (rule.name === 'responsive') {
+                if (!tailwindDirectives.has('utilities')) {
+                    throw rule.error('`@responsive` is used but `@tailwind utilities` is missing.');
+                }
+            } else if (rule.name === 'variants') {
+                if (!tailwindDirectives.has('utilities')) {
+                    throw rule.error('`@variants` is used but `@tailwind utilities` is missing.');
+                }
+            }
         }
-      }
     }
-  }
-
-  return tailwindDirectives;
-}
+    return tailwindDirectives;
+}

package/lib/lib/resolveDefaultsAtRules.js

@@ -1,105 +1,125 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 exports.default = resolveDefaultsAtRules;
-
+exports.elementSelectorParser = void 0;
 var _postcss = _interopRequireDefault(require("postcss"));
-
 var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
-
 var _featureFlags = require("../featureFlags");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+let getNode = {
+    id (node) {
+        return _postcssSelectorParser.default.attribute({
+            attribute: 'id',
+            operator: '=',
+            value: node.value,
+            quoteMark: '"'
+        });
+    }
+};
 function minimumImpactSelector(nodes) {
-  let pseudos = nodes.filter(n => n.type === 'pseudo');
-  let [bestNode] = nodes;
-
-  for (let [type, getNode = n => n] of [['class'], ['id', n => _postcssSelectorParser.default.attribute({
-    attribute: 'id',
-    operator: '=',
-    value: n.value,
-    quoteMark: '"'
-  })], ['attribute']]) {
-    let match = nodes.find(n => n.type === type);
-
-    if (match) {
-      bestNode = getNode(match);
-      break;
+    let rest = nodes.filter((node)=>{
+        // Keep non-pseudo nodes
+        if (node.type !== 'pseudo') return true;
+        // Keep pseudo nodes that have subnodes
+        // E.g.: `:not()` contains subnodes inside the parentheses
+        if (node.nodes.length > 0) return true;
+        // Keep pseudo `elements`
+        // This implicitly means that we ignore pseudo `classes`
+        return node.value.startsWith('::') || [
+            ':before',
+            ':after',
+            ':first-line',
+            ':first-letter'
+        ].includes(node.value);
+    }).reverse();
+    let searchFor = new Set([
+        'tag',
+        'class',
+        'id',
+        'attribute'
+    ]);
+    let splitPointIdx = rest.findIndex((n)=>searchFor.has(n.type)
+    );
+    if (splitPointIdx === -1) return rest.reverse().join('').trim();
+    let node1 = rest[splitPointIdx];
+    let bestNode = getNode[node1.type] ? getNode[node1.type](node1) : node1;
+    rest = rest.slice(0, splitPointIdx);
+    let combinatorIdx = rest.findIndex((n)=>n.type === 'combinator' && n.value === '>'
+    );
+    if (combinatorIdx !== -1) {
+        rest.splice(0, combinatorIdx);
+        rest.unshift(_postcssSelectorParser.default.universal());
     }
-  }
-
-  return [bestNode, ...pseudos].join('').trim();
+    return [
+        bestNode,
+        ...rest.reverse()
+    ].join('').trim();
 }
-
-let elementSelectorParser = (0, _postcssSelectorParser.default)(selectors => {
-  return selectors.map(s => {
-    let nodes = s.split(n => n.type === 'combinator').pop().filter(n => n.type !== 'pseudo' || n.value.startsWith('::'));
-    return minimumImpactSelector(nodes);
-  });
+let elementSelectorParser = (0, _postcssSelectorParser).default((selectors)=>{
+    return selectors.map((s)=>{
+        let nodes = s.split((n)=>n.type === 'combinator' && n.value === ' '
+        ).pop();
+        return minimumImpactSelector(nodes);
+    });
 });
+exports.elementSelectorParser = elementSelectorParser;
 let cache = new Map();
-
 function extractElementSelector(selector) {
-  if (!cache.has(selector)) {
-    cache.set(selector, elementSelectorParser.transformSync(selector));
-  }
-
-  return cache.get(selector);
+    if (!cache.has(selector)) {
+        cache.set(selector, elementSelectorParser.transformSync(selector));
+    }
+    return cache.get(selector);
 }
-
-function resolveDefaultsAtRules({
-  tailwindConfig
-}) {
-  return root => {
-    let variableNodeMap = new Map();
-    let universals = new Set();
-    root.walkAtRules('defaults', rule => {
-      if (rule.nodes && rule.nodes.length > 0) {
-        universals.add(rule);
-        return;
-      }
-
-      let variable = rule.params;
-
-      if (!variableNodeMap.has(variable)) {
-        variableNodeMap.set(variable, new Set());
-      }
-
-      variableNodeMap.get(variable).add(rule.parent);
-      rule.remove();
-    });
-
-    for (let universal of universals) {
-      var _variableNodeMap$get;
-
-      let selectors = new Set();
-      let rules = (_variableNodeMap$get = variableNodeMap.get(universal.params)) !== null && _variableNodeMap$get !== void 0 ? _variableNodeMap$get : [];
-
-      for (let rule of rules) {
-        for (let selector of extractElementSelector(rule.selector)) {
-          selectors.add(selector);
+function resolveDefaultsAtRules({ tailwindConfig  }) {
+    return (root)=>{
+        let variableNodeMap = new Map();
+        let universals = new Set();
+        root.walkAtRules('defaults', (rule)=>{
+            if (rule.nodes && rule.nodes.length > 0) {
+                universals.add(rule);
+                return;
+            }
+            let variable = rule.params;
+            if (!variableNodeMap.has(variable)) {
+                variableNodeMap.set(variable, new Set());
+            }
+            variableNodeMap.get(variable).add(rule.parent);
+            rule.remove();
+        });
+        for (let universal of universals){
+            let selectors = new Set();
+            var ref;
+            let rules = (ref = variableNodeMap.get(universal.params)) !== null && ref !== void 0 ? ref : [];
+            for (let rule of rules){
+                for (let selector of extractElementSelector(rule.selector)){
+                    selectors.add(selector);
+                }
+            }
+            if (selectors.size === 0) {
+                universal.remove();
+                continue;
+            }
+            let universalRule = _postcss.default.rule();
+            if ((0, _featureFlags).flagEnabled(tailwindConfig, 'optimizeUniversalDefaults')) {
+                universalRule.selectors = [
+                    ...selectors
+                ];
+            } else {
+                universalRule.selectors = [
+                    '*',
+                    '::before',
+                    '::after'
+                ];
+            }
+            universalRule.append(universal.nodes);
+            universal.before(universalRule);
+            universal.remove();
         }
-      }
-
-      if (selectors.size === 0) {
-        universal.remove();
-        continue;
-      }
-
-      let universalRule = _postcss.default.rule();
-
-      if ((0, _featureFlags.flagEnabled)(tailwindConfig, 'optimizeUniversalDefaults')) {
-        universalRule.selectors = [...selectors];
-      } else {
-        universalRule.selectors = ['*', '::before', '::after'];
-      }
-
-      universalRule.append(universal.nodes);
-      universal.before(universalRule);
-      universal.remove();
-    }
-  };
-}
+    };
+}