tailwindcss 3.2.4 → 3.2.6

package/lib/util/prefixSelector.js

@@ -2,7 +2,18 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
+Object.defineProperty(exports, /**
+ * @template {string | import('postcss-selector-parser').Root} T
+ *
+ * Prefix all classes in the selector with the given prefix
+ *
+ * It can take either a string or a selector AST and will return the same type
+ *
+ * @param {string} prefix
+ * @param {T} selector
+ * @param {boolean} prependNegative
+ * @returns {T}
+ */ "default", {
     enumerable: true,
     get: ()=>_default
 });
@@ -13,11 +24,14 @@ function _interopRequireDefault(obj) {
     };
 }
 function _default(prefix, selector, prependNegative = false) {
-    return (0, _postcssSelectorParser.default)((selectors)=>{
-        selectors.walkClasses((classSelector)=>{
-            let baseClass = classSelector.value;
-            let shouldPlaceNegativeBeforePrefix = prependNegative && baseClass.startsWith("-");
-            classSelector.value = shouldPlaceNegativeBeforePrefix ? `-${prefix}${baseClass.slice(1)}` : `${prefix}${baseClass}`;
-        });
-    }).processSync(selector);
+    if (prefix === "") {
+        return selector;
+    }
+    let ast = typeof selector === "string" ? (0, _postcssSelectorParser.default)().astSync(selector) : selector;
+    ast.walkClasses((classSelector)=>{
+        let baseClass = classSelector.value;
+        let shouldPlaceNegativeBeforePrefix = prependNegative && baseClass.startsWith("-");
+        classSelector.value = shouldPlaceNegativeBeforePrefix ? `-${prefix}${baseClass.slice(1)}` : `${prefix}${baseClass}`;
+    });
+    return typeof selector === "string" ? ast.toString() : ast;
 }

package/lib/util/resolveConfig.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "default", {
 const _negateValue = /*#__PURE__*/ _interopRequireDefault(require("./negateValue"));
 const _corePluginList = /*#__PURE__*/ _interopRequireDefault(require("../corePluginList"));
 const _configurePlugins = /*#__PURE__*/ _interopRequireDefault(require("./configurePlugins"));
-const _defaultConfigStub = /*#__PURE__*/ _interopRequireDefault(require("../../stubs/defaultConfig.stub"));
 const _colors = /*#__PURE__*/ _interopRequireDefault(require("../public/colors"));
 const _defaults = require("./defaults");
 const _toPath = require("./toPath");
@@ -189,8 +188,8 @@ function extractPluginConfigs(configs) {
             ...allConfigs,
             config
         ];
-        var ref;
-        const plugins = (ref = config === null || config === void 0 ? void 0 : config.plugins) !== null && ref !== void 0 ? ref : [];
+        var _config_plugins;
+        const plugins = (_config_plugins = config === null || config === void 0 ? void 0 : config.plugins) !== null && _config_plugins !== void 0 ? _config_plugins : [];
         if (plugins.length === 0) {
             return;
         }
@@ -198,11 +197,11 @@ function extractPluginConfigs(configs) {
             if (plugin.__isOptionsFunction) {
                 plugin = plugin();
             }
-            var ref;
+            var _plugin_config;
             allConfigs = [
                 ...allConfigs,
                 ...extractPluginConfigs([
-                    (ref = plugin === null || plugin === void 0 ? void 0 : plugin.config) !== null && ref !== void 0 ? ref : {}
+                    (_plugin_config = plugin === null || plugin === void 0 ? void 0 : plugin.config) !== null && _plugin_config !== void 0 ? _plugin_config : {}
                 ])
             ];
         });
@@ -239,18 +238,17 @@ function resolveConfig(configs) {
         {
             prefix: "",
             important: false,
-            separator: ":",
-            variantOrder: _defaultConfigStub.default.variantOrder
+            separator: ":"
         }
     ];
