tailwindcss 3.2.7 → 3.3.1

package/lib/lib/getModuleDependencies.js

@@ -8,44 +8,90 @@ Object.defineProperty(exports, "default", {
 });
 const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _resolve = /*#__PURE__*/ _interopRequireDefault(require("resolve"));
-const _detective = /*#__PURE__*/ _interopRequireDefault(require("detective"));
 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
-    };
+let jsExtensions = [
+    ".js",
+    ".cjs",
+    ".mjs"
+];
+// Given the current file `a.ts`, we want to make sure that when importing `b` that we resolve
+// `b.ts` before `b.js`
+//
+// E.g.:
+//
+// a.ts
+//   b // .ts
+//   c // .ts
+// a.js
+//   b // .js or .ts
+let jsResolutionOrder = [
+    "",
+    ".js",
+    ".cjs",
+    ".mjs",
+    ".ts",
+    ".cts",
+    ".mts",
+    ".jsx",
+    ".tsx"
+];
+let tsResolutionOrder = [
+    "",
+    ".ts",
+    ".cts",
+    ".mts",
+    ".tsx",
+    ".js",
+    ".cjs",
+    ".mjs",
+    ".jsx"
+];
+function resolveWithExtension(file, extensions) {
+    // Try to find `./a.ts`, `./a.ts`, ... from `./a`
+    for (let ext of extensions){
+        let full = `${file}${ext}`;
+        if (_fs.default.existsSync(full) && _fs.default.statSync(full).isFile()) {
+            return full;
+        }
+    }
+    // Try to find `./a/index.js` from `./a`
+    for (let ext1 of extensions){
+        let full1 = `${file}/index${ext1}`;
+        if (_fs.default.existsSync(full1)) {
+            return full1;
+        }
+    }
+    return null;
 }
