tailwindcss 0.0.0-oxide-insiders.0ddc71e → 0.0.0-oxide-insiders.2f21b22

package/lib/value-parser/stringify.js

@@ -0,0 +1,38 @@
+"use strict";
+function stringifyNode(node, custom) {
+    var type = node.type;
+    var value = node.value;
+    var buf;
+    var customResult;
+    if (custom && (customResult = custom(node)) !== undefined) {
+        return customResult;
+    } else if (type === "word" || type === "space") {
+        return value;
+    } else if (type === "string") {
+        buf = node.quote || "";
+        return buf + value + (node.unclosed ? "" : buf);
+    } else if (type === "comment") {
+        return "/*" + value + (node.unclosed ? "" : "*/");
+    } else if (type === "div") {
+        return (node.before || "") + value + (node.after || "");
+    } else if (Array.isArray(node.nodes)) {
+        buf = stringify(node.nodes, custom);
+        if (type !== "function") {
+            return buf;
+        }
+        return value + "(" + (node.before || "") + buf + (node.after || "") + (node.unclosed ? "" : ")");
+    }
+    return value;
+}
+function stringify(nodes, custom) {
+    var result, i;
+    if (Array.isArray(nodes)) {
+        result = "";
+        for(i = nodes.length - 1; ~i; i -= 1){
+            result = stringifyNode(nodes[i], custom) + result;
+        }
+        return result;
+    }
+    return stringifyNode(nodes, custom);
+}
+module.exports = stringify;

package/lib/value-parser/unit.js

@@ -0,0 +1,86 @@
+"use strict";
+var minus = "-".charCodeAt(0);
+var plus = "+".charCodeAt(0);
+var dot = ".".charCodeAt(0);
+var exp = "e".charCodeAt(0);
+var EXP = "E".charCodeAt(0);
+// Check if three code points would start a number
+// https://www.w3.org/TR/css-syntax-3/#starts-with-a-number
+function likeNumber(value) {
+    var code = value.charCodeAt(0);
+    var nextCode;
+    if (code === plus || code === minus) {
+        nextCode = value.charCodeAt(1);
+        if (nextCode >= 48 && nextCode <= 57) {
+            return true;
+        }
+        var nextNextCode = value.charCodeAt(2);
+        if (nextCode === dot && nextNextCode >= 48 && nextNextCode <= 57) {
+            return true;
+        }
+        return false;
+    }
+    if (code === dot) {
+        nextCode = value.charCodeAt(1);
+        if (nextCode >= 48 && nextCode <= 57) {
+            return true;
+        }
+        return false;
+    }
+    if (code >= 48 && code <= 57) {
+        return true;
+    }
+    return false;
+}
+// Consume a number
+// https://www.w3.org/TR/css-syntax-3/#consume-number
+module.exports = function(value) {
+    var pos = 0;
+    var length = value.length;
+    var code;
+    var nextCode;
+    var nextNextCode;
+    if (length === 0 || !likeNumber(value)) {
+        return false;
+    }
+    code = value.charCodeAt(pos);
+    if (code === plus || code === minus) {
+        pos++;
+    }
+    while(pos < length){
+        code = value.charCodeAt(pos);
+        if (code < 48 || code > 57) {
+            break;
+        }
+        pos += 1;
+    }
+    code = value.charCodeAt(pos);
+    nextCode = value.charCodeAt(pos + 1);
+    if (code === dot && nextCode >= 48 && nextCode <= 57) {
+        pos += 2;
+        while(pos < length){
+            code = value.charCodeAt(pos);
+            if (code < 48 || code > 57) {
+                break;
+            }
+            pos += 1;
+        }
+    }
+    code = value.charCodeAt(pos);
+    nextCode = value.charCodeAt(pos + 1);
+    nextNextCode = value.charCodeAt(pos + 2);
+    if ((code === exp || code === EXP) && (nextCode >= 48 && nextCode <= 57 || (nextCode === plus || nextCode === minus) && nextNextCode >= 48 && nextNextCode <= 57)) {
+        pos += nextCode === plus || nextCode === minus ? 3 : 2;
+        while(pos < length){
+            code = value.charCodeAt(pos);
+            if (code < 48 || code > 57) {
+                break;
+            }
+            pos += 1;
+        }
+    }
+    return {
+        number: value.slice(0, pos),
+        unit: value.slice(pos)
+    };
+};

package/lib/value-parser/walk.js

