tailwindcss 0.0.0-oxide-insiders.a7fe2fe → 0.0.0-oxide-insiders.759a8c2

package/lib/cli/build/deps.js

@@ -1,46 +1,62 @@
+// @ts-check
 "use strict";
 Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), function(target, all) {
+    value: true
+});
+function _export(target, all) {
     for(var name in all)Object.defineProperty(target, name, {
-        enumerable: !0,
+        enumerable: true,
         get: all[name]
     });
-}(exports, {
-    loadPostcss: ()=>loadPostcss,
-    loadPostcssImport: ()=>loadPostcssImport,
-    loadCssNano: ()=>loadCssNano,
-    loadAutoprefixer: ()=>loadAutoprefixer
+}
+_export(exports, {
+    loadPostcss: function() {
+        return loadPostcss;
+    },
+    loadPostcssImport: function() {
+        return loadPostcssImport;
+    },
+    loadCssNano: function() {
+        return loadCssNano;
+    },
+    loadAutoprefixer: function() {
+        return loadAutoprefixer;
+    }
 });
-const _indexJs = require("../../../peers/index.js");
+const _index = require("../../../peers/index.js");
 function loadPostcss() {
+    // Try to load a local `postcss` version first
     try {
         return require("postcss");
     } catch  {}
-    return (0, _indexJs.lazyPostcss)();
+    return (0, _index.lazyPostcss)();
 }
 function loadPostcssImport() {
+    // Try to load a local `postcss-import` version first
     try {
         return require("postcss-import");
     } catch  {}
-    return (0, _indexJs.lazyPostcssImport)();
+    return (0, _index.lazyPostcssImport)();
 }
 function loadCssNano() {
-    try {
-        return require("cssnano");
-    } catch  {}
-    return (0, _indexJs.lazyCssnano)()({
+    let options = {
         preset: [
             "default",
             {
-                cssDeclarationSorter: !1
+                cssDeclarationSorter: false
             }
         ]
-    });
+    };
+    // Try to load a local `cssnano` version first
+    try {
+        return require("cssnano");
+    } catch  {}
+    return (0, _index.lazyCssnano)()(options);
 }
 function loadAutoprefixer() {
+    // Try to load a local `autoprefixer` version first
     try {
         return require("autoprefixer");
     } catch  {}
-    return (0, _indexJs.lazyAutoprefixer)();
+    return (0, _index.lazyAutoprefixer)();
 }

package/lib/cli/build/index.js

@@ -1,21 +1,54 @@
+// @ts-check
 "use strict";
 Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), Object.defineProperty(exports, "build", {
-    enumerable: !0,
-    get: ()=>build
+    value: true
 });
-const _fs = _interopRequireDefault(require("fs")), _path = _interopRequireDefault(require("path")), _resolveConfigPathJs = require("../../util/resolveConfigPath.js"), _pluginJs = require("./plugin.js");
-function _interopRequireDefault(obj) {
+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.js");
+const _plugin = require("./plugin.js");
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 async function build(args) {
-    let input = args["--input"], shouldWatch = args["--watch"];
-    !input && args._[1] && (console.error("[deprecation] Running tailwindcss without -i, please provide an input file."), input = args["--input"] = args._[1]), input && "-" !== input && !_fs.default.existsSync(input = _path.default.resolve(input)) && (console.error(`Specified input file ${args["--input"]} does not exist.`), process.exit(9)), 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));
-    let configPath = args["--config"] ? args["--config"] : (0, _resolveConfigPathJs.resolveDefaultConfigPath)(), processor = await (0, _pluginJs.createProcessor)(args, configPath);
-    shouldWatch ? ("always" !== args["--watch"] && process.stdin.on("end", ()=>process.exit(0)), process.stdin.resume(), await processor.watch()) : await processor.build().catch((e)=>{
-        console.error(e), process.exit(1);
-    });
+    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);
+        });
+    }
 }

package/lib/cli/build/plugin.js

@@ -1,41 +1,123 @@
+// @ts-check
 "use strict";
 Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), Object.defineProperty(exports, "createProcessor", {
-    enumerable: !0,
-    get: ()=>createProcessor
+    value: true
 });
