Merge branch 'main' into allow-position-static

Author: marklawlor

src/__tests__/vendor/tailwind/flexbox-grid.test.tsx

@@ -599,12 +599,12 @@ describe("Flexbox & Grid - Align Content", () => {
   });
   test("content-evenly", async () => {
     expect(await renderCurrentTest()).toStrictEqual({
-      props: {},
-      warnings: {
-        values: {
-          "align-content": "space-evenly",
-        },
-      },
+      props: { style: { alignContent: "space-evenly" } },
+    });
+  });
+  test("content-stretch", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: { style: { alignContent: "stretch" } },
     });
   });
 });

src/__tests__/vendor/tailwind/layout.test.tsx

@@ -209,6 +209,11 @@ describe("Layout - Display", () => {
       props: { style: { display: "none" } },
     });
   });
+  test("contents", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: { style: { display: "contents" } },
+    });
+  });
   test("block", async () => {
     expect(await renderCurrentTest()).toStrictEqual({
       props: {},
@@ -311,12 +316,6 @@ describe("Layout - Display", () => {
       warnings: { values: { display: "inline-grid" } },
     });
   });
-  test("contents", async () => {
-    expect(await renderCurrentTest()).toStrictEqual({
-      props: {},
-      warnings: { values: { display: "contents" } },
-    });
-  });
   test("list-item", async () => {
     expect(await renderCurrentTest()).toStrictEqual({
       props: {},

src/__tests__/vendor/tailwind/sizing.test.tsx

@@ -239,3 +239,55 @@ describe("Sizing - Max Height", () => {
     });
   });
 });
+
+describe("Sizing - Size", () => {
+  test("size-0", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: { style: { width: 0, height: 0 } },
+    });
+  });
+  test("size-px", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: { style: { width: 1, height: 1 } },
+    });
+  });
+  test("size-1", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: { style: { width: 3.5, height: 3.5 } },
+    });
+  });
+  test("size-1/2", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: { style: { width: "50%", height: "50%" } },
+    });
+  });
+  test("size-full", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: { style: { width: "100%", height: "100%" } },
+    });
+  });
+  test("size-auto", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: {},
+      warnings: { values: { width: "auto", height: "auto" } },
+    });
+  });
+  test("size-min", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: {},
+      warnings: { values: { width: "min-content", height: "min-content" } },
+    });
+  });
+  test("size-max", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: {},
+      warnings: { values: { width: "max-content", height: "max-content" } },
+    });
+  });
+  test("size-fit", async () => {
+    expect(await renderCurrentTest()).toStrictEqual({
+      props: {},
+      warnings: { values: { width: "fit-content", height: "fit-content" } },
+    });
+  });
+});

src/compiler/declarations.ts

@@ -1828,6 +1828,7 @@ export function parseAlignContent(
     "stretch",
     "space-between",
     "space-around",
+    "space-evenly",
   ]);
 
   let value: string | undefined;
@@ -2411,7 +2412,7 @@ export function parseDisplay(
   builder: StylesheetBuilder,
 ) {
   if (value.type === "keyword") {
-    if (value.value === "none") {
+    if (value.value === "none" || value.value === "contents") {
       return value.value;
     } else {
       builder.addWarning("value", value.value);