@@ -0,0 +1,16 @@
+"use strict";
+module.exports = function walk(nodes, cb, bubble) {
+    var i, max, node, result;
+    for(i = 0, max = nodes.length; i < max; i += 1){
+        node = nodes[i];
+        if (!bubble) {
+            result = cb(node, i, nodes);
+        }
+        if (result !== false && node.type === "function" && Array.isArray(node.nodes)) {
+            walk(node.nodes, cb, bubble);
+        }
+        if (bubble) {
+            cb(node, i, nodes);
+        }
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-oxide-insiders.0ddc71e",
+  "version": "0.0.0-oxide-insiders.2f21b22",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@alloc/quick-lru": "^5.2.0",
-    "@tailwindcss/oxide": "0.0.0-oxide-insiders.0ddc71e",
+    "@tailwindcss/oxide": "0.0.0-oxide-insiders.2f21b22",
     "arg": "^5.0.2",
     "browserslist": "^4.21.5",
     "chokidar": "^3.5.3",

package/src/cli/build/plugin.js

@@ -19,6 +19,7 @@ import { findAtConfigPath } from '../../lib/findAtConfigPath.js'
 import log from '../../util/log'
 import { loadConfig } from '../../lib/load-config'
 import getModuleDependencies from '../../lib/getModuleDependencies'
+import { validateConfig } from '../../util/validateConfig'
 
 /**
  *
@@ -161,7 +162,13 @@ let state = {
     }
 
     // @ts-ignore
-    this.configBag.config = resolveConfig(this.configBag.config, { content: { files: [] } })
+    if (__OXIDE__) {
+      this.configBag.config = validateConfig(resolveConfig(this.configBag.config))
+    } else {
+      this.configBag.config = validateConfig(
+        resolveConfig(this.configBag.config, { content: { files: [] } })
+      )
+    }
 
     // Override content files if `--content` has been passed explicitly
     if (content?.length > 0) {

package/src/cli/init/index.js

@@ -38,6 +38,11 @@ export function init(args) {
       'utf8'
     )
 
+    // Drop `content` in the oxide engine to promote auto content
+    if (__OXIDE__) {
+      stubContentsFile = stubContentsFile.replace(/\s*content: \[\],\n/, '')
+    }
+
     // Change colors import
     stubContentsFile = stubContentsFile.replace('../colors', 'tailwindcss/colors')
 

package/src/css/preflight.css

@@ -163,6 +163,8 @@ optgroup,
 select,
 textarea {
   font-family: inherit; /* 1 */
+  font-feature-settings: inherit; /* 1 */
+  font-variation-settings: inherit; /* 1 */
   font-size: 100%; /* 1 */
   font-weight: inherit; /* 1 */
   line-height: inherit; /* 1 */
@@ -264,7 +266,7 @@ summary {
 }
 
 /*
-Removes the default spacing and border for appropriate elements.
+Removes the default spacing for appropriate elements.
 */
 
 blockquote,
@@ -300,6 +302,10 @@ menu {
   padding: 0;
 }
 
+dialog {
+  padding: 0;
+}
+
 /*
 Prevent resizing textareas horizontally by default.
 */

package/src/lib/content.js

@@ -11,6 +11,28 @@ import { env } from './sharedState'
 /** @typedef {import('../../types/config.js').RawFile} RawFile */
 /** @typedef {import('../../types/config.js').FilePath} FilePath */
 
+/*
+ * @param {import('tailwindcss').Config} tailwindConfig
+ * @param {{skip:string[]}} options
+ * @returns {ContentPath[]}
+ */
+function resolveContentFiles(tailwindConfig, { skip = [] } = {}) {
+  if (tailwindConfig.content.files === 'auto' && __OXIDE__) {
+    env.DEBUG && console.time('Calculating resolve content paths')
+    tailwindConfig.content.files = require('@tailwindcss/oxide').resolveContentPaths({
+      base: process.cwd(),
+    })
+    if (skip.length > 0) {
+      tailwindConfig.content.files = tailwindConfig.content.files.filter(
+        (filePath) => !skip.includes(filePath)
+      )
+    }
+    env.DEBUG && console.timeEnd('Calculating resolve content paths')
+  }
+
+  return tailwindConfig.content.files
+}
+
 /**
  * @typedef {object} ContentPath
  * @property {string} original
@@ -32,7 +54,9 @@ import { env } from './sharedState'
  * @returns {ContentPath[]}
  */
 export function parseCandidateFiles(context, tailwindConfig) {
-  let files = tailwindConfig.content.files
+  let files = resolveContentFiles(tailwindConfig, {
+    skip: [context.userConfigPath],
+  })
 
   // Normalize the file globs
   files = files.filter((filePath) => typeof filePath === 'string')
@@ -167,9 +191,12 @@ function resolvePathSymlinks(contentPath) {
  * @returns {[{ content: string, extension: string }[], Map<string, number>]}
  */
 export function resolvedChangedContent(context, candidateFiles, fileModifiedMap) {
-  let changedContent = context.tailwindConfig.content.files
-    .filter((item) => typeof item.raw === 'string')
-    .map(({ raw, extension = 'html' }) => ({ content: raw, extension }))
+  let changedContent =
+    context.tailwindConfig.content.files === 'auto' && __OXIDE__
+      ? []
+      : context.tailwindConfig.content.files
+          .filter((item) => typeof item.raw === 'string')
+          .map(({ raw, extension = 'html' }) => ({ content: raw, extension }))
 
   let [changedFiles, mTimesToCommit] = resolveChangedFiles(candidateFiles, fileModifiedMap)
 

package/src/lib/evaluateTailwindFunctions.js

@@ -1,7 +1,7 @@
 import dlv from 'dlv'
 import didYouMean from 'didyoumean'
 import transformThemeValue from '../util/transformThemeValue'
-import parseValue from 'postcss-value-parser'
+import parseValue from '../value-parser/index'
 import { normalizeScreens } from '../util/normalizeScreens'
 import buildMediaQuery from '../util/buildMediaQuery'
 import { toPath } from '../util/toPath'
@@ -146,6 +146,9 @@ function resolveVNode(node, vNode, functions) {
 }
 
 function resolveFunctions(node, input, functions) {
+  let hasAnyFn = Object.keys(functions).some((fn) => input.includes(`${fn}(`))
+  if (!hasAnyFn) return input
+
   return parseValue(input)
     .walk((vNode) => {
       resolveVNode(node, vNode, functions)

package/src/oxide/cli/build/plugin.ts

@@ -18,6 +18,7 @@ import log from '../../../util/log'
 import { loadConfig } from '../../../lib/load-config'
 import getModuleDependencies from '../../../lib/getModuleDependencies'
 import type { Config } from '../../../../types'
+import { validateConfig } from '../../../util/validateConfig'
 
 /**
  *
@@ -160,7 +161,13 @@ let state = {
     }
 
     // @ts-ignore
-    this.configBag.config = resolveConfig(this.configBag.config, { content: { files: [] } })
+    if (__OXIDE__) {
+      this.configBag.config = validateConfig(resolveConfig(this.configBag.config))
+    } else {
+      this.configBag.config = validateConfig(
+        resolveConfig(this.configBag.config, { content: { files: [] } })
+      )
+    }
 
     // Override content files if `--content` has been passed explicitly
     if (content?.length > 0) {

package/src/oxide/cli/init/index.ts

@@ -36,6 +36,11 @@ export function init(args) {
       'utf8'
     )
 
+    // Drop `content` in the oxide engine to promote auto content
+    if (__OXIDE__) {
+      stubContentsFile = stubContentsFile.replace(/\s*content: \[\],\n/, '')
+    }
+
     // Change colors import
     stubContentsFile = stubContentsFile.replace('../colors', 'tailwindcss/colors')
 

package/src/util/dataTypes.js

@@ -49,10 +49,22 @@ export function normalize(value, isRoot = true) {
     value = value.trim()
   }
 
-  // Add spaces around operators inside math functions like calc() that do not follow an operator
-  // or '('.
-  value = value.replace(/(calc|min|max|clamp)\(.+\)/g, (match) => {
+  value = normalizeMathOperatorSpacing(value)
+
+  return value
+}
+
+/**
+ * Add spaces around operators inside math functions
+ * like calc() that do not follow an operator or '('.
+ *
+ * @param {string} value
+ * @returns {string}
+ */
+function normalizeMathOperatorSpacing(value) {
+  return value.replace(/(calc|min|max|clamp)\(.+\)/g, (match) => {
     let vars = []
+
     return match
       .replace(/var\((--.+?)[,)]/g, (match, g1) => {
         vars.push(g1)
@@ -61,8 +73,6 @@ export function normalize(value, isRoot = true) {
       .replace(/(-?\d*\.?\d(?!\b-\d.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, '$1 $2 ')
       .replace(placeholderRe, () => vars.shift())
   })
-
-  return value
 }
 
 export function url(value) {
@@ -178,11 +188,12 @@ export function image(value) {
 }
 
 let gradientTypes = new Set([
+  'conic-gradient',
   'linear-gradient',
   'radial-gradient',
+  'repeating-conic-gradient',
   'repeating-linear-gradient',
   'repeating-radial-gradient',
-  'conic-gradient',
 ])
 export function gradient(value) {
   value = normalize(value)

package/src/util/getAllConfigs.js

@@ -2,7 +2,14 @@ import defaultFullConfig from '../../stubs/config.full.js'
 import { flagEnabled } from '../featureFlags'
 
 export default function getAllConfigs(config) {
-  const configs = (config?.presets ?? [defaultFullConfig])
+  const configs = (
+    config?.presets ?? [
+      __OXIDE__
+        ? // Drop `content` in the oxide engine to promote auto content
+          Object.assign({}, defaultFullConfig, { content: 'auto' })
+        : defaultFullConfig,
+    ]
+  )
     .slice()
     .reverse()
     .flatMap((preset) => getAllConfigs(preset instanceof Function ? preset() : preset))

package/src/util/normalizeConfig.js

@@ -18,6 +18,10 @@ export function normalizeConfig(config) {
    *   }
    */
   let valid = (() => {
+    if (config.content === 'auto') {
+      return true
+    }
+
     // `config.purge` should not exist anymore
     if (config.purge) {
       return false
@@ -181,6 +185,31 @@ export function normalizeConfig(config) {
     config.prefix = config.prefix ?? ''
   }
 
+  let auto = (() => {
+    // Config still has a `purge` option (for backwards compatibility), auto content should not be
+    // used
+    if (config.purge) return false
+
+    //
+    if (config.content === 'auto') return true
+
+    // We don't have content at all, auto content should be used
+    if (config.content === undefined) return true
+
+    // We do have content as an object, but we don't have any files defined, auto content should
+    // be used
+    if (
+      typeof config.content === 'object' &&
+      config.content !== null &&
+      !Array.isArray(config.content)
+    ) {
+      return config.content.files === undefined
+    }
+
+    // We do have content defined, auto content should not be used
+    return false
+  })()
+
   // Normalize the `content`
   config.content = {
     relative: (() => {
@@ -193,17 +222,20 @@ export function normalizeConfig(config) {
       return flagEnabled(config, 'relativeContentPathsByDefault')
     })(),
 
-    files: (() => {
-      let { content, purge } = config
+    files: auto
+      ? 'auto'
+      : (() => {
+          let { content, purge } = config
 
-      if (Array.isArray(purge)) return purge
-      if (Array.isArray(purge?.content)) return purge.content
-      if (Array.isArray(content)) return content
-      if (Array.isArray(content?.content)) return content.content
-      if (Array.isArray(content?.files)) return content.files
+          if (content === undefined && purge === undefined) return []
+          if (Array.isArray(purge)) return purge
+          if (Array.isArray(purge?.content)) return purge.content
+          if (Array.isArray(content)) return content
+          if (Array.isArray(content?.content)) return content.content
+          if (Array.isArray(content?.files)) return content.files
 
-      return []
-    })(),
+          return []
+        })(),
 
     extract: (() => {
       let extract = (() => {
@@ -286,14 +318,16 @@ 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 Tailwind CSS configuration is invalid.`,
-        `Update it to ${dim(file.replace(/{([^,]*?)}/g, '$1'))} to silence this warning.`,
-        // TODO: Add https://tw.wtf/invalid-glob-braces
-      ])
-      break
+  if (config.content.files !== 'auto') {
+    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 Tailwind CSS configuration is invalid.`,
+          `Update it to ${dim(file.replace(/{([^,]*?)}/g, '$1'))} to silence this warning.`,
+          // TODO: Add https://tw.wtf/invalid-glob-braces
+        ])
+        break
+      }
     }
   }
 

package/src/util/validateConfig.js

@@ -1,7 +1,7 @@
 import log from './log'
 
 export function validateConfig(config) {
-  if (config.content.files.length === 0) {
+  if (config.content.files !== 'auto' && config.content.files.length === 0) {
     log.warn('content-problems', [
       'The `content` option in your Tailwind CSS configuration is missing or empty.',
       'Configure your content sources or your generated CSS will be missing styles.',
@@ -9,6 +9,13 @@ export function validateConfig(config) {
     ])
   }
 
+  if (config.content.files === 'auto') {
+    log.warn('auto-content-experimental', [
+      'Automatic content detection in Tailwind CSS is currently in experimental preview.',
+      'Preview features are not covered by semver, and may change at any time.',
+    ])
+  }
+
   // Warn if the line-clamp plugin is installed
   try {
     let plugin = require('@tailwindcss/line-clamp')

package/src/value-parser/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) Bogdan Chadkin <trysound@yandex.ru>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

package/src/value-parser/README.md

@@ -0,0 +1,3 @@
+# postcss-value-parser (forked + inlined)
+
+This is a customized version of of [PostCSS Value Parser](https://github.com/TrySound/postcss-value-parser) to fix some bugs around parsing CSS functions.