tailwindcss 0.0.0-oxide-insiders.9bbdd9b → 0.0.0-oxide-insiders.261a8b4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-oxide-insiders.9bbdd9b",
+  "version": "0.0.0-oxide-insiders.261a8b4",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -54,13 +54,13 @@
     "@swc/register": "0.1.10",
     "autoprefixer": "^10.4.13",
     "concurrently": "^7.5.0",
-    "cssnano": "^5.1.14",
+    "cssnano": "^5.1.15",
     "esbuild": "^0.17.4",
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^29.4.1",
-    "jest-diff": "^29.4.1",
+    "jest": "^29.4.3",
+    "jest-diff": "^29.4.3",
     "prettier": "^2.8.4",
     "rimraf": "^4.1.2",
     "source-map-js": "^1.0.2",
@@ -70,7 +70,7 @@
     "postcss": "^8.0.9"
   },
   "dependencies": {
-    "@tailwindcss/oxide": "0.0.0-oxide-insiders.9bbdd9b",
+    "@tailwindcss/oxide": "0.0.0-oxide-insiders.261a8b4",
     "arg": "^5.0.2",
     "browserslist": "^4.21.5",
     "chokidar": "^3.5.3",

package/peers/index.js

@@ -30620,7 +30620,6 @@ var require_toInitial = __commonJS({
       "mask-clip": "border-box",
       "mask-mode": "match-source",
       "mask-origin": "border-box",
-      "mask-repeat": "no-repeat",
       "mask-type": "luminance",
       "ruby-align": "space-around",
       "ruby-merge": "separate",
@@ -75932,7 +75931,7 @@ var require_src10 = __commonJS({
           return {
             OnceExit(css) {
               css.walkDecls((decl) => {
-                if (/^(composes|font|filter|-webkit-tap-highlight-color)/i.test(
+                if (/^(composes|font|src$|filter|-webkit-tap-highlight-color)/i.test(
                   decl.prop
                 )) {
                   return;
@@ -80423,12 +80422,18 @@ var require_src22 = __commonJS({
       if (!a.base && !b.base) {
         return true;
       }
-      if (a.base !== b.base) {
+      if (a.base !== b.base && a.base !== "place" && b.base !== "place") {
         return false;
       }
       if (a.rest.length !== b.rest.length) {
         return true;
       }
+      if (a.base === "border") {
+        const allRestProps = /* @__PURE__ */ new Set([...a.rest, ...b.rest]);
+        if (allRestProps.has("image") || allRestProps.has("width") || allRestProps.has("color") || allRestProps.has("style")) {
+          return true;
+        }
+      }
       return a.rest.every((s, index) => b.rest[index] === s);
     }
     function mergeParents(first, second) {
@@ -80444,7 +80449,7 @@ var require_src22 = __commonJS({
     }
     function partialMerge(first, second) {
       let intersection = intersect(getDecls(first), getDecls(second));
-      if (!intersection.length) {
+      if (intersection.length === 0) {
         return second;
       }
       let nextRule = second.next();
@@ -80468,13 +80473,10 @@ var require_src22 = __commonJS({
       intersection = intersection.filter((decl, intersectIndex) => {
         const indexOfDecl = indexOfDeclaration(firstDecls, decl);
         const nextConflictInFirst = firstDecls.slice(indexOfDecl + 1).filter((d) => isConflictingProp(d.prop, decl.prop));
-        if (!nextConflictInFirst.length) {
+        if (nextConflictInFirst.length === 0) {
           return true;
         }
         const nextConflictInIntersection = intersection.slice(intersectIndex + 1).filter((d) => isConflictingProp(d.prop, decl.prop));
-        if (!nextConflictInIntersection.length) {
-          return false;
-        }
         if (nextConflictInFirst.length !== nextConflictInIntersection.length) {
           return false;
         }
@@ -80501,7 +80503,7 @@ var require_src22 = __commonJS({
         secondDecls.splice(nextConflictIndex, 1);
         return true;
       });
-      if (!intersection.length) {
+      if (intersection.length === 0) {
         return second;
       }
       const receivingBlock = second.clone();
@@ -80530,7 +80532,7 @@ var require_src22 = __commonJS({
         first.replaceWith(firstClone);
         second.replaceWith(secondClone);
         [firstClone, receivingBlock, secondClone].forEach((r) => {
-          if (!r.nodes.length) {
+          if (r.nodes.length === 0) {
             r.remove();
           }
         });