-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 depModule = createModule(depPath);
-                modules.push(depModule);
-            } catch (_err) {
-            // eslint-disable-next-line no-empty
-            }
-        });
+function* _getModuleDependencies(filename, base, seen, ext = _path.default.extname(filename)) {
+    // Try to find the file
+    let absoluteFile = resolveWithExtension(_path.default.resolve(base, filename), jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder);
+    if (absoluteFile === null) return; // File doesn't exist
+    // Prevent infinite loops when there are circular dependencies
+    if (seen.has(absoluteFile)) return; // Already seen
+    seen.add(absoluteFile);
+    // Mark the file as a dependency
+    yield absoluteFile;
+    // Resolve new base for new imports/requires
+    base = _path.default.dirname(absoluteFile);
+    ext = _path.default.extname(absoluteFile);
+    let contents = _fs.default.readFileSync(absoluteFile, "utf-8");
+    // Find imports/requires
+    for (let match of [
+        ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
+        ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
+        ...contents.matchAll(/require\(['"`](.+)['"`]\)/gi)
+    ]){
+        // Bail out if it's not a relative file
+        if (!match[1].startsWith(".")) continue;
+        yield* _getModuleDependencies(match[1], base, seen, ext);
     }
-    return modules;
+}
+function getModuleDependencies(absoluteFilePath) {
+    if (absoluteFilePath === null) return new Set();
+    return new Set(_getModuleDependencies(absoluteFilePath, _path.default.dirname(absoluteFilePath), new Set()));
 }

package/lib/lib/load-config.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "loadConfig", {
+    enumerable: true,
+    get: ()=>loadConfig
+});
+const _jiti = /*#__PURE__*/ _interopRequireDefault(require("jiti"));
+const _sucrase = require("sucrase");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+let jiti = null;
+function lazyJiti() {
+    return jiti !== null && jiti !== void 0 ? jiti : jiti = (0, _jiti.default)(__filename, {
+        interopDefault: true,
+        transform: (opts)=>{
+            return (0, _sucrase.transform)(opts.source, {
+                transforms: [
+                    "typescript",
+                    "imports"
+                ]
+            });
+        }
+    });
+}
+function loadConfig(path) {
+    let config = function() {
+        try {
+            return path ? require(path) : {};
+        } catch  {
+            return lazyJiti()(path);
+        }
+    }();
+    var _config_default;
+    return (_config_default = config.default) !== null && _config_default !== void 0 ? _config_default : config;
+}

package/lib/lib/setupContextUtils.js

@@ -895,14 +895,22 @@ function registerPlugins(plugins, context) {
         prefix(context, "peer")
     ];
     context.getClassOrder = function getClassOrder(classes) {
+        // Sort classes so they're ordered in a deterministic manner
+        let sorted = [
+            ...classes
+        ].sort((a, z)=>{
+            if (a === z) return 0;
+            if (a < z) return -1;
+            return 1;
+        });
         // Non-util classes won't be generated, so we default them to null
-        let sortedClassNames = new Map(classes.map((className)=>[
+        let sortedClassNames = new Map(sorted.map((className)=>[
                 className,
                 null
             ]));
         // Sort all classes in order
         // Non-tailwind classes won't be generated and will be left as `null`
-        let rules = (0, _generateRules.generateRules)(new Set(classes), context);
+        let rules = (0, _generateRules.generateRules)(new Set(sorted), context);
         rules = context.offsets.sort(rules);
         let idx = BigInt(parasiteUtilities.length);
         for (const [, rule] of rules){

package/lib/lib/setupTrackingContext.js

@@ -14,13 +14,14 @@ Object.defineProperty(exports, // DISABLE_TOUCH = TRUE
 const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
 const _quickLru = /*#__PURE__*/ _interopRequireDefault(require("quick-lru"));
 const _hashConfig = /*#__PURE__*/ _interopRequireDefault(require("../util/hashConfig"));
-const _getModuleDependencies = /*#__PURE__*/ _interopRequireDefault(require("../lib/getModuleDependencies"));
 const _resolveConfig = /*#__PURE__*/ _interopRequireDefault(require("../public/resolve-config"));
 const _resolveConfigPath = /*#__PURE__*/ _interopRequireDefault(require("../util/resolveConfigPath"));
 const _setupContextUtils = require("./setupContextUtils");
 const _parseDependency = /*#__PURE__*/ _interopRequireDefault(require("../util/parseDependency"));
 const _validateConfigJs = require("../util/validateConfig.js");
 const _contentJs = require("./content.js");
+const _loadConfig = require("../lib/load-config");
+const _getModuleDependencies = /*#__PURE__*/ _interopRequireDefault(require("./getModuleDependencies"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -42,7 +43,7 @@ function getTailwindConfig(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){
@@ -65,8 +66,7 @@ function getTailwindConfig(configOrPath) {
         for (let file1 of newDeps){
             delete require.cache[file1];
         }
-        let newConfig = (0, _resolveConfig.default)(require(userConfigPath));
-        newConfig = (0, _validateConfigJs.validateConfig)(newConfig);
+        let newConfig = (0, _validateConfigJs.validateConfig)((0, _resolveConfig.default)((0, _loadConfig.loadConfig)(userConfigPath)));
         let newHash = (0, _hashConfig.default)(newConfig);
         configPathCache.set(userConfigPath, [
             newConfig,

package/lib/lib/sharedState.js

@@ -25,11 +25,16 @@ function _interopRequireDefault(obj) {
     };
 }
 let OXIDE_DEFAULT_ENABLED = _packageJson.default.tailwindcss.engine === "oxide";
-const env = {
+const env = typeof process !== "undefined" ? {
     NODE_ENV: process.env.NODE_ENV,
     DEBUG: resolveDebug(process.env.DEBUG),
     ENGINE: _packageJson.default.tailwindcss.engine,
     OXIDE: resolveBoolean(process.env.OXIDE, OXIDE_DEFAULT_ENABLED)
+} : {
+    NODE_ENV: "production",
+    DEBUG: false,
+    ENGINE: _packageJson.default.tailwindcss.engine,
+    OXIDE: OXIDE_DEFAULT_ENABLED
 };
 const contextMap = new Map();
 const configContextMap = new Map();

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

@@ -8,13 +8,14 @@ Object.defineProperty(exports, "build", {
 });
 const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+const _resolveConfigPath = require("../../../util/resolveConfigPath");
 const _plugin = require("./plugin");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-async function build(args, configs) {
+async function build(args) {
     let input = args["--input"];
     let shouldWatch = args["--watch"];
     // TODO: Deprecate this in future versions
@@ -31,7 +32,7 @@ async function build(args, configs) {
         process.exit(9);
     }
     // TODO: Reference the @config path here if exists
-    let configPath = args["--config"] ? args["--config"] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null)(_path.default.resolve(`./${configs.tailwind}`));
+    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
@@ -42,6 +43,9 @@ async function build(args, configs) {
         process.stdin.resume();
         await processor.watch();
     } else {
-        await processor.build();
+        await processor.build().catch((e)=>{
+            console.error(e);
+            process.exit(1);
+        });
     }
 }

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

@@ -19,12 +19,13 @@ const _deps = require("./deps");
 const _utils = require("./utils");
 const _sharedState = require("../../../lib/sharedState");
 const _resolveConfig = /*#__PURE__*/ _interopRequireDefault(require("../../../../resolveConfig"));
-const _getModuleDependencies = /*#__PURE__*/ _interopRequireDefault(require("../../../lib/getModuleDependencies"));
 const _content = require("../../../lib/content");
 const _watching = require("./watching");
 const _fastGlob = /*#__PURE__*/ _interopRequireDefault(require("fast-glob"));
 const _findAtConfigPath = require("../../../lib/findAtConfigPath");
 const _log = /*#__PURE__*/ _interopRequireDefault(require("../../../util/log"));
+const _loadConfig = require("../../../lib/load-config");
+const _getModuleDependencies = /*#__PURE__*/ _interopRequireDefault(require("../../../lib/getModuleDependencies"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -108,7 +109,7 @@ let state = {
     /** @type {any} */ context: null,
     /** @type {ReturnType<typeof createWatcher> | null} */ watcher: null,
     /** @type {{content: string, extension: string}[]} */ changedContent: [],
-    configDependencies: new Set(),
+    /** @type {{config: Config, dependencies: Set<string>, dispose: Function } | null} */ configBag: null,
     contextDependencies: new Set(),
     /** @type {import('../../lib/content.js').ContentPath[]} */ contentPaths: [],
     refreshContentPaths () {
@@ -126,32 +127,35 @@ let state = {
     },
     loadConfig (configPath, content) {
         if (this.watcher && configPath) {
-            this.refreshConfigDependencies(configPath);
+            this.refreshConfigDependencies();
         }
-        let config = configPath ? require(configPath) : {};
+        let config = (0, _loadConfig.loadConfig)(configPath);
+        let dependencies = (0, _getModuleDependencies.default)(configPath);
+        this.configBag = {
+            config,
+            dependencies,
+            dispose () {
+                for (let file of dependencies){
+                    delete require.cache[require.resolve(file)];
+                }
+            }
+        };
         // @ts-ignore
-        config = (0, _resolveConfig.default)(config, {
+        this.configBag.config = (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) {
-            config.content.files = content;
+            this.configBag.config.content.files = content;
         }
-        return config;
+        return this.configBag.config;
     },
     refreshConfigDependencies (configPath) {
+        var _this_configBag;
         _sharedState.env.DEBUG && console.time("Module dependencies");
-        for (let file of this.configDependencies){
-            delete require.cache[require.resolve(file)];
-        }
-        if (configPath) {
-            let deps = (0, _getModuleDependencies.default)(configPath).map(({ file  })=>file);
-            for (let dependency of deps){
-                this.configDependencies.add(dependency);
-            }
-        }
+        (_this_configBag = this.configBag) === null || _this_configBag === void 0 ? void 0 : _this_configBag.dispose();
         _sharedState.env.DEBUG && console.timeEnd("Module dependencies");
     },
     readContentPaths () {
@@ -323,7 +327,11 @@ async function createProcessor(args, cliConfigPath) {
             // If you fix it and then save the main CSS file so there's no error
             // The watcher will start watching the imported CSS files and will be
             // resilient to future errors.
-            console.error(err);
+            if (state.watcher) {
+                console.error(err);
+            } else {
+                return Promise.reject(err);
+            }
         });
     }
     /**
@@ -346,7 +354,8 @@ async function createProcessor(args, cliConfigPath) {
          * @param {{file: string, content(): Promise<string>, extension: string}[]} changes
          */ async rebuild (changes) {
                     let needsNewContext = changes.some((change)=>{
-                        return state.configDependencies.has(change.file) || state.contextDependencies.has(change.file);
+                        var _state_configBag;
+                        return ((_state_configBag = state.configBag) === null || _state_configBag === void 0 ? void 0 : _state_configBag.dependencies.has(change.file)) || state.contextDependencies.has(change.file);
                     });
                     if (needsNewContext) {
                         state.context = null;

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

@@ -170,7 +170,7 @@ function createWatcher(args, { state , rebuild  }) {
         fswatcher: watcher,
         refreshWatchedFiles () {
             watcher.add(Array.from(state.contextDependencies));
-            watcher.add(Array.from(state.configDependencies));
+            watcher.add(Array.from(state.configBag.dependencies));
             watcher.add(state.contentPatterns.all);
         }
     };

package/lib/oxide/cli/index.js

@@ -14,20 +14,6 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
-function isESM() {
-    const pkgPath = _path.default.resolve("./package.json");
-    try {
-        let pkg = JSON.parse(_fs.default.readFileSync(pkgPath, "utf8"));
-        return pkg.type && pkg.type === "module";
-    } catch (err) {
-        return false;
-    }
-}
-let configs = isESM() ? {
-    tailwind: "tailwind.config.cjs"
-} : {
-    tailwind: "tailwind.config.js"
-};
 // ---
 function oneOf(...options) {
     return Object.assign((value = true)=>{
@@ -46,9 +32,17 @@ let commands = {
     init: {
         run: _init.init,
         args: {
+            "--esm": {
+                type: Boolean,
+                description: `Initialize configuration file as ESM`
+            },
+            "--ts": {
+                type: Boolean,
+                description: `Initialize configuration file as TypeScript`
+            },
             "--full": {
                 type: Boolean,
-                description: `Initialize a full \`${configs.tailwind}\` file`
+                description: `Include the default values for all options in the generated configuration file`
             },
             "-f": "--full"
         }
@@ -217,4 +211,4 @@ if (args["--help"]) {
     });
     process.exit(0);
 }
-run(args, configs);
+run(args);

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

@@ -13,16 +13,31 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
-function init(args, configs) {
+function isESM() {
+    const pkgPath = _path.default.resolve("./package.json");
+    try {
+        let pkg = JSON.parse(_fs.default.readFileSync(pkgPath, "utf8"));
+        return pkg.type && pkg.type === "module";
+    } catch (err) {
+        return false;
+    }
+}
+function init(args) {
     let messages = [];
+    let isProjectESM = args["--ts"] || args["--esm"] || isESM();
+    let syntax = args["--ts"] ? "ts" : isProjectESM ? "js" : "cjs";
+    let extension = args["--ts"] ? "ts" : "js";
     var _args___;
-    let tailwindConfigLocation = _path.default.resolve((_args___ = args["_"][1]) !== null && _args___ !== void 0 ? _args___ : `./${configs.tailwind}`);
+    let tailwindConfigLocation = _path.default.resolve((_args___ = args["_"][1]) !== null && _args___ !== void 0 ? _args___ : `./tailwind.config.${extension}`);
     if (_fs.default.existsSync(tailwindConfigLocation)) {
         messages.push(`${_path.default.basename(tailwindConfigLocation)} already exists.`);
     } else {
-        let stubFile = _fs.default.readFileSync(args["--full"] ? _path.default.resolve(__dirname, "../../../../stubs/defaultConfig.stub.js") : _path.default.resolve(__dirname, "../../../../stubs/simpleConfig.stub.js"), "utf8");
+        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");
         // Change colors import
-        stubFile = stubFile.replace("../colors", "tailwindcss/colors");
+        stubContentsFile = stubContentsFile.replace("../colors", "tailwindcss/colors");
+        // Replace contents of {ts,js,cjs} file with the stub {simple,full}.
+        stubFile = stubFile.replace("__CONFIG__", stubContentsFile.replace("module.exports =", "").trim()).trim() + "\n\n";
         _fs.default.writeFileSync(tailwindConfigLocation, stubFile, "utf8");
         messages.push(`Created Tailwind CSS config file: ${_path.default.basename(tailwindConfigLocation)}`);
     }