tailwindcss 0.0.0-insiders.ea139f2 → 0.0.0-insiders.ea4e1cd

package/lib/lib/setupTrackingContext.js

@@ -1,26 +1,35 @@
+// @ts-check
 "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = setupTrackingContext;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _fastGlob = _interopRequireDefault(require("fast-glob"));
-var _quickLru = _interopRequireDefault(require("quick-lru"));
-var _normalizePath = _interopRequireDefault(require("normalize-path"));
-var _hashConfig = _interopRequireDefault(require("../util/hashConfig"));
-var _getModuleDependencies = _interopRequireDefault(require("../lib/getModuleDependencies"));
-var _resolveConfig = _interopRequireDefault(require("../public/resolve-config"));
-var _resolveConfigPath = _interopRequireDefault(require("../util/resolveConfigPath"));
-var _sharedState = require("./sharedState");
-var _setupContextUtils = require("./setupContextUtils");
-var _parseDependency = _interopRequireDefault(require("../util/parseDependency"));
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, // DISABLE_TOUCH = TRUE
+// Retrieve an existing context from cache if possible (since contexts are unique per
+// source path), or set up a new one (including setting up watchers and registering
+// plugins) then return it
+"default", {
+    enumerable: true,
+    get: function() {
+        return setupTrackingContext;
+    }
+});
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _quicklru = /*#__PURE__*/ _interop_require_default(require("@alloc/quick-lru"));
+const _hashConfig = /*#__PURE__*/ _interop_require_default(require("../util/hashConfig"));
+const _resolveconfig = /*#__PURE__*/ _interop_require_default(require("../public/resolve-config"));
+const _resolveConfigPath = /*#__PURE__*/ _interop_require_default(require("../util/resolveConfigPath"));
+const _setupContextUtils = require("./setupContextUtils");
+const _parseDependency = /*#__PURE__*/ _interop_require_default(require("../util/parseDependency"));
+const _validateConfig = require("../util/validateConfig.js");
+const _content = require("./content.js");
+const _loadconfig = require("../lib/load-config");
+const _getModuleDependencies = /*#__PURE__*/ _interop_require_default(require("./getModuleDependencies"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-let configPathCache = new _quickLru.default({
+let configPathCache = new _quicklru.default({
     maxSize: 100
 });
 let candidateFilesCache = new WeakMap();
@@ -28,18 +37,15 @@ function getCandidateFiles(context, tailwindConfig) {
     if (candidateFilesCache.has(context)) {
         return candidateFilesCache.get(context);
     }
-    let candidateFiles = tailwindConfig.content.files.filter((item)=>typeof item === 'string'
-    ).map((contentPath)=>(0, _normalizePath).default(contentPath)
-    );
+    let candidateFiles = (0, _content.parseCandidateFiles)(context, tailwindConfig);
     return candidateFilesCache.set(context, candidateFiles).get(context);
 }
 // Get the config object based on a path
 function getTailwindConfig(configOrPath) {
-    let userConfigPath = (0, _resolveConfigPath).default(configOrPath);
+    let userConfigPath = (0, _resolveConfigPath.default)(configOrPath);
     if (userConfigPath !== null) {
         let [prevConfig, prevConfigHash, prevDeps, prevModified] = configPathCache.get(userConfigPath) || [];
-        let newDeps = (0, _getModuleDependencies).default(userConfigPath).map((dep)=>dep.file
-        );
+        let newDeps = (0, _getModuleDependencies.default)(userConfigPath);
         let modified = false;
         let newModified = new Map();
         for (let file of newDeps){
@@ -59,11 +65,11 @@ function getTailwindConfig(configOrPath) {
             ];
         }
         // It has changed (based on timestamps), or first run
-        for (let file1 of newDeps){
-            delete require.cache[file1];
+        for (let file of newDeps){
+            delete require.cache[file];
         }
-        let newConfig = (0, _resolveConfig).default(require(userConfigPath));
-        let newHash = (0, _hashConfig).default(newConfig);
+        let newConfig = (0, _validateConfig.validateConfig)((0, _resolveconfig.default)((0, _loadconfig.loadConfig)(userConfigPath)));
+        let newHash = (0, _hashConfig.default)(newConfig);
         configPathCache.set(userConfigPath, [
             newConfig,
             newHash,
@@ -78,92 +84,81 @@ function getTailwindConfig(configOrPath) {
         ];
     }
     // It's a plain object, not a path
-    let newConfig = (0, _resolveConfig).default(configOrPath.config === undefined ? configOrPath : configOrPath.config);
+    let newConfig = (0, _resolveconfig.default)(configOrPath.config === undefined ? configOrPath : configOrPath.config);
+    newConfig = (0, _validateConfig.validateConfig)(newConfig);
     return [
         newConfig,
         null,
-        (0, _hashConfig).default(newConfig),
+        (0, _hashConfig.default)(newConfig),
         []
     ];
 }
-function resolvedChangedContent(context, candidateFiles, fileModifiedMap) {
-    let changedContent = context.tailwindConfig.content.files.filter((item)=>typeof item.raw === 'string'
-    ).map(({ raw , extension ='html'  })=>({
-            content: raw,
-            extension
-        })
-    );
-    for (let changedFile of resolveChangedFiles(candidateFiles, fileModifiedMap)){
-        let content = _fs.default.readFileSync(changedFile, 'utf8');
-        let extension = _path.default.extname(changedFile).slice(1);
-        changedContent.push({
-            content,
-            extension
-        });
-    }
-    return changedContent;
-}
-function resolveChangedFiles(candidateFiles, fileModifiedMap) {
-    let changedFiles = new Set();
-    _sharedState.env.DEBUG && console.time('Finding changed files');
-    let files = _fastGlob.default.sync(candidateFiles);
-    for (let file of files){
-        let prevModified = fileModifiedMap.has(file) ? fileModifiedMap.get(file) : -Infinity;
-        let modified = _fs.default.statSync(file).mtimeMs;
-        if (modified > prevModified) {
-            changedFiles.add(file);
-            fileModifiedMap.set(file, modified);
-        }
-    }
-    _sharedState.env.DEBUG && console.timeEnd('Finding changed files');
-    return changedFiles;
-}
 function setupTrackingContext(configOrPath) {
     return ({ tailwindDirectives , registerDependency  })=>{
         return (root, result)=>{
             let [tailwindConfig, userConfigPath, tailwindConfigHash, configDependencies] = getTailwindConfig(configOrPath);
             let contextDependencies = new Set(configDependencies);
-            // If there are no @tailwind rules, we don't consider this CSS file or it's dependencies
-            // to be dependencies of the context. Can reuse the context even if they change.
-            // We may want to think about `@layer` being part of this trigger too, but it's tough
-            // because it's impossible for a layer in one file to end up in the actual @tailwind rule
-            // in another file since independent sources are effectively isolated.
+            // If there are no @tailwind or @apply rules, we don't consider this CSS
+            // file or its dependencies to be dependencies of the context. Can reuse
+            // the context even if they change. We may want to think about `@layer`
+            // being part of this trigger too, but it's tough because it's impossible
+            // for a layer in one file to end up in the actual @tailwind rule in
+            // another file since independent sources are effectively isolated.
             if (tailwindDirectives.size > 0) {
                 // Add current css file as a context dependencies.
                 contextDependencies.add(result.opts.from);
                 // Add all css @import dependencies as context dependencies.
                 for (let message of result.messages){
-                    if (message.type === 'dependency') {
+                    if (message.type === "dependency") {
                         contextDependencies.add(message.file);
                     }
                 }
             }
-            let [context] = (0, _setupContextUtils).getContext(root, result, tailwindConfig, userConfigPath, tailwindConfigHash, contextDependencies);
+            let [context, , mTimesToCommit] = (0, _setupContextUtils.getContext)(root, result, tailwindConfig, userConfigPath, tailwindConfigHash, contextDependencies);
+            let fileModifiedMap = (0, _setupContextUtils.getFileModifiedMap)(context);
             let candidateFiles = getCandidateFiles(context, tailwindConfig);
-            // If there are no @tailwind rules, we don't consider this CSS file or it's dependencies
-            // to be dependencies of the context. Can reuse the context even if they change.
+            // If there are no @tailwind or @apply rules, we don't consider this CSS file or it's
+            // dependencies to be dependencies of the context. Can reuse the context even if they change.
             // We may want to think about `@layer` being part of this trigger too, but it's tough
             // because it's impossible for a layer in one file to end up in the actual @tailwind rule
             // in another file since independent sources are effectively isolated.
             if (tailwindDirectives.size > 0) {
-                let fileModifiedMap = (0, _setupContextUtils).getFileModifiedMap(context);
                 // Add template paths as postcss dependencies.
-                for (let fileOrGlob of candidateFiles){
-                    let dependency = (0, _parseDependency).default(fileOrGlob);
-                    if (dependency) {
+                for (let contentPath of candidateFiles){
+                    for (let dependency of (0, _parseDependency.default)(contentPath)){
                         registerDependency(dependency);
                     }
                 }
-                for (let changedContent of resolvedChangedContent(context, candidateFiles, fileModifiedMap)){
-                    context.changedContent.push(changedContent);
+                let [changedContent, contentMTimesToCommit] = (0, _content.resolvedChangedContent)(context, candidateFiles, fileModifiedMap);
+                for (let content of changedContent){
+                    context.changedContent.push(content);
+                }
+                // Add the mtimes of the content files to the commit list
+                // We can overwrite the existing values because unconditionally
+                // This is because:
+                // 1. Most of the files here won't be in the map yet
+                // 2. If they are that means it's a context dependency
+                // and we're reading this after the context. This means
+                // that the mtime we just read is strictly >= the context
+                // mtime. Unless the user / os is doing something weird
+                // in which the mtime would be going backwards. If that
+                // happens there's already going to be problems.
+                for (let [path, mtime] of contentMTimesToCommit.entries()){
+                    mTimesToCommit.set(path, mtime);
                 }
             }
             for (let file of configDependencies){
                 registerDependency({
-                    type: 'dependency',
+                    type: "dependency",
                     file
                 });
             }
+            // "commit" the new modified time for all context deps
+            // We do this here because we want content tracking to
+            // read the "old" mtime even when it's a context dependency.
+            for (let [path, mtime] of mTimesToCommit.entries()){
+                fileModifiedMap.set(path, mtime);
+            }
             return context;
         };
     };

package/lib/lib/sharedState.js

@@ -2,18 +2,86 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.contextSourcesMap = exports.configContextMap = exports.contextMap = exports.env = void 0;
-const env = {
-    TAILWIND_MODE: process.env.TAILWIND_MODE,
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    env: function() {
+        return env;
+    },
+    contextMap: function() {
+        return contextMap;
+    },
+    configContextMap: function() {
+        return configContextMap;
+    },
+    contextSourcesMap: function() {
+        return contextSourcesMap;
+    },
+    sourceHashMap: function() {
+        return sourceHashMap;
+    },
+    NOT_ON_DEMAND: function() {
+        return NOT_ON_DEMAND;
+    },
+    NONE: function() {
+        return NONE;
+    },
+    resolveDebug: function() {
+        return resolveDebug;
+    }
+});
+const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../package.json"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const env = typeof process !== "undefined" ? {
     NODE_ENV: process.env.NODE_ENV,
-    DEBUG: process.env.DEBUG !== undefined && process.env.DEBUG !== '0',
-    TAILWIND_DISABLE_TOUCH: process.env.TAILWIND_DISABLE_TOUCH !== undefined,
-    TAILWIND_TOUCH_DIR: process.env.TAILWIND_TOUCH_DIR
+    DEBUG: resolveDebug(process.env.DEBUG),
+    ENGINE: _packagejson.default.tailwindcss.engine
+} : {
+    NODE_ENV: "production",
+    DEBUG: false,
+    ENGINE: _packagejson.default.tailwindcss.engine
 };
-exports.env = env;
 const contextMap = new Map();
-exports.contextMap = contextMap;
 const configContextMap = new Map();
-exports.configContextMap = configContextMap;
 const contextSourcesMap = new Map();
-exports.contextSourcesMap = contextSourcesMap;
+const sourceHashMap = new Map();
+const NOT_ON_DEMAND = new String("*");
+const NONE = Symbol("__NONE__");
+function resolveDebug(debug) {
+    if (debug === undefined) {
+        return false;
+    }
+    // Environment variables are strings, so convert to boolean
+    if (debug === "true" || debug === "1") {
+        return true;
+    }
+    if (debug === "false" || debug === "0") {
+        return false;
+    }
+    // Keep the debug convention into account:
+    // DEBUG=* -> This enables all debug modes
+    // DEBUG=projectA,projectB,projectC -> This enables debug for projectA, projectB and projectC
+    // DEBUG=projectA:* -> This enables all debug modes for projectA (if you have sub-types)
+    // DEBUG=projectA,-projectB -> This enables debug for projectA and explicitly disables it for projectB
+    if (debug === "*") {
+        return true;
+    }
+    let debuggers = debug.split(",").map((d)=>d.split(":")[0]);
+    // Ignoring tailwindcss
+    if (debuggers.includes("-tailwindcss")) {
+        return false;
+    }
+    // Including tailwindcss
+    if (debuggers.includes("tailwindcss")) {
+        return true;
+    }
+    return false;
+}

package/lib/lib/substituteScreenAtRules.js

@@ -2,26 +2,30 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = _default;
-var _normalizeScreens = require("../util/normalizeScreens");
-var _buildMediaQuery = _interopRequireDefault(require("../util/buildMediaQuery"));
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _normalizeScreens = require("../util/normalizeScreens");
+const _buildMediaQuery = /*#__PURE__*/ _interop_require_default(require("../util/buildMediaQuery"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 function _default({ tailwindConfig: { theme  }  }) {
     return function(css) {
-        css.walkAtRules('screen', (atRule)=>{
+        css.walkAtRules("screen", (atRule)=>{
             let screen = atRule.params;
-            let screens = (0, _normalizeScreens).normalizeScreens(theme.screens);
-            let screenDefinition = screens.find(({ name  })=>name === screen
-            );
+            let screens = (0, _normalizeScreens.normalizeScreens)(theme.screens);
+            let screenDefinition = screens.find(({ name  })=>name === screen);
             if (!screenDefinition) {
                 throw atRule.error(`No \`${screen}\` screen found.`);
             }
-            atRule.name = 'media';
-            atRule.params = (0, _buildMediaQuery).default(screenDefinition);
+            atRule.name = "media";
+            atRule.params = (0, _buildMediaQuery.default)(screenDefinition);
         });
     };
 }

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

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    lazyLightningCss: function() {
+        return lazyLightningCss;
+    },
+    lightningcss: function() {
+        return lightningcss;
+    },
+    loadPostcss: function() {
+        return loadPostcss;
+    },
+    loadPostcssImport: function() {
+        return loadPostcssImport;
+    }
+});
+const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../../../package.json"));
+const _browserslist = /*#__PURE__*/ _interop_require_default(require("browserslist"));
+const _index = require("../../../../peers/index");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function lazyLightningCss() {
+    // TODO: Make this lazy/bundled
+    return require("lightningcss");
+}
+let lightningCss;
+function loadLightningCss() {
+    if (lightningCss) {
+        return lightningCss;
+    }
+    // Try to load a local version first
+    try {
+        return lightningCss = require("lightningcss");
+    } catch  {}
+    return lightningCss = lazyLightningCss();
+}
+async function lightningcss(shouldMinify, result) {
+    let css = loadLightningCss();
+    try {
+        let transformed = css.transform({
+            filename: result.opts.from || "input.css",
+            code: Buffer.from(result.css, "utf-8"),
+            minify: shouldMinify,
+            sourceMap: !!result.map,
+            inputSourceMap: result.map ? result.map.toString() : undefined,
+            targets: css.browserslistToTargets((0, _browserslist.default)(_packagejson.default.browserslist)),
+            drafts: {
+                nesting: true
+            }
+        });
+        return Object.assign(result, {
+            css: transformed.code.toString("utf8"),
+            map: result.map ? Object.assign(result.map, {
+                toString () {
+                    return transformed.map.toString();
+                }
+            }) : result.map
+        });
+    } catch (err) {
+        console.error("Unable to use Lightning CSS. Using raw version instead.");
+        console.error(err);
+        return result;
+    }
+}
+function loadPostcss() {
+    // Try to load a local `postcss` version first
+    try {
+        return require("postcss");
+    } catch  {}
+    return (0, _index.lazyPostcss)();
+}
+function loadPostcssImport() {
+    // Try to load a local `postcss-import` version first
+    try {
+        return require("postcss-import");
+    } catch  {}
+    return (0, _index.lazyPostcssImport)();
+}

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "build", {
+    enumerable: true,
+    get: function() {
+        return build;
+    }
+});
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _resolveConfigPath = require("../../../util/resolveConfigPath");
+const _plugin = require("./plugin");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+async function build(args) {
+    let input = args["--input"];
+    let shouldWatch = args["--watch"];
+    // TODO: Deprecate this in future versions
+    if (!input && args["_"][1]) {
+        console.error("[deprecation] Running tailwindcss without -i, please provide an input file.");
+        input = args["--input"] = args["_"][1];
+    }
+    if (input && input !== "-" && !_fs.default.existsSync(input = _path.default.resolve(input))) {
+        console.error(`Specified input file ${args["--input"]} does not exist.`);
+        process.exit(9);
+    }
+    if (args["--config"] && !_fs.default.existsSync(args["--config"] = _path.default.resolve(args["--config"]))) {
+        console.error(`Specified config file ${args["--config"]} does not exist.`);
+        process.exit(9);
+    }
+    // TODO: Reference the @config path here if exists
+    let configPath = args["--config"] ? args["--config"] : (0, _resolveConfigPath.resolveDefaultConfigPath)();
+    let processor = await (0, _plugin.createProcessor)(args, configPath);
+    if (shouldWatch) {
+        // Abort the watcher if stdin is closed to avoid zombie processes
+        // You can disable this behavior with --watch=always
+        if (args["--watch"] !== "always") {
+            process.stdin.on("end", ()=>process.exit(0));
+        }
+        process.stdin.resume();
+        await processor.watch();
+    } else {
+        await processor.build().catch((e)=>{
+            console.error(e);
+            process.exit(1);
+        });
+    }
+}