-const _path = _interopRequireDefault(require("path")), _fs = _interopRequireDefault(require("fs")), _postcssLoadConfig = _interopRequireDefault(require("postcss-load-config")), _lilconfig = require("lilconfig"), _plugins = _interopRequireDefault(require("postcss-load-config/src/plugins")), _options = _interopRequireDefault(require("postcss-load-config/src/options")), _processTailwindFeatures = _interopRequireDefault(require("../../processTailwindFeatures")), _deps = require("./deps"), _utils = require("./utils"), _sharedState = require("../../lib/sharedState"), _resolveConfigJs = _interopRequireDefault(require("../../../resolveConfig.js")), _contentJs = require("../../lib/content.js"), _watchingJs = require("./watching.js"), _fastGlob = _interopRequireDefault(require("fast-glob")), _findAtConfigPathJs = require("../../lib/findAtConfigPath.js"), _log = _interopRequireDefault(require("../../util/log")), _loadConfig = require("../../lib/load-config"), _getModuleDependencies = _interopRequireDefault(require("../../lib/getModuleDependencies"));
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, "createProcessor", {
+    enumerable: true,
+    get: function() {
+        return createProcessor;
+    }
+});
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _postcssloadconfig = /*#__PURE__*/ _interop_require_default(require("postcss-load-config"));
+const _lilconfig = require("lilconfig");
+const _plugins = /*#__PURE__*/ _interop_require_default(require("postcss-load-config/src/plugins" // Little bit scary, looking at private/internal API
+));
+const _options = /*#__PURE__*/ _interop_require_default(require("postcss-load-config/src/options" // Little bit scary, looking at private/internal API
+));
+const _processTailwindFeatures = /*#__PURE__*/ _interop_require_default(require("../../processTailwindFeatures"));
+const _deps = require("./deps");
+const _utils = require("./utils");
+const _sharedState = require("../../lib/sharedState");
+const _resolveConfig = /*#__PURE__*/ _interop_require_default(require("../../../resolveConfig.js"));
+const _content = require("../../lib/content.js");
+const _watching = require("./watching.js");
+const _fastglob = /*#__PURE__*/ _interop_require_default(require("fast-glob"));
+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"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-async function loadPostCssPlugins(customPostCssPath) {
+/**
+ *
+ * @param {string} [customPostCssPath ]
+ * @returns
+ */ async function loadPostCssPlugins(customPostCssPath) {
     let config = customPostCssPath ? await (async ()=>{
-        let file = _path.default.resolve(customPostCssPath), { config ={}  } = await (0, _lilconfig.lilconfig)("postcss").load(file);
-        return (config = "function" == typeof config ? config() : Object.assign({}, config)).plugins || (config.plugins = []), {
+        let file = _path.default.resolve(customPostCssPath);
+        // Implementation, see: https://unpkg.com/browse/postcss-load-config@3.1.0/src/index.js
+        // @ts-ignore
+        let { config ={}  } = await (0, _lilconfig.lilconfig)("postcss").load(file);
+        if (typeof config === "function") {
+            config = config();
+        } else {
+            config = Object.assign({}, config);
+        }
+        if (!config.plugins) {
+            config.plugins = [];
+        }
+        return {
             file,
             plugins: (0, _plugins.default)(config, file),
             options: (0, _options.default)(config, file)
         };
-    })() : await (0, _postcssLoadConfig.default)(), configPlugins = config.plugins, configPluginTailwindIdx = configPlugins.findIndex((plugin)=>"function" == typeof plugin && "tailwindcss" === plugin.name || "object" == typeof plugin && null !== plugin && "tailwindcss" === plugin.postcssPlugin);
+    })() : await (0, _postcssloadconfig.default)();
+    let configPlugins = config.plugins;
+    let configPluginTailwindIdx = configPlugins.findIndex((plugin)=>{
+        if (typeof plugin === "function" && plugin.name === "tailwindcss") {
+            return true;
+        }
+        if (typeof plugin === "object" && plugin !== null && plugin.postcssPlugin === "tailwindcss") {
+            return true;
+        }
+        return false;
+    });
+    let beforePlugins = configPluginTailwindIdx === -1 ? [] : configPlugins.slice(0, configPluginTailwindIdx);
+    let afterPlugins = configPluginTailwindIdx === -1 ? configPlugins : configPlugins.slice(configPluginTailwindIdx + 1);
     return [
-        -1 === configPluginTailwindIdx ? [] : configPlugins.slice(0, configPluginTailwindIdx),
-        -1 === configPluginTailwindIdx ? configPlugins : configPlugins.slice(configPluginTailwindIdx + 1),
+        beforePlugins,
+        afterPlugins,
         config.options
     ];
 }
