Revert debugging code

tailwindlabs · Sep 17, 2024 · affd493 · affd493
1 parent 8345e05
commit affd493
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 33 deletions.
diff --git a/packages/tailwindcss/src/compat/screens-config.ts b/packages/tailwindcss/src/compat/screens-config.ts
@@ -4,7 +4,6 @@ import type { ResolvedConfig } from './config/types'
 import DefaultTheme from './default-theme'
 
 export function registerScreensConfig(config: ResolvedConfig, designSystem: DesignSystem) {
-  return
   let screens = config.theme.screens || {}
 
   // We want to insert the breakpoints in the right order as best we can. In the

diff --git a/packages/tailwindcss/src/compile.ts b/packages/tailwindcss/src/compile.ts
@@ -32,27 +32,9 @@ export function compileCandidates(
 
   // Sort the variants
   let variants = designSystem.getUsedVariants().sort((a, z) => {
-    console.log(a, z, designSystem.variants.compare(a, z))
     return designSystem.variants.compare(a, z)
   })
 
-  // max-sm 0 => 1
-  // min-sm 1 => 2
-  // sm     2 => 4
-
-  //
-  // max-sm // [1]
-  // max-md // [1]
-  //
-
-  // [
-  //  [max-sm, max-md],
-  //  [[&:foo]],
-  //  [[&:bar]],
-  // ]
-
-  // To do this, variantOrder needs to be an array and the inner sorting needs to work
-
   // Create the AST
   for (let [rawCandidate, candidates] of matches) {
     let found = false
@@ -68,13 +50,9 @@ export function compileCandidates(
         // variant. This allows us to sort the rules based on the order of
         // variants used.
         let variantOrder = 0n
-        console.log(candidate.variants)
-
         for (let variant of candidate.variants) {
-          console.log(designSystem.variants.getOrders(variant))
           variantOrder |= 1n << BigInt(variants.indexOf(variant))
         }
-        console.log({ variantOrder })
 
         nodeSorting.set(node, {
           properties: propertySort,

diff --git a/packages/tailwindcss/src/index.test.ts b/packages/tailwindcss/src/index.test.ts
@@ -1416,7 +1416,7 @@ describe('Parsing themes values from CSS', () => {
     `)
   })
 
-  test.only('`default` theme values can be overridden by plugin theme values', async () => {
+  test('`default` theme values can be overridden by plugin theme values', async () => {
     let { build } = await compile(
       css`
         @theme default {

diff --git a/packages/tailwindcss/src/variants.test.ts b/packages/tailwindcss/src/variants.test.ts
@@ -1356,13 +1356,13 @@ test('min, max and unprefixed breakpoints', async () => {
     }
 
     @media (width >= 1024px) {
-      .min-lg\\:flex {
+      .lg\\:flex {
         display: flex;
       }
     }
 
     @media (width >= 1024px) {
-      .lg\\:flex {
+      .min-lg\\:flex {
         display: flex;
       }
     }"

diff --git a/packages/tailwindcss/src/variants.ts b/packages/tailwindcss/src/variants.ts
@@ -130,13 +130,6 @@ export class Variants {
     return compareFn(a, z) || (a.root < z.root ? -1 : 1)
   }
 
-  getOrders(a: Variant): number[] {
-    if (a.kind === 'compound') {
-      return [this.variants.get(a.root)!.order, ...this.getOrders(a.variant)]
-    }
-    return [this.variants.get(a.root)!.order]
-  }
-
   keys() {
     return this.variants.keys()
   }