-    var ref, ref1;
+    var _t_theme, _c_plugins;
     return (0, _normalizeConfig.normalizeConfig)((0, _defaults.defaults)({
         theme: resolveFunctionKeys(mergeExtensions(mergeThemes(allConfigs.map((t)=>{
-            return (ref = t === null || t === void 0 ? void 0 : t.theme) !== null && ref !== void 0 ? ref : {};
+            return (_t_theme = t === null || t === void 0 ? void 0 : t.theme) !== null && _t_theme !== void 0 ? _t_theme : {};
         })))),
         corePlugins: resolveCorePlugins(allConfigs.map((c)=>c.corePlugins)),
         plugins: resolvePluginLists(configs.map((c)=>{
-            return (ref1 = c === null || c === void 0 ? void 0 : c.plugins) !== null && ref1 !== void 0 ? ref1 : [];
+            return (_c_plugins = c === null || c === void 0 ? void 0 : c.plugins) !== null && _c_plugins !== void 0 ? _c_plugins : [];
         }))
     }, ...allConfigs));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -12,12 +12,14 @@
     "tailwind": "lib/cli.js",
     "tailwindcss": "lib/cli.js"
   },
+  "tailwindcss": {
+    "engine": "stable"
+  },
   "scripts": {
-    "preswcify": "npm run generate && rimraf lib",
-    "swcify": "swc src --out-dir lib --copy-files",
-    "postswcify": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js",
-    "rebuild-fixtures": "npm run swcify && node -r @swc/register scripts/rebuildFixtures.js",
-    "prepublishOnly": "npm install --force && npm run swcify",
+    "prebuild": "npm run generate && rimraf lib",
+    "build": "swc src --out-dir lib --copy-files",
+    "postbuild": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js --define:process.env.CSS_TRANSFORMER_WASM=false",
+    "rebuild-fixtures": "npm run build && node -r @swc/register scripts/rebuildFixtures.js",
     "style": "eslint .",
     "pretest": "npm run generate",
     "test": "jest",
@@ -27,7 +29,8 @@
     "generate:types": "node -r @swc/register scripts/generate-types.js",
     "generate": "npm run generate:plugin-list && npm run generate:types",
     "release-channel": "node ./scripts/release-channel.js",
-    "release-notes": "node ./scripts/release-notes.js"
+    "release-notes": "node ./scripts/release-notes.js",
+    "prepublishOnly": "npm install --force && npm run build"
   },
   "files": [
     "src/*",
@@ -43,21 +46,25 @@
     "*.js"
   ],
   "devDependencies": {
-    "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.3.11",
-    "@swc/jest": "^0.2.23",
-    "@swc/register": "^0.1.10",
+    "@swc/cli": "0.1.59",
+    "@swc/core": "1.3.24",
+    "@swc/jest": "0.2.24",
+    "@swc/register": "0.1.10",
     "autoprefixer": "^10.4.13",
+    "browserslist": "^4.21.4",
+    "concurrently": "^7.5.0",
     "cssnano": "^5.1.14",
-    "esbuild": "^0.15.12",
-    "eslint": "^8.26.0",
-    "eslint-config-prettier": "^8.5.0",
+    "esbuild": "^0.16.10",
+    "eslint": "^8.31.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^28.1.3",
     "jest-diff": "^28.1.3",
-    "prettier": "^2.7.1",
+    "lightningcss": "^1.18.0",
+    "prettier": "^2.8.1",
     "rimraf": "^3.0.0",
-    "source-map-js": "^1.0.2"
+    "source-map-js": "^1.0.2",
+    "turbo": "^1.6.3"
   },
   "peerDependencies": {
     "postcss": "^8.0.9"
@@ -77,12 +84,12 @@
     "normalize-path": "^3.0.0",
     "object-hash": "^3.0.0",
     "picocolors": "^1.0.0",
-    "postcss": "^8.4.18",
+    "postcss": "^8.0.9",
     "postcss-import": "^14.1.0",
     "postcss-js": "^4.0.0",
     "postcss-load-config": "^3.1.4",
     "postcss-nested": "6.0.0",
-    "postcss-selector-parser": "^6.0.10",
+    "postcss-selector-parser": "^6.0.11",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
     "resolve": "^1.22.1"
@@ -104,8 +111,12 @@
       "/standalone-cli/",
       "\\.test\\.skip\\.js$"
     ],