+function loadBuiltinPostcssPlugins() {
+    let postcss = (0, _deps.loadPostcss)();
+    let IMPORT_COMMENT = "__TAILWIND_RESTORE_IMPORT__: ";
+    return [
+        [
+            (root)=>{
+                root.walkAtRules("import", (rule)=>{
+                    if (rule.params.slice(1).startsWith("tailwindcss/")) {
+                        rule.after(postcss.comment({
+                            text: IMPORT_COMMENT + rule.params
+                        }));
+                        rule.remove();
+                    }
+                });
+            },
+            (0, _deps.loadPostcssImport)(),
+            (root)=>{
+                root.walkComments((rule)=>{
+                    if (rule.text.startsWith(IMPORT_COMMENT)) {
+                        rule.after(postcss.atRule({
+                            name: "import",
+                            params: rule.text.replace(IMPORT_COMMENT, "")
+                        }));
+                        rule.remove();
+                    }
+                });
+            }
+        ],
+        [],
+        {}
+    ];
+}
 let state = {
-    context: null,
-    watcher: null,
-    changedContent: [],
-    configBag: null,
+    /** @type {any} */ context: null,
+    /** @type {ReturnType<typeof createWatcher> | null} */ watcher: null,
+    /** @type {{content: string, extension: string}[]} */ changedContent: [],
+    /** @type {ReturnType<typeof load> | null} */ configBag: null,
     contextDependencies: new Set(),
-    contentPaths: [],
+    /** @type {import('../../lib/content.js').ContentPath[]} */ contentPaths: [],
     refreshContentPaths () {
         var _this_context;
-        this.contentPaths = (0, _contentJs.parseCandidateFiles)(this.context, null === (_this_context = this.context) || void 0 === _this_context ? void 0 : _this_context.tailwindConfig);
+        this.contentPaths = (0, _content.parseCandidateFiles)(this.context, (_this_context = this.context) === null || _this_context === void 0 ? void 0 : _this_context.tailwindConfig);
     },
     get config () {
         return this.context.tailwindConfig;
@@ -43,105 +125,167 @@ let state = {
     get contentPatterns () {
         return {
             all: this.contentPaths.map((contentPath)=>contentPath.pattern),
-            dynamic: this.contentPaths.filter((contentPath)=>void 0 !== contentPath.glob).map((contentPath)=>contentPath.pattern)
+            dynamic: this.contentPaths.filter((contentPath)=>contentPath.glob !== undefined).map((contentPath)=>contentPath.pattern)
         };
     },
     loadConfig (configPath, content) {
-        this.watcher && configPath && this.refreshConfigDependencies();
-        let config = (0, _loadConfig.loadConfig)(configPath), dependencies = (0, _getModuleDependencies.default)(configPath);
-        return this.configBag = {
+        if (this.watcher && configPath) {
+            this.refreshConfigDependencies();
+        }
+        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)];
+                for (let file of dependencies){
+                    delete require.cache[require.resolve(file)];
+                }
             }
-        }, this.configBag.config = (0, _resolveConfigJs.default)(this.configBag.config, {
+        };
+        // @ts-ignore
+        this.configBag.config = (0, _resolveConfig.default)(this.configBag.config, {
             content: {
                 files: []
             }
-        }), (null == content ? void 0 : content.length) > 0 && (this.configBag.config.content.files = content), this.configBag.config;
+        });
+        // 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;
+        }
+        return this.configBag.config;
     },
     refreshConfigDependencies () {
         var _this_configBag;
-        _sharedState.env.DEBUG && console.time("Module dependencies"), null === (_this_configBag = this.configBag) || void 0 === _this_configBag || _this_configBag.dispose(), _sharedState.env.DEBUG && console.timeEnd("Module dependencies");
+        _sharedState.env.DEBUG && console.time("Module dependencies");
+        (_this_configBag = this.configBag) === null || _this_configBag === void 0 ? void 0 : _this_configBag.dispose();
+        _sharedState.env.DEBUG && console.timeEnd("Module dependencies");
     },
     readContentPaths () {
         let content = [];
-        for (let file of _fastGlob.default.sync(this.contentPatterns.all))content.push({
-            file,
-            extension: _path.default.extname(file).slice(1)
-        });
-        for (let { raw: htmlContent , extension ="html"  } of this.config.content.files.filter((file)=>null !== file && "object" == typeof file))content.push({
-            content: htmlContent,
-            extension
+        // Resolve globs from the content config
+        // TODO: When we make the postcss plugin async-capable this can become async
+        let files = _fastglob.default.sync(this.contentPatterns.all);
+        for (let file of files){
+            if (true) {
+                content.push({
+                    file,
+                    extension: _path.default.extname(file).slice(1)
+                });
+            } else {
+                content.push({
+                    content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
+                    extension: _path.default.extname(file).slice(1)
+                });
+            }
+        }
+        // Resolve raw content in the tailwind config
+        let rawContent = this.config.content.files.filter((file)=>{
+            return file !== null && typeof file === "object";
         });
+        for (let { raw: htmlContent , extension ="html"  } of rawContent){
+            content.push({
+                content: htmlContent,
+                extension
+            });
+        }
         return content;
     },
     getContext ({ createContext , cliConfigPath , root , result , content  }) {
-        var _findAtConfigPath;
-        if (this.context) return this.context.changedContent = this.changedContent.splice(0), this.context;
+        if (this.context) {
+            this.context.changedContent = this.changedContent.splice(0);
+            return this.context;
+        }
         _sharedState.env.DEBUG && console.time("Searching for config");
-        let configPath = null !== (_findAtConfigPath = (0, _findAtConfigPathJs.findAtConfigPath)(root, result)) && void 0 !== _findAtConfigPath ? _findAtConfigPath : cliConfigPath;
-        _sharedState.env.DEBUG && console.timeEnd("Searching for config"), _sharedState.env.DEBUG && console.time("Loading config");
+        var _findAtConfigPath1;
+        let configPath = (_findAtConfigPath1 = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && _findAtConfigPath1 !== void 0 ? _findAtConfigPath1 : cliConfigPath;
+        _sharedState.env.DEBUG && console.timeEnd("Searching for config");
+        _sharedState.env.DEBUG && console.time("Loading config");
         let config = this.loadConfig(configPath, content);
-        for (let file of (_sharedState.env.DEBUG && console.timeEnd("Loading config"), _sharedState.env.DEBUG && console.time("Creating context"), this.context = createContext(config, []), Object.assign(this.context, {
+        _sharedState.env.DEBUG && console.timeEnd("Loading config");
+        _sharedState.env.DEBUG && console.time("Creating context");
+        this.context = createContext(config, []);
+        Object.assign(this.context, {
             userConfigPath: configPath
-        }), _sharedState.env.DEBUG && console.timeEnd("Creating context"), _sharedState.env.DEBUG && console.time("Resolving content paths"), this.refreshContentPaths(), _sharedState.env.DEBUG && console.timeEnd("Resolving content paths"), this.watcher && (_sharedState.env.DEBUG && console.time("Watch new files"), this.watcher.refreshWatchedFiles(), _sharedState.env.DEBUG && console.timeEnd("Watch new files")), this.readContentPaths()))this.context.changedContent.push(file);
+        });
+        _sharedState.env.DEBUG && console.timeEnd("Creating context");
+        _sharedState.env.DEBUG && console.time("Resolving content paths");
+        this.refreshContentPaths();
+        _sharedState.env.DEBUG && console.timeEnd("Resolving content paths");
+        if (this.watcher) {
+            _sharedState.env.DEBUG && console.time("Watch new files");
+            this.watcher.refreshWatchedFiles();
+            _sharedState.env.DEBUG && console.timeEnd("Watch new files");
+        }
+        for (let file of this.readContentPaths()){
+            this.context.changedContent.push(file);
+        }
         return this.context;
     }
 };
 async function createProcessor(args, cliConfigPath) {
-    var _args_content, _args_content_split;
-    let postcss, IMPORT_COMMENT;
-    let postcss1 = (0, _deps.loadPostcss)(), input = args["--input"], output = args["--output"], includePostCss = args["--postcss"], customPostCssPath = "string" == typeof args["--postcss"] ? args["--postcss"] : void 0, [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins(customPostCssPath) : (postcss = (0, _deps.loadPostcss)(), IMPORT_COMMENT = "__TAILWIND_RESTORE_IMPORT__: ", [
-        [
-            (root)=>{
-                root.walkAtRules("import", (rule)=>{
-                    rule.params.slice(1).startsWith("tailwindcss/") && (rule.after(postcss.comment({
-                        text: IMPORT_COMMENT + rule.params
-                    })), rule.remove());
-                });
-            },
-            (0, _deps.loadPostcssImport)(),
-            (root)=>{
-                root.walkComments((rule)=>{
-                    rule.text.startsWith(IMPORT_COMMENT) && (rule.after(postcss.atRule({
-                        name: "import",
-                        params: rule.text.replace(IMPORT_COMMENT, "")
-                    })), rule.remove());
-                });
-            }
-        ],
-        [],
-        {}
-    ]);
-    args["--purge"] && (_log.default.warn("purge-flag-deprecated", [
-        "The `--purge` flag has been deprecated.",
-        "Please use `--content` instead."
-    ]), args["--content"] || (args["--content"] = args["--purge"]));
-    let content = null !== (_args_content_split = null === (_args_content = args["--content"]) || void 0 === _args_content ? void 0 : _args_content.split(/(?<!{[^}]+),/)) && void 0 !== _args_content_split ? _args_content_split : [], tailwindPlugin = ()=>({
+    var _args_content;
+    let postcss = (0, _deps.loadPostcss)();
+    let input = args["--input"];
+    let output = args["--output"];
+    let includePostCss = args["--postcss"];
+    let customPostCssPath = typeof args["--postcss"] === "string" ? args["--postcss"] : undefined;
+    let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins(customPostCssPath) : loadBuiltinPostcssPlugins();
+    if (args["--purge"]) {
+        _log.default.warn("purge-flag-deprecated", [
+            "The `--purge` flag has been deprecated.",
+            "Please use `--content` instead."
+        ]);
+        if (!args["--content"]) {
+            args["--content"] = args["--purge"];
+        }
+    }
+    var _args_content_split;
+    let content = (_args_content_split = (_args_content = args["--content"]) === null || _args_content === void 0 ? void 0 : _args_content.split(/(?<!{[^}]+),/)) !== null && _args_content_split !== void 0 ? _args_content_split : [];
+    let tailwindPlugin = ()=>{
+        return {
             postcssPlugin: "tailwindcss",
             Once (root, { result  }) {
-                _sharedState.env.DEBUG && console.time("Compiling CSS"), (0, _processTailwindFeatures.default)(({ createContext  })=>(console.error(), console.error("Rebuilding..."), ()=>state.getContext({
+                _sharedState.env.DEBUG && console.time("Compiling CSS");
+                (0, _processTailwindFeatures.default)(({ createContext  })=>{
+                    console.error();
+                    console.error("Rebuilding...");
+                    return ()=>{
+                        return state.getContext({
                             createContext,
                             cliConfigPath,
                             root,
                             result,
                             content
-                        })))(root, result), _sharedState.env.DEBUG && console.timeEnd("Compiling CSS");
+                        });
+                    };
+                })(root, result);
+                _sharedState.env.DEBUG && console.timeEnd("Compiling CSS");
             }
-        });
-    tailwindPlugin.postcss = !0;
-    let processor = postcss1([
+        };
+    };
+    tailwindPlugin.postcss = true;
+    let plugins = [
         ...beforePlugins,
         tailwindPlugin,
         !args["--minify"] && _utils.formatNodes,
         ...afterPlugins,
         !args["--no-autoprefixer"] && (0, _deps.loadAutoprefixer)(),
         args["--minify"] && (0, _deps.loadCssNano)()
-    ].filter(Boolean));
+    ].filter(Boolean);
+    /** @type {import('postcss').Processor} */ // @ts-ignore
+    let processor = postcss(plugins);
     async function readInput() {
-        return "-" === input ? (0, _utils.drainStdin)() : input ? _fs.default.promises.readFile(_path.default.resolve(input), "utf8") : "@tailwind base; @tailwind components; @tailwind utilities";
+        // Piping in data, let's drain the stdin
+        if (input === "-") {
+            return (0, _utils.drainStdin)();
+        }
+        // Input file has been provided
+        if (input) {
+            return _fs.default.promises.readFile(_path.default.resolve(input), "utf8");
+        }
+        // No input file provided, fallback to default atrules
+        return "@tailwind base; @tailwind components; @tailwind utilities";
     }
     async function build() {
         let start = process.hrtime.bigint();
@@ -150,9 +294,21 @@ async function createProcessor(args, cliConfigPath) {
                 from: input,
                 to: output
             })).then((result)=>{
-            if (!state.watcher) return result;
-            for (let message of (_sharedState.env.DEBUG && console.time("Recording PostCSS dependencies"), result.messages))"dependency" === message.type && state.contextDependencies.add(message.file);
-            return _sharedState.env.DEBUG && console.timeEnd("Recording PostCSS dependencies"), _sharedState.env.DEBUG && console.time("Watch new files"), state.watcher.refreshWatchedFiles(), _sharedState.env.DEBUG && console.timeEnd("Watch new files"), result;
+            if (!state.watcher) {
+                return result;
+            }
+            _sharedState.env.DEBUG && console.time("Recording PostCSS dependencies");
+            for (let message of result.messages){
+                if (message.type === "dependency") {
+                    state.contextDependencies.add(message.file);
+                }
+            }
+            _sharedState.env.DEBUG && console.timeEnd("Recording PostCSS dependencies");
+            // TODO: This needs to be in a different spot
+            _sharedState.env.DEBUG && console.time("Watch new files");
+            state.watcher.refreshWatchedFiles();
+            _sharedState.env.DEBUG && console.timeEnd("Watch new files");
+            return result;
         }).then((result)=>{
             if (!output) {
                 process.stdout.write(result.css);
@@ -164,32 +320,59 @@ async function createProcessor(args, cliConfigPath) {
             ]);
         }).then(()=>{
             let end = process.hrtime.bigint();
-            console.error(), console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
+            console.error();
+            console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
         }).then(()=>{}, (err)=>{
-            if (!state.watcher) return Promise.reject(err);
-            console.error(err);
+            // TODO: If an initial build fails we can't easily pick up any PostCSS dependencies
+            // that were collected before the error occurred
+            // The result is not stored on the error so we have to store it externally
+            // and pull the messages off of it here somehow
+            // This results in a less than ideal DX because the watcher will not pick up
+            // changes to imported CSS if one of them caused an error during the initial build
+            // 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.
+            if (state.watcher) {
+                console.error(err);
+            } else {
+                return Promise.reject(err);
+            }
         });
     }
-    async function parseChanges(changes) {
+    /**
+   * @param {{file: string, content(): Promise<string>, extension: string}[]} changes
+   */ async function parseChanges(changes) {
         return Promise.all(changes.map(async (change)=>({
                 content: await change.content(),
                 extension: change.extension
             })));
     }
-    return void 0 !== input && "-" !== input && state.contextDependencies.add(_path.default.resolve(input)), {
+    if (input !== undefined && input !== "-") {
+        state.contextDependencies.add(_path.default.resolve(input));
+    }
+    return {
         build,
         watch: async ()=>{
-            state.watcher = (0, _watchingJs.createWatcher)(args, {
+            state.watcher = (0, _watching.createWatcher)(args, {
                 state,
-                async rebuild (changes) {
-                    if (changes.some((change)=>{
+                /**
+         * @param {{file: string, content(): Promise<string>, extension: string}[]} changes
+         */ async rebuild (changes) {
+                    let needsNewContext = changes.some((change)=>{
                         var _state_configBag;
-                        return (null === (_state_configBag = state.configBag) || void 0 === _state_configBag ? void 0 : _state_configBag.dependencies.has(change.file)) || state.contextDependencies.has(change.file);
-                    })) state.context = null;
-                    else for (let change of (await parseChanges(changes)))state.changedContent.push(change);
+                        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;
+                    } else {
+                        for (let change of (await parseChanges(changes))){
+                            state.changedContent.push(change);
+                        }
+                    }
                     return build();
                 }
-            }), await build();
+            });
+            await build();
         }
     };
 }