tailwindcss 3.1.6 → 3.1.7

package/lib/util/withAlphaVariable.js

@@ -2,9 +2,34 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = withAlphaVariable;
-exports.withAlphaValue = withAlphaValue;
-var _color = require("./color");
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    withAlphaValue: ()=>withAlphaValue,
+    default: ()=>withAlphaVariable
+});
+const _color = require("./color");
+function withAlphaValue(color, alphaValue, defaultValue) {
+    if (typeof color === "function") {
+        return color({
+            opacityValue: alphaValue
+        });
+    }
+    let parsed = (0, _color.parseColor)(color, {
+        loose: true
+    });
+    if (parsed === null) {
+        return defaultValue;
+    }
+    return (0, _color.formatColor)({
+        ...parsed,
+        alpha: alphaValue
+    });
+}
 function withAlphaVariable({ color , property , variable  }) {
     let properties = [].concat(property);
     if (typeof color === "function") {
@@ -21,7 +46,7 @@ function withAlphaVariable({ color , property , variable  }) {
             }))
         };
     }
-    const parsed = (0, _color).parseColor(color);
+    const parsed = (0, _color.parseColor)(color);
     if (parsed === null) {
         return Object.fromEntries(properties.map((p)=>[
                 p,
@@ -40,7 +65,7 @@ function withAlphaVariable({ color , property , variable  }) {
         ...Object.fromEntries(properties.map((p)=>{
             return [
                 p,
-                (0, _color).formatColor({
+                (0, _color.formatColor)({
                     ...parsed,
                     alpha: `var(${variable})`
                 })
@@ -48,20 +73,3 @@ function withAlphaVariable({ color , property , variable  }) {
         }))
     };
 }
-function withAlphaValue(color, alphaValue, defaultValue) {
-    if (typeof color === "function") {
-        return color({
-            opacityValue: alphaValue
-        });
-    }
-    let parsed = (0, _color).parseColor(color, {
-        loose: true
-    });
-    if (parsed === null) {
-        return defaultValue;
-    }
-    return (0, _color).formatColor({
-        ...parsed,
-        alpha: alphaValue
-    });
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -43,19 +43,19 @@
   ],
   "devDependencies": {
     "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.2.196",
-    "@swc/jest": "^0.2.21",
+    "@swc/core": "^1.2.218",
+    "@swc/jest": "^0.2.22",
     "@swc/register": "^0.1.10",
     "autoprefixer": "^10.4.7",
     "cssnano": "^5.1.12",
     "esbuild": "^0.14.48",
-    "eslint": "^8.18.0",
+    "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^28.1.2",
-    "jest-diff": "^28.1.1",
+    "jest": "^28.1.3",
+    "jest-diff": "^28.1.3",
     "prettier": "^2.7.1",
-    "prettier-plugin-tailwindcss": "^0.1.11",
+    "prettier-plugin-tailwindcss": "^0.1.12",
     "rimraf": "^3.0.0",
     "source-map-js": "^1.0.2"
   },
@@ -72,7 +72,7 @@
     "fast-glob": "^3.2.11",
     "glob-parent": "^6.0.2",
     "is-glob": "^4.0.3",
-    "lilconfig": "^2.0.5",
+    "lilconfig": "^2.0.6",
     "normalize-path": "^3.0.0",
     "object-hash": "^3.0.0",
     "picocolors": "^1.0.0",

package/peers/index.js

@@ -77915,10 +77915,19 @@ var require_src32 = __commonJS({
 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/resolveConfig.d.ts

@@ -0,0 +1,3 @@
+import type { Config } from './types/config'
+declare function resolveConfig(config: Config): Config
+export = resolveConfig

package/src/lib/generateRules.js

@@ -471,7 +471,11 @@ function splitWithSeparator(input, separator) {
 
 function* recordCandidates(matches, classCandidate) {
   for (const match of matches) {
-    match[1].raws.tailwind = { ...match[1].raws.tailwind, classCandidate }
+    match[1].raws.tailwind = {
+      ...match[1].raws.tailwind,
+      classCandidate,
+      preserveSource: match[0].options?.preserveSource ?? false,
+    }
 
     yield match
   }

package/src/lib/setupContextUtils.js

@@ -289,6 +289,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
     },
     addComponents(components, options) {
       let defaultOptions = {
+        preserveSource: false,
         respectPrefix: true,
         respectImportant: false,
       }
@@ -311,6 +312,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
     },
     addUtilities(utilities, options) {
       let defaultOptions = {
+        preserveSource: false,
         respectPrefix: true,
         respectImportant: true,
       }
@@ -579,14 +581,14 @@ function collectLayerPlugins(root) {
     } else if (layerRule.params === 'components') {
       for (let node of layerRule.nodes) {
         layerPlugins.push(function ({ addComponents }) {
-          addComponents(node, { respectPrefix: false })
+          addComponents(node, { respectPrefix: false, preserveSource: true })
         })
       }
       layerRule.remove()
     } else if (layerRule.params === 'utilities') {
       for (let node of layerRule.nodes) {
         layerPlugins.push(function ({ addUtilities }) {
-          addUtilities(node, { respectPrefix: false })
+          addUtilities(node, { respectPrefix: false, preserveSource: true })
         })
       }
       layerRule.remove()

package/src/util/cloneNodes.js

@@ -2,7 +2,11 @@ export default function cloneNodes(nodes, source = undefined, raws = undefined)
   return nodes.map((node) => {
     let cloned = node.clone()
 
-    if (source !== undefined) {
+    // We always want override the source map
+    // except when explicitly told not to
+    let shouldOverwriteSource = node.raws.tailwind?.preserveSource !== true || !cloned.source
+
+    if (source !== undefined && shouldOverwriteSource) {
       cloned.source = source
 
       if ('walk' in cloned) {