tailwindcss 0.0.0-oxide-insiders.0ddc71e → 0.0.0-oxide-insiders.a7f7b76

package/index.css

@@ -0,0 +1,5 @@
+@tailwind base;
+
+@tailwind components;
+
+@tailwind utilities;

package/lib/cli/build/plugin.js

@@ -29,6 +29,7 @@ const _findAtConfigPath = require("../../lib/findAtConfigPath.js");
 const _log = /*#__PURE__*/ _interop_require_default(require("../../util/log"));
 const _loadconfig = require("../../lib/load-config");
 const _getModuleDependencies = /*#__PURE__*/ _interop_require_default(require("../../lib/getModuleDependencies"));
+const _validateConfig = require("../../util/validateConfig");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -144,11 +145,15 @@ let state = {
             }
         };
         // @ts-ignore
-        this.configBag.config = (0, _resolveConfig.default)(this.configBag.config, {
-            content: {
-                files: []
-            }
-        });
+        if (true) {
+            this.configBag.config = (0, _validateConfig.validateConfig)((0, _resolveConfig.default)(this.configBag.config));
+        } else {
+            this.configBag.config = (0, _validateConfig.validateConfig)((0, _resolveConfig.default)(this.configBag.config, {
+                content: {
+                    files: []
+                }
+            }));
+        }
         // Override content files if `--content` has been passed explicitly
         if ((content === null || content === void 0 ? void 0 : content.length) > 0) {
             this.configBag.config.content.files = content;

package/lib/cli/init/index.js

@@ -37,6 +37,10 @@ function init(args) {
     } else {
         let stubContentsFile = _fs.default.readFileSync(args["--full"] ? _path.default.resolve(__dirname, "../../../stubs/config.full.js") : _path.default.resolve(__dirname, "../../../stubs/config.simple.js"), "utf8");
         let stubFile = _fs.default.readFileSync(_path.default.resolve(__dirname, `../../../stubs/tailwind.config.${syntax}`), "utf8");
+        // Drop `content` in the oxide engine to promote auto content
+        if (true) {
+            stubContentsFile = stubContentsFile.replace(/\s*content: \[\],\n/, "");
+        }
         // Change colors import
         stubContentsFile = stubContentsFile.replace("../colors", "tailwindcss/colors");
         // Replace contents of {ts,js,cjs} file with the stub {simple,full}.

package/lib/lib/content.js

@@ -29,8 +29,29 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
+/** @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" && true) {
+        _sharedState.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));
+        }
+        _sharedState.env.DEBUG && console.timeEnd("Calculating resolve content paths");
+    }
+    return tailwindConfig.content.files;
+}
 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");
     files = files.map(_normalizepath.default);
@@ -135,7 +156,7 @@ function parseCandidateFiles(context, tailwindConfig) {
     return paths;
 }
 function resolvedChangedContent(context, candidateFiles, fileModifiedMap) {
-    let changedContent = context.tailwindConfig.content.files.filter((item)=>typeof item.raw === "string").map(({ raw , extension ="html"  })=>({
+    let changedContent = context.tailwindConfig.content.files === "auto" && true ? [] : context.tailwindConfig.content.files.filter((item)=>typeof item.raw === "string").map(({ raw , extension ="html"  })=>({
             content: raw,
             extension
         }));

package/lib/oxide/cli/build/plugin.js

@@ -28,6 +28,7 @@ const _findAtConfigPath = require("../../../lib/findAtConfigPath");
 const _log = /*#__PURE__*/ _interop_require_default(require("../../../util/log"));
 const _loadconfig = require("../../../lib/load-config");
 const _getModuleDependencies = /*#__PURE__*/ _interop_require_default(require("../../../lib/getModuleDependencies"));
+const _validateConfig = require("../../../util/validateConfig");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -143,11 +144,15 @@ let state = {
             }
         };
         // @ts-ignore
-        this.configBag.config = (0, _resolveConfig.default)(this.configBag.config, {
-            content: {
-                files: []
-            }
-        });
+        if (true) {
+            this.configBag.config = (0, _validateConfig.validateConfig)((0, _resolveConfig.default)(this.configBag.config));
+        } else {
+            this.configBag.config = (0, _validateConfig.validateConfig)((0, _resolveConfig.default)(this.configBag.config, {
+                content: {
+                    files: []
+                }
+            }));
+        }
         // Override content files if `--content` has been passed explicitly
         if ((content === null || content === void 0 ? void 0 : content.length) > 0) {
             this.configBag.config.content.files = content;

package/lib/oxide/cli/init/index.js

@@ -36,6 +36,10 @@ function init(args) {
     } else {
         let stubContentsFile = _fs.default.readFileSync(args["--full"] ? _path.default.resolve(__dirname, "../../../../stubs/config.full.js") : _path.default.resolve(__dirname, "../../../../stubs/config.simple.js"), "utf8");
         let stubFile = _fs.default.readFileSync(_path.default.resolve(__dirname, `../../../../stubs/tailwind.config.${syntax}`), "utf8");
+        // Drop `content` in the oxide engine to promote auto content
+        if (true) {
+            stubContentsFile = stubContentsFile.replace(/\s*content: \[\],\n/, "");
+        }
         // Change colors import
         stubContentsFile = stubContentsFile.replace("../colors", "tailwindcss/colors");
         // Replace contents of {ts,js,cjs} file with the stub {simple,full}.

package/lib/util/getAllConfigs.js

@@ -18,7 +18,9 @@ function _interop_require_default(obj) {
 function getAllConfigs(config) {
     var _config_presets;
     const configs = ((_config_presets = config === null || config === void 0 ? void 0 : config.presets) !== null && _config_presets !== void 0 ? _config_presets : [
-        _configfull.default
+        true ? Object.assign({}, _configfull.default, {
+            content: "auto"
+        }) : _configfull.default
     ]).slice().reverse().flatMap((preset)=>getAllConfigs(preset instanceof Function ? preset() : preset));
     const features = {
         // Add experimental configs here...

package/lib/util/normalizeConfig.js

@@ -65,6 +65,9 @@ function normalizeConfig(config) {
    *       transform?: TransformerFn | { [extension: string]: TransformerFn }
    *   }
    */ let valid = (()=>{
+        if (config.content === "auto") {
+            return true;
+        }
         // `config.purge` should not exist anymore
         if (config.purge) {
             return false;
@@ -191,6 +194,22 @@ function normalizeConfig(config) {
         var _config_prefix;
         config.prefix = (_config_prefix = config.prefix) !== null && _config_prefix !== void 0 ? _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: (()=>{
@@ -200,8 +219,9 @@ function normalizeConfig(config) {
             }
             return (0, _featureFlags.flagEnabled)(config, "relativeContentPathsByDefault");
         })(),
-        files: (()=>{
+        files: auto ? "auto" : (()=>{
             let { content , purge  } = config;
+            if (content === undefined && purge === undefined) return [];
             if (Array.isArray(purge)) return purge;
             if (Array.isArray(purge === null || purge === void 0 ? void 0 : purge.content)) return purge.content;
             if (Array.isArray(content)) return content;
@@ -269,13 +289,15 @@ 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.default.warn("invalid-glob-braces", [
-                `The glob pattern ${(0, _log.dim)(file)} in your Tailwind CSS configuration is invalid.`,
-                `Update it to ${(0, _log.dim)(file.replace(/{([^,]*?)}/g, "$1"))} to silence this warning.`
-            ]);
-            break;
+    if (config.content.files !== "auto") {
+        for (let file of config.content.files){
+            if (typeof file === "string" && /{([^,]*?)}/g.test(file)) {
+                _log.default.warn("invalid-glob-braces", [
+                    `The glob pattern ${(0, _log.dim)(file)} in your Tailwind CSS configuration is invalid.`,
+                    `Update it to ${(0, _log.dim)(file.replace(/{([^,]*?)}/g, "$1"))} to silence this warning.`
+                ]);
+                break;
+            }
         }
     }
     return config;

package/lib/util/validateConfig.js

@@ -15,13 +15,19 @@ function _interop_require_default(obj) {
     };
 }
 function validateConfig(config) {
-    if (config.content.files.length === 0) {
+    if (config.content.files !== "auto" && config.content.files.length === 0) {
         _log.default.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.",
             "https://tailwindcss.com/docs/content-configuration"
         ]);
     }
+    if (config.content.files === "auto") {
+        _log.default.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-oxide-insiders.0ddc71e",
+  "version": "0.0.0-oxide-insiders.a7f7b76",
   "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.a7f7b76",
     "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/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/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/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')