tailwindcss 3.2.0 → 3.2.1

package/README.md

@@ -1,9 +1,9 @@
 <p align="center">
   <a href="https://tailwindcss.com" target="_blank">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="./.github/logo-dark.svg">
-      <source media="(prefers-color-scheme: light)" srcset="./.github/logo-light.svg">
-      <img alt="Tailwind CSS" src="./.github/logo-light.svg" width="350" height="70" style="max-width: 100%;">
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg">
+      <img alt="Tailwind CSS" src="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg" width="350" height="70" style="max-width: 100%;">
     </picture>
   </a>
 </p>

package/lib/cli/build/plugin.js

@@ -283,6 +283,22 @@ async function createProcessor(args, cliConfigPath) {
                 from: input,
                 to: output
             })).then((result)=>{
+            if (!state.watcher) {
+                return result;
+            }
+            _shared.env.DEBUG && console.time("Recording PostCSS dependencies");
+            for (let message of result.messages){
+                if (message.type === "dependency") {
+                    state.contextDependencies.add(message.file);
+                }
+            }
+            _shared.env.DEBUG && console.timeEnd("Recording PostCSS dependencies");
+            // TODO: This needs to be in a different spot
+            _shared.env.DEBUG && console.time("Watch new files");
+            state.watcher.refreshWatchedFiles();
+            _shared.env.DEBUG && console.timeEnd("Watch new files");
+            return result;
+        }).then((result)=>{
             if (!output) {
                 process.stdout.write(result.css);
                 return;

package/lib/cli/build/watching.js

@@ -52,7 +52,7 @@ function createWatcher(args, { state , rebuild  }) {
             content,
             extension: _path.default.extname(file).slice(1)
         });
-        chain = chain.then(()=>rebuild(changedContent));
+        chain = chain.then(()=>rebuild(changedContent.splice(0)));
         return chain;
     }
     watcher.on("change", (file)=>recordChangedFile(file));

package/lib/util/pluginUtils.js

@@ -212,11 +212,12 @@ function coerceValue(types, modifier, options, tailwindConfig) {
 }
 function* getMatchingTypes(types, rawModifier, options, tailwindConfig) {
     let modifiersEnabled = (0, _featureFlagsJs.flagEnabled)(tailwindConfig, "generalizedModifiers");
-    let canUseUtilityModifier = modifiersEnabled && options.modifiers != null && (options.modifiers === "any" || typeof options.modifiers === "object");
-    let [modifier, utilityModifier] = canUseUtilityModifier ? splitUtilityModifier(rawModifier) : [
-        rawModifier,
-        undefined
-    ];
+    let [modifier, utilityModifier] = splitUtilityModifier(rawModifier);
+    let canUseUtilityModifier = modifiersEnabled && options.modifiers != null && (options.modifiers === "any" || typeof options.modifiers === "object" && (utilityModifier && isArbitraryValue(utilityModifier) || utilityModifier in options.modifiers));
+    if (!canUseUtilityModifier) {
+        modifier = rawModifier;
+        utilityModifier = undefined;
+    }
     if (utilityModifier !== undefined && modifier === "") {
         modifier = "DEFAULT";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -23,7 +23,6 @@
     "test": "jest",
     "test:integrations": "npm run test --prefix ./integrations",
     "install:integrations": "node scripts/install-integrations.js",
-    "posttest": "npm run style",
     "generate:plugin-list": "node -r @swc/register scripts/create-plugin-list.js",
     "generate:types": "node -r @swc/register scripts/generate-types.js",
     "generate": "npm run generate:plugin-list && npm run generate:types",
@@ -57,7 +56,6 @@
     "jest": "^28.1.3",
     "jest-diff": "^28.1.3",
     "prettier": "^2.7.1",
-    "prettier-plugin-tailwindcss": "^0.1.13",
     "rimraf": "^3.0.0",
     "source-map-js": "^1.0.2"
   },
@@ -75,6 +73,7 @@
     "glob-parent": "^6.0.2",
     "is-glob": "^4.0.3",
     "lilconfig": "^2.0.6",
+    "micromatch": "^4.0.5",
     "normalize-path": "^3.0.0",
     "object-hash": "^3.0.0",
     "picocolors": "^1.0.0",

package/peers/index.js

@@ -56553,44 +56553,49 @@ var require_walker = __commonJS({
 var require_package = __commonJS({
   "node_modules/css-tree/package.json"(exports2, module2) {
     module2.exports = {
-      name: "css-tree",
-      version: "1.1.3",
-      description: "A tool set for CSS: fast detailed parser (CSS \u2192 AST), walker (AST traversal), generator (AST \u2192 CSS) and lexer (validation and matching) based on specs and browser implementations",
-      author: "Roman Dvornov <rdvornov@gmail.com> (https://github.com/lahmatiy)",
-      license: "MIT",
-      repository: "csstree/csstree",
-      keywords: [
-        "css",
-        "ast",
-        "tokenizer",
-        "parser",
-        "walker",
-        "lexer",
-        "generator",
-        "utils",
-        "syntax",
-        "validation"
+      _args: [
+        [
+          "css-tree@1.1.3",
+          "/home/runner/work/tailwindcss/tailwindcss"
+        ]
       ],
-      main: "lib/index.js",
-      unpkg: "dist/csstree.min.js",
-      jsdelivr: "dist/csstree.min.js",
-      scripts: {
-        build: "rollup --config",
-        lint: "eslint data lib scripts test && node scripts/review-syntax-patch --lint && node scripts/update-docs --lint",
-        "lint-and-test": "npm run lint && npm test",
-        "update:docs": "node scripts/update-docs",
-        "review:syntax-patch": "node scripts/review-syntax-patch",
-        test: "mocha --reporter progress",
-        coverage: "nyc npm test",
-        travis: "nyc npm run lint-and-test && npm run coveralls",
-        coveralls: "nyc report --reporter=text-lcov | coveralls",
-        prepublishOnly: "npm run build",
-        hydrogen: "node --trace-hydrogen --trace-phase=Z --trace-deopt --code-comments --hydrogen-track-positions --redirect-code-traces --redirect-code-traces-to=code.asm --trace_hydrogen_file=code.cfg --print-opt-code bin/parse --stat -o /dev/null"
+      _development: true,
+      _from: "css-tree@1.1.3",
+      _id: "css-tree@1.1.3",
+      _inBundle: false,
+      _integrity: "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      _location: "/css-tree",
+      _phantomChildren: {},
+      _requested: {
+        type: "version",
+        registry: true,
+        raw: "css-tree@1.1.3",
+        name: "css-tree",
+        escapedName: "css-tree",
+        rawSpec: "1.1.3",
+        saveSpec: null,
+        fetchSpec: "1.1.3"
+      },
+      _requiredBy: [
+        "/csso",
+        "/svgo"
+      ],
+      _resolved: "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      _spec: "1.1.3",
+      _where: "/home/runner/work/tailwindcss/tailwindcss",
+      author: {
+        name: "Roman Dvornov",
+        email: "rdvornov@gmail.com",
+        url: "https://github.com/lahmatiy"
+      },
+      bugs: {
+        url: "https://github.com/csstree/csstree/issues"
       },
       dependencies: {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
       },
+      description: "A tool set for CSS: fast detailed parser (CSS \u2192 AST), walker (AST traversal), generator (AST \u2192 CSS) and lexer (validation and matching) based on specs and browser implementations",
       devDependencies: {
         "@rollup/plugin-commonjs": "^11.0.2",
         "@rollup/plugin-json": "^4.0.2",
@@ -56610,7 +56615,43 @@ var require_package = __commonJS({
         "data",
         "dist",
         "lib"
-      ]
+      ],
+      homepage: "https://github.com/csstree/csstree#readme",
+      jsdelivr: "dist/csstree.min.js",
+      keywords: [
+        "css",
+        "ast",
+        "tokenizer",
+        "parser",
+        "walker",
+        "lexer",
+        "generator",
+        "utils",
+        "syntax",
+        "validation"
+      ],
+      license: "MIT",
+      main: "lib/index.js",
+      name: "css-tree",
+      repository: {
+        type: "git",
+        url: "git+https://github.com/csstree/csstree.git"
+      },
+      scripts: {
+        build: "rollup --config",
+        coverage: "nyc npm test",
+        coveralls: "nyc report --reporter=text-lcov | coveralls",
+        hydrogen: "node --trace-hydrogen --trace-phase=Z --trace-deopt --code-comments --hydrogen-track-positions --redirect-code-traces --redirect-code-traces-to=code.asm --trace_hydrogen_file=code.cfg --print-opt-code bin/parse --stat -o /dev/null",
+        lint: "eslint data lib scripts test && node scripts/review-syntax-patch --lint && node scripts/update-docs --lint",
+        "lint-and-test": "npm run lint && npm test",
+        prepublishOnly: "npm run build",
+        "review:syntax-patch": "node scripts/review-syntax-patch",
+        test: "mocha --reporter progress",
+        travis: "nyc npm run lint-and-test && npm run coveralls",
+        "update:docs": "node scripts/update-docs"
+      },
+      unpkg: "dist/csstree.min.js",
+      version: "1.1.3"
     };
   }
 });
@@ -60232,50 +60273,50 @@ var require_compress = __commonJS({
 var require_package2 = __commonJS({
   "node_modules/csso/package.json"(exports2, module2) {
     module2.exports = {
-      name: "csso",
-      version: "4.2.0",
-      description: "CSS minifier with structural optimisations",
-      homepage: "https://github.com/css/csso",
-      author: "Sergey Kryzhanovsky <skryzhanovsky@ya.ru> (https://github.com/afelix)",
-      maintainers: [
-        {
-          name: "Roman Dvornov",
-          email: "rdvornov@gmail.com",
-          "github-username": "lahmatiy"
-        }
+      _args: [
+        [
+          "csso@4.2.0",
+          "/home/runner/work/tailwindcss/tailwindcss"
+        ]
       ],
-      license: "MIT",
-      repository: "css/csso",
+      _development: true,
+      _from: "csso@4.2.0",
+      _id: "csso@4.2.0",
+      _inBundle: false,
+      _integrity: "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      _location: "/csso",
+      _phantomChildren: {},
+      _requested: {
+        type: "version",
+        registry: true,
+        raw: "csso@4.2.0",
+        name: "csso",
+        escapedName: "csso",
+        rawSpec: "4.2.0",
+        saveSpec: null,
+        fetchSpec: "4.2.0"
+      },
+      _requiredBy: [
+        "/svgo"
+      ],
+      _resolved: "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      _spec: "4.2.0",
+      _where: "/home/runner/work/tailwindcss/tailwindcss",
+      author: {
+        name: "Sergey Kryzhanovsky",
+        email: "skryzhanovsky@ya.ru",
+        url: "https://github.com/afelix"
+      },
+      browser: {
+        "css-tree": "css-tree/dist/csstree.min.js"
+      },
       bugs: {
         url: "https://github.com/css/csso/issues"
       },
-      keywords: [
-        "css",
-        "compress",
-        "minifier",
-        "minify",
-        "optimise",
-        "optimisation",
-        "csstree"
-      ],
-      main: "./lib/index",
-      scripts: {
-        test: "mocha --reporter dot",
-        lint: "eslint lib test",
-        "lint-and-test": "npm run lint && npm test",
-        build: "rollup --config && terser dist/csso.js --compress --mangle -o dist/csso.min.js",
-        coverage: "nyc npm test",
-        coveralls: "nyc report --reporter=text-lcov | coveralls",
-        travis: "nyc npm run lint-and-test && npm run coveralls",
-        hydrogen: "node --trace-hydrogen --trace-phase=Z --trace-deopt --code-comments --hydrogen-track-positions --redirect-code-traces --redirect-code-traces-to=code.asm --trace_hydrogen_file=code.cfg --print-opt-code bin/csso --stat -o /dev/null",
-        prepublishOnly: "npm run build"
-      },
       dependencies: {
         "css-tree": "^1.1.2"
       },
-      browser: {
-        "css-tree": "css-tree/dist/csstree.min.js"
-      },
+      description: "CSS minifier with structural optimisations",
       devDependencies: {
         "@rollup/plugin-commonjs": "^11.0.1",
         "@rollup/plugin-json": "^4.0.1",
@@ -60294,7 +60335,42 @@ var require_package2 = __commonJS({
       files: [
         "dist",
         "lib"
-      ]
+      ],
+      homepage: "https://github.com/css/csso",
+      keywords: [
+        "css",
+        "compress",
+        "minifier",
+        "minify",
+        "optimise",
+        "optimisation",
+        "csstree"
+      ],
+      license: "MIT",
+      main: "./lib/index",
+      maintainers: [
+        {
+          name: "Roman Dvornov",
+          email: "rdvornov@gmail.com"
+        }
+      ],
+      name: "csso",
+      repository: {
+        type: "git",
+        url: "git+https://github.com/css/csso.git"
+      },
+      scripts: {
+        build: "rollup --config && terser dist/csso.js --compress --mangle -o dist/csso.min.js",
+        coverage: "nyc npm test",
+        coveralls: "nyc report --reporter=text-lcov | coveralls",
+        hydrogen: "node --trace-hydrogen --trace-phase=Z --trace-deopt --code-comments --hydrogen-track-positions --redirect-code-traces --redirect-code-traces-to=code.asm --trace_hydrogen_file=code.cfg --print-opt-code bin/csso --stat -o /dev/null",
+        lint: "eslint lib test",
+        "lint-and-test": "npm run lint && npm test",
+        prepublishOnly: "npm run build",
+        test: "mocha --reporter dot",
+        travis: "nyc npm run lint-and-test && npm run coveralls"
+      },
+      version: "4.2.0"
     };
   }
 });

package/src/cli/build/plugin.js

@@ -328,6 +328,26 @@ export async function createProcessor(args, cliConfigPath) {
 
     return readInput()
       .then((css) => processor.process(css, { ...postcssOptions, from: input, to: output }))
+      .then((result) => {
+        if (!state.watcher) {
+          return result
+        }
+
+        env.DEBUG && console.time('Recording PostCSS dependencies')
+        for (let message of result.messages) {
+          if (message.type === 'dependency') {
+            state.contextDependencies.add(message.file)
+          }
+        }
+        env.DEBUG && console.timeEnd('Recording PostCSS dependencies')
+
+        // TODO: This needs to be in a different spot
+        env.DEBUG && console.time('Watch new files')
+        state.watcher.refreshWatchedFiles()
+        env.DEBUG && console.timeEnd('Watch new files')
+
+        return result
+      })
       .then((result) => {
         if (!output) {
           process.stdout.write(result.css)

package/src/cli/build/watching.js

@@ -62,7 +62,7 @@ export function createWatcher(args, { state, rebuild }) {
       extension: path.extname(file).slice(1),
     })
 
-    chain = chain.then(() => rebuild(changedContent))
+    chain = chain.then(() => rebuild(changedContent.splice(0)))
 
     return chain
   }

package/src/util/pluginUtils.js

@@ -233,14 +233,20 @@ export function coerceValue(types, modifier, options, tailwindConfig) {
 export function* getMatchingTypes(types, rawModifier, options, tailwindConfig) {
   let modifiersEnabled = flagEnabled(tailwindConfig, 'generalizedModifiers')
 
+  let [modifier, utilityModifier] = splitUtilityModifier(rawModifier)
+
   let canUseUtilityModifier =
     modifiersEnabled &&
     options.modifiers != null &&
-    (options.modifiers === 'any' || typeof options.modifiers === 'object')
-
-  let [modifier, utilityModifier] = canUseUtilityModifier
-    ? splitUtilityModifier(rawModifier)
-    : [rawModifier, undefined]
+    (options.modifiers === 'any' ||
+      (typeof options.modifiers === 'object' &&
+        ((utilityModifier && isArbitraryValue(utilityModifier)) ||
+          utilityModifier in options.modifiers)))
+
+  if (!canUseUtilityModifier) {
+    modifier = rawModifier
+    utilityModifier = undefined
+  }
 
   if (utilityModifier !== undefined && modifier === '') {
     modifier = 'DEFAULT'

package/stubs/defaultConfig.stub.js

@@ -11,6 +11,7 @@ module.exports = {
       xl: '1280px',
       '2xl': '1536px',
     },
+    supports: {},
     colors: ({ colors }) => ({
       inherit: colors.inherit,
       current: colors.current,

package/types/config.d.ts

@@ -84,6 +84,7 @@ type ScreensConfig = string[] | KeyValuePair<string, string | Screen | Screen[]>
 interface ThemeConfig {
   // Responsiveness
   screens: ResolvableTo<ScreensConfig>
+  supports: ResolvableTo<Record<string, string>>
 
   // Reusable base configs
   colors: ResolvableTo<RecursiveKeyValuePair>

package/peers/.svgo.yml

@@ -1,75 +0,0 @@
-# replace default config
-
-# multipass: true
-# full: true
-
-plugins:
-
-  # - name
-  #
-  # or:
-  # - name: false
-  # - name: true
-  #
-  # or:
-  # - name:
-  #     param1: 1
-  #     param2: 2
-
-  - removeDoctype
-  - removeXMLProcInst
-  - removeComments
-  - removeMetadata
-  - removeXMLNS
-  - removeEditorsNSData
-  - cleanupAttrs
-  - inlineStyles
-  - minifyStyles
-  - convertStyleToAttrs
-  - cleanupIDs
-  - prefixIds
-  - removeRasterImages
-  - removeUselessDefs
-  - cleanupNumericValues
-  - cleanupListOfValues
-  - convertColors
-  - removeUnknownsAndDefaults
-  - removeNonInheritableGroupAttrs
-  - removeUselessStrokeAndFill
-  - removeViewBox
-  - cleanupEnableBackground
-  - removeHiddenElems
-  - removeEmptyText
-  - convertShapeToPath
-  - convertEllipseToCircle
-  - moveElemsAttrsToGroup
-  - moveGroupAttrsToElems
-  - collapseGroups
-  - convertPathData
-  - convertTransform
-  - removeEmptyAttrs
-  - removeEmptyContainers
-  - mergePaths
-  - removeUnusedNS
-  - sortAttrs
-  - sortDefsChildren
-  - removeTitle
-  - removeDesc
-  - removeDimensions
-  - removeAttrs
-  - removeAttributesBySelector
-  - removeElementsByAttr
-  - addClassesToSVGElement
-  - removeStyleElement
-  - removeScriptElement
-  - addAttributesToSVGElement
-  - removeOffCanvasPaths
-  - reusePaths
-
-# configure the indent (default 4 spaces) used by `--pretty` here:
-#
-# @see https://github.com/svg/svgo/blob/master/lib/svgo/js2svg.js#L6 for more config options
-#
-# js2svg:
-#  pretty: true
-#  indent: '  '