+    "transformIgnorePatterns": [
+      "node_modules/(?!lightningcss)"
+    ],
     "transform": {
-      "\\.js$": "@swc/jest"
+      "\\.js$": "@swc/jest",
+      "\\.ts$": "@swc/jest"
     }
   },
   "engines": {

package/peers/index.js

@@ -3248,7 +3248,7 @@ var require_input = __commonJS({
         if (line && typeof line === "object") {
           let start = line;
           let end = column;
-          if (typeof line.offset === "number") {
+          if (typeof start.offset === "number") {
             let pos = this.fromOffset(start.offset);
             line = pos.line;
             column = pos.col;
@@ -3636,7 +3636,8 @@ var require_map_generator = __commonJS({
           }
           if (node && type !== "start") {
             let p = node.parent || { raws: {} };
-            if (node.type !== "decl" || node !== p.last || p.raws.semicolon) {
+            let childless = node.type === "decl" || node.type === "atrule" && !node.nodes;
+            if (!childless || node !== p.last || p.raws.semicolon) {
               if (node.source && node.source.end) {
                 mapping.source = this.sourcePath(node);
                 mapping.original.line = node.source.end.line;
@@ -3856,7 +3857,7 @@ var require_container = __commonJS({
       }
       insertBefore(exist, add) {
         let existIndex = this.index(exist);
-        let type = exist === 0 ? "prepend" : false;
+        let type = existIndex === 0 ? "prepend" : false;
         let nodes = this.normalize(add, this.proxyOf.nodes[existIndex], type).reverse();
         existIndex = this.index(exist);
         for (let node of nodes)
@@ -5576,7 +5577,7 @@ var require_processor = __commonJS({
     var Root = require_root();
     var Processor = class {
       constructor(plugins = []) {
-        this.version = "8.4.18";
+        this.version = "8.4.21";
         this.plugins = this.normalize(plugins);
       }
       use(plugin) {
@@ -56608,12 +56609,6 @@ var require_walker = __commonJS({
 var require_package = __commonJS({
   "node_modules/css-tree/package.json"(exports2, module2) {
     module2.exports = {
-      _args: [
-        [
-          "css-tree@1.1.3",
-          "/home/runner/work/tailwindcss/tailwindcss"
-        ]
-      ],
       _development: true,
       _from: "css-tree@1.1.3",
       _id: "css-tree@1.1.3",
@@ -56636,7 +56631,8 @@ var require_package = __commonJS({
         "/svgo"
       ],
       _resolved: "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      _spec: "1.1.3",
+      _shasum: "eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d",
+      _spec: "css-tree@1.1.3",
       _where: "/home/runner/work/tailwindcss/tailwindcss",
       author: {
         name: "Roman Dvornov",
@@ -56646,10 +56642,12 @@ var require_package = __commonJS({
       bugs: {
         url: "https://github.com/csstree/csstree/issues"
       },
+      bundleDependencies: false,
       dependencies: {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
       },
+      deprecated: false,
       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",
@@ -60328,12 +60326,6 @@ var require_compress = __commonJS({
 var require_package2 = __commonJS({
   "node_modules/csso/package.json"(exports2, module2) {
     module2.exports = {
-      _args: [
-        [
-          "csso@4.2.0",
-          "/home/runner/work/tailwindcss/tailwindcss"
-        ]
-      ],
       _development: true,
       _from: "csso@4.2.0",
       _id: "csso@4.2.0",
@@ -60355,7 +60347,8 @@ var require_package2 = __commonJS({
         "/svgo"
       ],
       _resolved: "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      _spec: "4.2.0",
+      _shasum: "ea3a561346e8dc9f546d6febedd50187cf389529",
+      _spec: "csso@4.2.0",
       _where: "/home/runner/work/tailwindcss/tailwindcss",
       author: {
         name: "Sergey Kryzhanovsky",
@@ -60368,9 +60361,11 @@ var require_package2 = __commonJS({
       bugs: {
         url: "https://github.com/css/csso/issues"
       },
+      bundleDependencies: false,
       dependencies: {
         "css-tree": "^1.1.2"
       },
+      deprecated: false,
       description: "CSS minifier with structural optimisations",
       devDependencies: {
         "@rollup/plugin-commonjs": "^11.0.1",
@@ -69659,6 +69654,20 @@ var require_attribute = __commonJS({
             this._value = v;
           }
         }
+      }, {
+        key: "insensitive",
+        get: function get() {
+          return this._insensitive;
+        },
+        set: function set(insensitive) {
+          if (!insensitive) {
+            this._insensitive = false;
+            if (this.raws && (this.raws.insensitiveFlag === "I" || this.raws.insensitiveFlag === "i")) {
+              this.raws.insensitiveFlag = void 0;
+            }
+          }
+          this._insensitive = insensitive;
+        }
       }, {
         key: "attribute",
         get: function get() {
@@ -70462,7 +70471,7 @@ var require_parser4 = __commonJS({
                   node.raws.attribute += content;
                 }
                 lastAdded = "attribute";
-              } else if (!node.value && node.value !== "" || lastAdded === "value" && !spaceAfterMeaningfulToken) {
+              } else if (!node.value && node.value !== "" || lastAdded === "value" && !(spaceAfterMeaningfulToken || node.quoteMark)) {
                 var _unescaped = (0, _util.unesc)(content);
                 var _oldRawValue = (0, _util.getProp)(node, "raws", "value") || "";
                 var oldValue = node.value || "";
@@ -79487,26 +79496,36 @@ function lazyAutoprefixer() {
 function lazyCssnano() {
   return require_src32();
 }
-/*! https://mths.be/cssesc v3.0.0 by @mathias */
-/**
- * @author Ben Briggs
- * @license MIT
- * @module cssnano:preset:default
- * @overview
- *
- * This default preset for cssnano only includes transforms that make no
- * assumptions about your CSS other than what is passed in. In previous
- * iterations of cssnano, assumptions were made about your CSS which caused
- * output to look different in certain use cases, but not others. These
- * transforms have been moved from the defaults to other presets, to make
- * this preset require only minimal configuration.
- */
-/**
- * @license Fraction.js v4.2.0 05/03/2022
- * https://www.xarg.org/2014/03/rational-numbers-in-javascript/
- *
- * Copyright (c) 2021, Robert Eisele (robert@xarg.org)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- **/
-//! stable.js 0.1.8, https://github.com/Two-Screen/stable
-//! © 2018 Angry Bytes and contributors. MIT licensed.
+/*! Bundled license information:
+
+fraction.js/fraction.js:
+  (**
+   * @license Fraction.js v4.2.0 05/03/2022
+   * https://www.xarg.org/2014/03/rational-numbers-in-javascript/
+   *
+   * Copyright (c) 2021, Robert Eisele (robert@xarg.org)
+   * Dual licensed under the MIT or GPL Version 2 licenses.
+   **)
+
+stable/stable.js:
+  (*! stable.js 0.1.8, https://github.com/Two-Screen/stable *)
+  (*! © 2018 Angry Bytes and contributors. MIT licensed. *)
+
+cssesc/cssesc.js:
+  (*! https://mths.be/cssesc v3.0.0 by @mathias *)
+
+cssnano-preset-default/src/index.js:
+  (**
+   * @author Ben Briggs
+   * @license MIT
+   * @module cssnano:preset:default
+   * @overview
+   *
+   * This default preset for cssnano only includes transforms that make no
+   * assumptions about your CSS other than what is passed in. In previous
+   * iterations of cssnano, assumptions were made about your CSS which caused
+   * output to look different in certain use cases, but not others. These
+   * transforms have been moved from the defaults to other presets, to make
+   * this preset require only minimal configuration.
+   *)
+*/

package/resolveConfig.d.ts

@@ -1,3 +1,12 @@
-import type { Config } from './types/config'
-declare function resolveConfig(config: Config): Config
+import type { Config, ResolvableTo } from './types/config'
+
+type UnwrapResolvables<T> = {
+  [K in keyof T]: T[K] extends ResolvableTo<infer R> ? R : T[K]
+}
+
+type ResolvedConfig<T extends Config> = Omit<T, 'theme'> & {
+  theme: UnwrapResolvables<T['theme']>
+}
+
+declare function resolveConfig<T extends Config>(config: T): ResolvedConfig<T>
 export = resolveConfig

package/scripts/swap-engines.js

@@ -0,0 +1,40 @@
+let fs = require('fs')
+let path = require('path')
+
+let engines = {
+  stable: {
+    files: [
+      path.resolve(__dirname, '..', 'package.stable.json'),
+      path.resolve(__dirname, '..', 'package-lock.stable.json'),
+    ],
+  },
+  oxide: {
+    files: [
+      path.resolve(__dirname, '..', 'package.oxide.json'),
+      path.resolve(__dirname, '..', 'package-lock.oxide.json'),
+    ],
+  },
+}
+
+// Find out what the current engine is that we are using:
+let [otherEngine, info] = Object.entries(engines).find(([, info]) =>
+  info.files.every((file) => fs.existsSync(file))
+)
+let currentEngine = otherEngine === 'oxide' ? 'stable' : 'oxide'
+
+console.log(`Current engine: \`${currentEngine}\`, swapping to \`${otherEngine}\``)
+
+// Swap the engines
+for (let file of info.files) {
+  fs.renameSync(
+    file.replace(`.${otherEngine}`, ''),
+    file.replace(`.${otherEngine}`, `.${currentEngine}`)
+  )
+}
+for (let file of engines[otherEngine].files) {
+  fs.renameSync(file, file.replace(`.${otherEngine}`, ''))
+}
+
+console.log(
+  'Engines have been swapped. Make sure to run `npm install` to update your dependencies.'
+)

package/src/cli/build/index.js

@@ -34,8 +34,12 @@ export async function build(args, configs) {
   let processor = await createProcessor(args, configPath)
 
   if (shouldWatch) {
-    /* Abort the watcher if stdin is closed to avoid zombie processes */
-    process.stdin.on('end', () => process.exit(0))
+    // 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()

package/src/cli/build/plugin.js

@@ -10,7 +10,7 @@ import loadOptions from 'postcss-load-config/src/options' // Little bit scary, l
 import tailwind from '../../processTailwindFeatures'
 import { loadAutoprefixer, loadCssNano, loadPostcss, loadPostcssImport } from './deps'
 import { formatNodes, drainStdin, outputFile } from './utils'
-import { env } from '../shared'
+import { env } from '../../lib/sharedState'
 import resolveConfig from '../../../resolveConfig.js'
 import getModuleDependencies from '../../lib/getModuleDependencies.js'
 import { parseCandidateFiles } from '../../lib/content.js'
@@ -184,10 +184,17 @@ let state = {
     let files = fastGlob.sync(this.contentPatterns.all)
 
     for (let file of files) {
-      content.push({
-        content: fs.readFileSync(path.resolve(file), 'utf8'),
-        extension: path.extname(file).slice(1),
-      })
+      if (env.OXIDE) {
+        content.push({
+          file,
+          extension: path.extname(file).slice(1),
+        })
+      } else {
+        content.push({
+          content: fs.readFileSync(path.resolve(file), 'utf8'),
+          extension: path.extname(file).slice(1),
+        })
+      }
     }
 
     // Resolve raw content in the tailwind config
@@ -234,11 +241,9 @@ let state = {
       env.DEBUG && console.timeEnd('Watch new files')
     }
 
-    env.DEBUG && console.time('Reading content files')
     for (let file of this.readContentPaths()) {
       this.context.changedContent.push(file)
     }
-    env.DEBUG && console.timeEnd('Reading content files')
 
     return this.context
   },
@@ -355,8 +360,8 @@ export async function createProcessor(args, cliConfigPath) {
         }
 
         return Promise.all([
-          outputFile(output, result.css),
-          result.map && outputFile(output + '.map', result.map.toString()),
+          outputFile(result.opts.to, result.css),
+          result.map && outputFile(result.opts.to + '.map', result.map.toString()),
         ])
       })
       .then(() => {