tailwindcss 0.0.0-insiders.8b152e7 → 0.0.0-insiders.8b1bf80

package/CHANGELOG.md

@@ -7,7 +7,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Nothing yet!
+### Added
+
+- Add support for configuring default `font-feature-settings` for a font family ([#9039](https://github.com/tailwindlabs/tailwindcss/pull/9039))
+- Add a standalone CLI build for 32-bit Linux on ARM (`node16-linux-armv7`) ([#9084](https://github.com/tailwindlabs/tailwindcss/pull/9084))
+- Add future flag to disable color opacity utility plugins ([#9088](https://github.com/tailwindlabs/tailwindcss/pull/9088))
+- Add negative value support for `outline-offset` ([#9136](https://github.com/tailwindlabs/tailwindcss/pull/9136))
+
+### Fixed
+
+- Use absolute paths when resolving changed files for resilience against working directory changes ([#9032](https://github.com/tailwindlabs/tailwindcss/pull/9032))
+- Fix ring color utility generation when using `respectDefaultRingColorOpacity` ([#9070](https://github.com/tailwindlabs/tailwindcss/pull/9070))
+- Sort tags before classes when `@applying` a selector with joined classes ([#9107](https://github.com/tailwindlabs/tailwindcss/pull/9107))
+- Remove invalid `outline-hidden` utility ([#9147](https://github.com/tailwindlabs/tailwindcss/pull/9147))
+- Honor the `hidden` attribute on elements in preflight ([#9174](https://github.com/tailwindlabs/tailwindcss/pull/9174))
+- Don't stop watching atomically renamed files ([#9173](https://github.com/tailwindlabs/tailwindcss/pull/9173), [#9215](https://github.com/tailwindlabs/tailwindcss/pull/9215))
+- Re-use existing entries in the rule cache ([#9208](https://github.com/tailwindlabs/tailwindcss/pull/9208))
+- Don't output duplicate utilities ([#9208](https://github.com/tailwindlabs/tailwindcss/pull/9208))
+- Fix `fontFamily` config TypeScript types ([#9214](https://github.com/tailwindlabs/tailwindcss/pull/9214))
+
+## [3.1.8] - 2022-08-05
+
+### Fixed
+
+- Don’t prefix classes within reused arbitrary variants ([#8992](https://github.com/tailwindlabs/tailwindcss/pull/8992))
+- Fix usage of alpha values inside single-named colors that are functions ([#9008](https://github.com/tailwindlabs/tailwindcss/pull/9008))
+- Fix `@apply` of user utilities when negative and non-negative versions both exist ([#9027](https://github.com/tailwindlabs/tailwindcss/pull/9027))
+
+## [3.1.7] - 2022-07-29
+
+### Fixed
+
+- Don't rewrite source maps for `@layer` rules ([#8971](https://github.com/tailwindlabs/tailwindcss/pull/8971))
+
+### Added
+
+- Added types for `resolveConfig` ([#8924](https://github.com/tailwindlabs/tailwindcss/pull/8924))
 
 ## [3.1.6] - 2022-07-11
 
@@ -1645,7 +1680,7 @@ No release notes
 
 - Make it possible to disable all core plugins using `corePlugins: false`
 - Make it possible to configure a single list of variants that applies to all utility plugins
-- Make it possible to whitelist which core plugins should be enabled
+- Make it possible to safelist which core plugins should be enabled
 
 ### Fixed
 
@@ -2011,7 +2046,9 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.6...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.8...HEAD
+[3.1.8]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.7...v3.1.8
+[3.1.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.6...v3.1.7
 [3.1.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.5...v3.1.6
 [3.1.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.4...v3.1.5
 [3.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.3...v3.1.4

package/README.md

@@ -1,4 +1,4 @@
-<p>
+<p align="center">
   <a href="https://tailwindcss.com/#gh-light-mode-only" target="_blank">
     <img src="./.github/logo-light.svg" alt="Tailwind CSS" width="350" height="70">
   </a>
@@ -7,9 +7,12 @@
   </a>
 </p>
 
-A utility-first CSS framework for rapidly building custom user interfaces.
+<p align="center">
+  A utility-first CSS framework for rapidly building custom user interfaces.
+</p>
+
 
-<p>
+<p align="center">
     <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/workflow/status/tailwindlabs/tailwindcss/Node.js%20CI" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
     <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>

package/lib/cli-peer-dependencies.js

@@ -2,10 +2,18 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.lazyPostcss = lazyPostcss;
-exports.lazyPostcssImport = lazyPostcssImport;
-exports.lazyAutoprefixer = lazyAutoprefixer;
-exports.lazyCssnano = lazyCssnano;
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    lazyPostcss: ()=>lazyPostcss,
+    lazyPostcssImport: ()=>lazyPostcssImport,
+    lazyAutoprefixer: ()=>lazyAutoprefixer,
+    lazyCssnano: ()=>lazyCssnano
+});
 function lazyPostcss() {
     return require("postcss");
 }

package/lib/cli.js

@@ -1,24 +1,28 @@
 #!/usr/bin/env node
 "use strict";
-var _indexJs = require("../peers/index.js");
-var _chokidar = _interopRequireDefault(require("chokidar"));
-var _path = _interopRequireDefault(require("path"));
-var _arg = _interopRequireDefault(require("arg"));
-var _fs = _interopRequireDefault(require("fs"));
-var _postcssLoadConfig = _interopRequireDefault(require("postcss-load-config"));
-var _lilconfig = require("lilconfig");
-var _plugins // Little bit scary, looking at private/internal API
- = _interopRequireDefault(require("postcss-load-config/src/plugins"));
-var _options // Little bit scary, looking at private/internal API
- = _interopRequireDefault(require("postcss-load-config/src/options"));
-var _processTailwindFeatures = _interopRequireDefault(require("./processTailwindFeatures"));
-var _resolveConfig = _interopRequireDefault(require("../resolveConfig"));
-var _fastGlob = _interopRequireDefault(require("fast-glob"));
-var _getModuleDependencies = _interopRequireDefault(require("./lib/getModuleDependencies"));
-var _log = _interopRequireDefault(require("./util/log"));
-var _packageJson = _interopRequireDefault(require("../package.json"));
-var _normalizePath = _interopRequireDefault(require("normalize-path"));
-var _validateConfigJs = require("./util/validateConfig.js");
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _indexJs = require("../peers/index.js");
+const _chokidar = /*#__PURE__*/ _interopRequireDefault(require("chokidar"));
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+const _arg = /*#__PURE__*/ _interopRequireDefault(require("arg"));
+const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+const _postcssLoadConfig = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config"));
+const _lilconfig = require("lilconfig");
+const _plugins = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config/src/plugins" // Little bit scary, looking at private/internal API
+));
+const _options = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config/src/options" // Little bit scary, looking at private/internal API
+));
+const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("./processTailwindFeatures"));
+const _resolveConfig = /*#__PURE__*/ _interopRequireDefault(require("../resolveConfig"));
+const _fastGlob = /*#__PURE__*/ _interopRequireDefault(require("fast-glob"));
+const _getModuleDependencies = /*#__PURE__*/ _interopRequireDefault(require("./lib/getModuleDependencies"));
+const _log = /*#__PURE__*/ _interopRequireDefault(require("./util/log"));
+const _packageJson = /*#__PURE__*/ _interopRequireDefault(require("../package.json"));
+const _normalizePath = /*#__PURE__*/ _interopRequireDefault(require("normalize-path"));
+const _micromatch = /*#__PURE__*/ _interopRequireDefault(require("micromatch"));
+const _validateConfigJs = require("./util/validateConfig.js");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -76,7 +80,7 @@ function drainStdin() {
         process.stdin.on("error", (err)=>reject(err));
     });
 }
-function help({ message , usage , commands: commands1 , options  }) {
+function help({ message , usage , commands , options  }) {
     let indent = 2;
     // Render header
     console.log();
@@ -97,11 +101,11 @@ function help({ message , usage , commands: commands1 , options  }) {
         }
     }
     // Render commands
-    if (commands1 && commands1.length > 0) {
+    if (commands && commands.length > 0) {
         console.log();
         console.log("Commands:");
-        for (let command1 of commands1){
-            console.log(" ".repeat(indent), command1);
+        for (let command of commands){
+            console.log(" ".repeat(indent), command);
         }
     }
     // Render options
@@ -121,12 +125,12 @@ function help({ message , usage , commands: commands1 , options  }) {
         }
         console.log();
         console.log("Options:");
-        for (let { flags: flags1 , description , deprecated  } of Object.values(groupedOptions)){
+        for (let { flags , description , deprecated  } of Object.values(groupedOptions)){
             if (deprecated) continue;
-            if (flags1.length === 1) {
-                console.log(" ".repeat(indent + 4 /* 4 = "-i, ".length */ ), flags1.slice().reverse().join(", ").padEnd(20, " "), description);
+            if (flags.length === 1) {
+                console.log(" ".repeat(indent + 4 /* 4 = "-i, ".length */ ), flags.slice().reverse().join(", ").padEnd(20, " "), description);
             } else {
-                console.log(" ".repeat(indent), flags1.slice().reverse().join(", ").padEnd(24, " "), description);
+                console.log(" ".repeat(indent), flags.slice().reverse().join(", ").padEnd(24, " "), description);
             }
         }
     }
@@ -150,7 +154,7 @@ function loadPostcss() {
     try {
         return require("postcss");
     } catch  {}
-    return (0, _indexJs).lazyPostcss();
+    return (0, _indexJs.lazyPostcss)();
 }
 let commands = {
     init: {
@@ -233,7 +237,7 @@ if (process.stdout.isTTY /* Detect redirecting output to a file */  && (process.
             "tailwindcss [--input input.css] [--output output.css] [--watch] [options...]",
             "tailwindcss init [--full] [--postcss] [options...]", 
         ],
-        commands: Object.keys(commands).filter((command2)=>command2 !== "build").map((command3)=>`${command3} [options]`),
+        commands: Object.keys(commands).filter((command)=>command !== "build").map((command)=>`${command} [options]`),
         options: {
             ...commands.build.args,
             ...sharedFlags
@@ -253,7 +257,7 @@ if (commands[command] === undefined) {
             usage: [
                 "tailwindcss <command> [options]"
             ],
-            commands: Object.keys(commands).filter((command4)=>command4 !== "build").map((command5)=>`${command5} [options]`),
+            commands: Object.keys(commands).filter((command)=>command !== "build").map((command)=>`${command} [options]`),
             options: sharedFlags
         });
         process.exit(1);
@@ -263,7 +267,7 @@ if (commands[command] === undefined) {
 let { args: flags , run  } = commands[command];
 let args = (()=>{
     try {
-        let result = (0, _arg).default(Object.fromEntries(Object.entries({
+        let result = (0, _arg.default)(Object.fromEntries(Object.entries({
             ...flags,
             ...sharedFlags
         }).filter(([_key, value])=>{
@@ -287,16 +291,16 @@ let args = (()=>{
                 handler = flags[handler];
             }
             if (!handler) continue;
-            let args1 = [];
+            let args = [];
             let offset = i + 1;
             // Parse args for current flag
             while(result["_"][offset] && !result["_"][offset].startsWith("-")){
-                args1.push(result["_"][offset++]);
+                args.push(result["_"][offset++]);
             }
             // Cleanup manually parsed flags + args
-            result["_"].splice(i, 1 + args1.length);
+            result["_"].splice(i, 1 + args.length);
             // Set the resolved value in the `result` object
-            result[flagName] = handler.type(args1.length === 0 ? undefined : args1.length === 1 ? args1[0] : args1, flagName);
+            result[flagName] = handler.type(args.length === 0 ? undefined : args.length === 1 ? args[0] : args, flagName);
         }
         // Ensure that the `command` is always the first argument in the `args`.
         // This is important so that we don't have to check if a default command
@@ -354,8 +358,8 @@ function init() {
         if (_fs.default.existsSync(postcssConfigLocation)) {
             messages.push(`${_path.default.basename(postcssConfigLocation)} already exists.`);
         } else {
-            let stubFile = _fs.default.readFileSync(_path.default.resolve(__dirname, "../stubs/defaultPostCssConfig.stub.js"), "utf8");
-            _fs.default.writeFileSync(postcssConfigLocation, stubFile, "utf8");
+            let stubFile1 = _fs.default.readFileSync(_path.default.resolve(__dirname, "../stubs/defaultPostCssConfig.stub.js"), "utf8");
+            _fs.default.writeFileSync(postcssConfigLocation, stubFile1, "utf8");
             messages.push(`Created PostCSS config file: ${_path.default.basename(postcssConfigLocation)}`);
         }
     }
@@ -392,10 +396,10 @@ async function build() {
     let configPath = args["--config"] ? args["--config"] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null)(_path.default.resolve(`./${configs.tailwind}`));
     async function loadPostCssPlugins() {
         let customPostCssPath = typeof args["--postcss"] === "string" ? args["--postcss"] : undefined;
-        let config1 = customPostCssPath ? await (async ()=>{
+        let config = customPostCssPath ? await (async ()=>{
             let file = _path.default.resolve(customPostCssPath);
             // Implementation, see: https://unpkg.com/browse/postcss-load-config@3.1.0/src/index.js
-            let { config ={}  } = await (0, _lilconfig).lilconfig("postcss").load(file);
+            let { config ={}  } = await (0, _lilconfig.lilconfig)("postcss").load(file);
             if (typeof config === "function") {
                 config = config();
             } else {
@@ -406,11 +410,11 @@ async function build() {
             }
             return {
                 file,
-                plugins: (0, _plugins).default(config, file),
-                options: (0, _options).default(config, file)
+                plugins: (0, _plugins.default)(config, file),
+                options: (0, _options.default)(config, file)
             };
-        })() : await (0, _postcssLoadConfig).default();
-        let configPlugins = config1.plugins;
+        })() : await (0, _postcssLoadConfig.default)();
+        let configPlugins = config.plugins;
         let configPluginTailwindIdx = configPlugins.findIndex((plugin)=>{
             if (typeof plugin === "function" && plugin.name === "tailwindcss") {
                 return true;
@@ -425,7 +429,7 @@ async function build() {
         return [
             beforePlugins,
             afterPlugins,
-            config1.options
+            config.options
         ];
     }
     function loadBuiltinPostcssPlugins() {
@@ -447,7 +451,7 @@ async function build() {
                     try {
                         return require("postcss-import");
                     } catch  {}
-                    return (0, _indexJs).lazyPostcssImport();
+                    return (0, _indexJs.lazyPostcssImport)();
                 })(),
                 (root)=>{
                     root.walkComments((rule)=>{
@@ -478,18 +482,18 @@ async function build() {
         }
         if (args["--content"]) {
             let files = args["--content"].split(/(?<!{[^}]+),/);
-            let resolvedConfig = (0, _resolveConfig).default(config, {
+            let resolvedConfig = (0, _resolveConfig.default)(config, {
                 content: {
                     files
                 }
             });
             resolvedConfig.content.files = files;
-            resolvedConfig = (0, _validateConfigJs).validateConfig(resolvedConfig);
+            resolvedConfig = (0, _validateConfigJs.validateConfig)(resolvedConfig);
             return resolvedConfig;
         }
-        let resolvedConfig = (0, _resolveConfig).default(config);
-        resolvedConfig = (0, _validateConfigJs).validateConfig(resolvedConfig);
-        return resolvedConfig;
+        let resolvedConfig1 = (0, _resolveConfig.default)(config);
+        resolvedConfig1 = (0, _validateConfigJs.validateConfig)(resolvedConfig1);
+        return resolvedConfig1;
     }
     function extractFileGlobs(config) {
         return config.content.files.filter((file)=>{
@@ -497,7 +501,7 @@ async function build() {
             // like an object it's probably a raw content object. But this object
             // is not watchable, so let's remove it.
             return typeof file === "string";
-        }).map((glob)=>(0, _normalizePath).default(glob));
+        }).map((glob)=>(0, _normalizePath.default)(glob));
     }
     function extractRawContent(config) {
         return config.content.files.filter((file)=>{
@@ -531,7 +535,7 @@ async function build() {
             return {
                 postcssPlugin: "tailwindcss",
                 Once (root, { result  }) {
-                    (0, _processTailwindFeatures).default(({ createContext  })=>{
+                    (0, _processTailwindFeatures.default)(({ createContext  })=>{
                         return ()=>{
                             return createContext(config, changedContent);
                         };
@@ -551,7 +555,7 @@ async function build() {
                 try {
                     return require("autoprefixer");
                 } catch  {}
-                return (0, _indexJs).lazyAutoprefixer();
+                return (0, _indexJs.lazyAutoprefixer)();
             })(),
             args["--minify"] && (()=>{
                 let options = {
@@ -566,7 +570,7 @@ async function build() {
                 try {
                     return require("cssnano");
                 } catch  {}
-                return (0, _indexJs).lazyCssnano()(options);
+                return (0, _indexJs.lazyCssnano)()(options);
             })(), 
         ].filter(Boolean);
         let postcss = loadPostcss();
@@ -593,7 +597,7 @@ async function build() {
                 console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
             });
         }
-        let css1 = await (()=>{
+        let css = await (()=>{
             // Piping in data, let's drain the stdin
             if (input === "-") {
                 return drainStdin();
@@ -605,7 +609,7 @@ async function build() {
             // No input file provided, fallback to default atrules
             return "@tailwind base; @tailwind components; @tailwind utilities";
         })();
-        return processCSS(css1);
+        return processCSS(css);
     }
     let context = null;
     async function startWatcher() {
@@ -615,11 +619,11 @@ async function build() {
         let watcher = null;
         function refreshConfig() {
             env.DEBUG && console.time("Module dependencies");
-            for (let file1 of configDependencies){
-                delete require.cache[require.resolve(file1)];
+            for (let file of configDependencies){
+                delete require.cache[require.resolve(file)];
             }
             if (configPath) {
-                configDependencies = (0, _getModuleDependencies).default(configPath).map(({ file  })=>file);
+                configDependencies = (0, _getModuleDependencies.default)(configPath).map(({ file  })=>file);
                 for (let dependency of configDependencies){
                     contextDependencies.add(dependency);
                 }
@@ -638,7 +642,7 @@ async function build() {
                 try {
                     return require("autoprefixer");
                 } catch  {}
-                return (0, _indexJs).lazyAutoprefixer();
+                return (0, _indexJs.lazyAutoprefixer)();
             })(),
             args["--minify"] && (()=>{
                 let options = {
@@ -653,7 +657,7 @@ async function build() {
                 try {
                     return require("cssnano");
                 } catch  {}
-                return (0, _indexJs).lazyCssnano()(options);
+                return (0, _indexJs.lazyCssnano)()(options);
             })(), 
         ].filter(Boolean);
         async function rebuild(config) {
@@ -663,7 +667,7 @@ async function build() {
                     postcssPlugin: "tailwindcss",
                     Once (root, { result  }) {
                         env.DEBUG && console.time("Compiling CSS");
-                        (0, _processTailwindFeatures).default(({ createContext  })=>{
+                        (0, _processTailwindFeatures.default)(({ createContext  })=>{
                             console.error();
                             console.error("Rebuilding...");
                             return ()=>{
@@ -721,7 +725,7 @@ async function build() {
                     }
                 });
             }
-            let css2 = await (()=>{
+            let css = await (()=>{
                 // Piping in data, let's drain the stdin
                 if (input === "-") {
                     return drainStdin();
@@ -733,18 +737,41 @@ async function build() {
                 // No input file provided, fallback to default atrules
                 return "@tailwind base; @tailwind components; @tailwind utilities";
             })();
-            let result1 = await processCSS(css2);
+            let result = await processCSS(css);
             env.DEBUG && console.timeEnd("Finished in");
-            return result1;
+            return result;
+        }
+        let config = refreshConfig(configPath);
+        let contentPatterns = refreshContentPatterns(config);
+        /**
+     * @param {import('../types/config.js').RequiredConfig} config
+     * @return {{all: string[], dynamic: string[], static: string[]}}
+     **/ function refreshContentPatterns(config) {
+            let globs = extractFileGlobs(config);
+            let tasks = _fastGlob.default.generateTasks(globs, {
+                absolute: true
+            });
+            let dynamicPatterns = tasks.filter((task)=>task.dynamic).flatMap((task)=>task.patterns);
+            let staticPatterns = tasks.filter((task)=>!task.dynamic).flatMap((task)=>task.patterns);
+            return {
+                all: [
+                    ...staticPatterns,
+                    ...dynamicPatterns
+                ],
+                dynamic: dynamicPatterns
+            };
         }
-        let config2 = refreshConfig(configPath);
         if (input) {
             contextDependencies.add(_path.default.resolve(input));
         }
         watcher = _chokidar.default.watch([
             ...contextDependencies,
-            ...extractFileGlobs(config2)
+            ...extractFileGlobs(config)
         ], {
+            // Force checking for atomic writes in all situations
+            // This causes chokidar to wait up to 100ms for a file to re-added after it's been unlinked
+            // This only works when watching directories though
+            atomic: true,
             usePolling: shouldPoll,
             interval: shouldPoll ? pollInterval : undefined,
             ignoreInitial: true,
@@ -754,20 +781,22 @@ async function build() {
             } : false
         });
         let chain = Promise.resolve();
+        let pendingRebuilds = new Set();
         watcher.on("change", async (file)=>{
             if (contextDependencies.has(file)) {
                 env.DEBUG && console.time("Resolve config");
                 context = null;
-                config2 = refreshConfig(configPath);
+                config = refreshConfig(configPath);
+                contentPatterns = refreshContentPatterns(config);
                 env.DEBUG && console.timeEnd("Resolve config");
                 env.DEBUG && console.time("Watch new files");
-                let globs = extractFileGlobs(config2);
+                let globs = extractFileGlobs(config);
                 watcher.add(configDependencies);
                 watcher.add(globs);
                 env.DEBUG && console.timeEnd("Watch new files");
                 chain = chain.then(async ()=>{
-                    changedContent.push(...getChangedContent(config2));
-                    await rebuild(config2);
+                    changedContent.push(...getChangedContent(config));
+                    await rebuild(config);
                 });
             } else {
                 chain = chain.then(async ()=>{
@@ -775,22 +804,97 @@ async function build() {
                         content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
                         extension: _path.default.extname(file).slice(1)
                     });
-                    await rebuild(config2);
+                    await rebuild(config);
                 });
             }
         });
+        /**
+     * When rapidly saving files atomically a couple of situations can happen:
+     * - The file is missing since the external program has deleted it by the time we've gotten around to reading it from the earlier save.
+     * - The file is being written to by the external program by the time we're going to read it and is thus treated as busy because a lock is held.
+     *
+     * To work around this we retry reading the file a handful of times with a delay between each attempt
+     *
+     * @param {string} path
+     * @param {number} tries
+     * @returns {string}
+     * @throws {Error} If the file is still missing or busy after the specified number of tries
+     */ async function readFileWithRetries(path, tries = 5) {
+            for(let n = 0; n <= tries; n++){
+                try {
+                    return await _fs.default.promises.readFile(path, "utf8");
+                } catch (err) {
+                    if (n !== tries) {
+                        if (err.code === "ENOENT" || err.code === "EBUSY") {
+                            await new Promise((resolve)=>setTimeout(resolve, 10));
+                            continue;
+                        }
+                    }
+                    throw err;
+                }
+            }
+        }
+        // Restore watching any files that are "removed"
+        // This can happen when a file is pseudo-atomically replaced (a copy is created, overwritten, the old one is unlinked, and the new one is renamed)
+        // TODO: An an optimization we should allow removal when the config changes
+        watcher.on("unlink", (file)=>{
+            file = (0, _normalizePath.default)(file);
+            // Only re-add the file if it's not covered by a dynamic pattern
+            if (!_micromatch.default.some([
+                file
+            ], contentPatterns.dynamic)) {
+                watcher.add(file);
+            }
+        });
+        // Some applications such as Visual Studio (but not VS Code)
+        // will only fire a rename event for atomic writes and not a change event
+        // This is very likely a chokidar bug but it's one we need to work around
+        // We treat this as a change event and rebuild the CSS
+        watcher.on("raw", (evt, filePath, meta)=>{
+            if (evt !== "rename") {
+                return;
+            }
+            let watchedPath = meta.watchedPath;
+            // Watched path might be the file itself
+            // Or the directory it is in
+            filePath = watchedPath.endsWith(filePath) ? watchedPath : _path.default.join(watchedPath, filePath);
+            // Skip this event since the files it is for does not match any of the registered content globs
+            if (!_micromatch.default.some([
+                filePath
+            ], contentPatterns.all)) {
+                return;
+            }
+            // Skip since we've already queued a rebuild for this file that hasn't happened yet
+            if (pendingRebuilds.has(filePath)) {
+                return;
+            }
+            pendingRebuilds.add(filePath);
+            chain = chain.then(async ()=>{
+                let content;
+                try {
+                    content = await readFileWithRetries(_path.default.resolve(filePath));
+                } finally{
+                    pendingRebuilds.delete(filePath);
+                }
+                changedContent.push({
+                    content,
+                    extension: _path.default.extname(filePath).slice(1)
+                });
+                await rebuild(config);
+            });
+        });
         watcher.on("add", async (file)=>{
             chain = chain.then(async ()=>{
                 changedContent.push({
                     content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
                     extension: _path.default.extname(file).slice(1)
                 });
-                await rebuild(config2);
+                await rebuild(config);
             });
         });
         chain = chain.then(()=>{
-            changedContent.push(...getChangedContent(config2));
-            return rebuild(config2);
+            changedContent.push(...getChangedContent(config));
+            return rebuild(config);
         });
     }
     if (shouldWatch) {