tailwindcss 3.4.2 → 3.4.3

package/CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.4.3] - 2024-03-27
+
+### Fixed
+
+- Revert changes to glob handling ([#13384](https://github.com/tailwindlabs/tailwindcss/pull/13384))
+
 ## [3.4.2] - 2024-03-27
 
 ### Fixed
@@ -2370,7 +2376,8 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.2...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.3...HEAD
+[3.4.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.2...v3.4.3
 [3.4.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.1...v3.4.2
 [3.4.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.0...v3.4.1
 [3.4.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.7...v3.4.0

package/lib/lib/content.js

@@ -21,6 +21,7 @@ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
 const _path = /*#__PURE__*/ _interop_require_default(require("path"));
 const _isglob = /*#__PURE__*/ _interop_require_default(require("is-glob"));
 const _fastglob = /*#__PURE__*/ _interop_require_default(require("fast-glob"));
+const _normalizepath = /*#__PURE__*/ _interop_require_default(require("normalize-path"));
 const _parseGlob = require("../util/parseGlob");
 const _sharedState = require("./sharedState");
 function _interop_require_default(obj) {
@@ -28,42 +29,11 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-/*!
- * Modified version of normalize-path, original license below
- *
- * normalize-path <https://github.com/jonschlinkert/normalize-path>
- *
- * Copyright (c) 2014-2018, Jon Schlinkert.
- * Released under the MIT License.
- */ function normalizePath(path) {
-    if (typeof path !== "string") {
-        throw new TypeError("expected path to be a string");
-    }
-    if (path === "\\" || path === "/") return "/";
-    var len = path.length;
-    if (len <= 1) return path;
-    // ensure that win32 namespaces has two leading slashes, so that the path is
-    // handled properly by the win32 version of path.parse() after being normalized
-    // https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
-    var prefix = "";
-    if (len > 4 && path[3] === "\\") {
-        var ch = path[2];
-        if ((ch === "?" || ch === ".") && path.slice(0, 2) === "\\\\") {
-            path = path.slice(2);
-            prefix = "//";
-        }
-    }
-    // Modified part: instead of purely splitting on `\\` and `/`, we split on
-    // `/` and `\\` that is _not_ followed by any of the following characters: ()[]
-    // This is to ensure that we keep the escaping of brackets and parentheses
-    let segs = path.split(/[/\\]+(?![\(\)\[\]])/);
-    return prefix + segs.join("/");
-}
 function parseCandidateFiles(context, tailwindConfig) {
     let files = tailwindConfig.content.files;
     // Normalize the file globs
     files = files.filter((filePath)=>typeof filePath === "string");
-    files = files.map(normalizePath);
+    files = files.map(_normalizepath.default);
     // Split into included and excluded globs
     let tasks = _fastglob.default.generateTasks(files);
     /** @type {ContentPath[]} */ let included = [];
@@ -90,9 +60,6 @@ function parseCandidateFiles(context, tailwindConfig) {
  * @param {boolean} ignore
  * @returns {ContentPath}
  */ function parseFilePath(filePath, ignore) {
-    // Escape special characters in the file path such as: ()[]
-    // But only if the special character isn't already escaped
-    filePath = filePath.replace(/(?<!\\)([\[\]\(\)])/g, "\\$1");
     let contentPath = {
         original: filePath,
         base: filePath,
@@ -114,7 +81,7 @@ function parseCandidateFiles(context, tailwindConfig) {
     // Afaik, this technically shouldn't be needed but there's probably
     // some internal, direct path matching with a normalized path in
     // a package which can't handle mixed directory separators
-    let base = normalizePath(contentPath.base);
+    let base = (0, _normalizepath.default)(contentPath.base);
     // If the user's file path contains any special characters (like parens) for instance fast-glob
     // is like "OOOH SHINY" and treats them as such. So we have to escape the base path to fix this
     base = _fastglob.default.escapePath(base);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",

package/src/lib/content.js

@@ -4,47 +4,10 @@ import fs from 'fs'
 import path from 'path'
 import isGlob from 'is-glob'
 import fastGlob from 'fast-glob'
+import normalizePath from 'normalize-path'
 import { parseGlob } from '../util/parseGlob'
 import { env } from './sharedState'
 
-/*!
- * Modified version of normalize-path, original license below
- *
- * normalize-path <https://github.com/jonschlinkert/normalize-path>
- *
- * Copyright (c) 2014-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-function normalizePath(path) {
-  if (typeof path !== 'string') {
-    throw new TypeError('expected path to be a string')
-  }
-
-  if (path === '\\' || path === '/') return '/'
-
-  var len = path.length
-  if (len <= 1) return path
-
-  // ensure that win32 namespaces has two leading slashes, so that the path is
-  // handled properly by the win32 version of path.parse() after being normalized
-  // https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
-  var prefix = ''
-  if (len > 4 && path[3] === '\\') {
-    var ch = path[2]
-    if ((ch === '?' || ch === '.') && path.slice(0, 2) === '\\\\') {
-      path = path.slice(2)
-      prefix = '//'
-    }
-  }
-
-  // Modified part: instead of purely splitting on `\\` and `/`, we split on
-  // `/` and `\\` that is _not_ followed by any of the following characters: ()[]
-  // This is to ensure that we keep the escaping of brackets and parentheses
-  let segs = path.split(/[/\\]+(?![\(\)\[\]])/)
-  return prefix + segs.join('/')
-}
-
 /** @typedef {import('../../types/config.js').RawFile} RawFile */
 /** @typedef {import('../../types/config.js').FilePath} FilePath */
 
@@ -110,10 +73,6 @@ export function parseCandidateFiles(context, tailwindConfig) {
  * @returns {ContentPath}
  */
 function parseFilePath(filePath, ignore) {
-  // Escape special characters in the file path such as: ()[]
-  // But only if the special character isn't already escaped
-  filePath = filePath.replace(/(?<!\\)([\[\]\(\)])/g, '\\$1')
-
   let contentPath = {
     original: filePath,
     base: filePath,