Merge branch 'master' into getclasslist-modifiers

tests/getClassList.test.js

@@ -71,104 +71,104 @@ crosscheck(() => {
     expect(classes).not.toContain('bg-red-500/50')
   })
 
-it('should not include metadata by default', () => {
-  let config = {}
-  let context = createContext(resolveConfig(config))
-  let classes = context.getClassList()
+  it('should not include metadata by default', () => {
+    let config = {}
+    let context = createContext(resolveConfig(config))
+    let classes = context.getClassList()
 
-  expect(classes.every((cls) => typeof cls === 'string')).toEqual(true)
+    expect(classes.every((cls) => typeof cls === 'string')).toEqual(true)
 
-  expect(classes).toContain('bg-red-500')
-  expect(classes).toContain('text-2xl')
-})
+    expect(classes).toContain('bg-red-500')
+    expect(classes).toContain('text-2xl')
+  })
 
-it('should generate utilities with modifier data when requested', () => {
-  let config = {}
-  let context = createContext(resolveConfig(config))
-  let classes = context.getClassList({ includeMetadata: true })
-
-  expect(classes).not.toContain('bg-red-500')
-  expect(classes).not.toContain('text-2xl')
-
-  expect(classes).toContainEqual([
-    'bg-red-500',
-    {
-      modifiers: [
-        '0',
-        '5',
-        '10',
-        '20',
-        '25',
-        '30',
-        '40',
-        '50',
-        '60',
-        '70',
-        '75',
-        '80',
-        '90',
-        '95',
-        '100',
-      ],
-    },
-  ])
-  expect(classes).toContainEqual([
-    'text-2xl',
-    {
-      modifiers: [
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '8',
-        '9',
-        '10',
-        'none',
-        'tight',
-        'snug',
-        'normal',
-        'relaxed',
-        'loose',
-      ],
-    },
-  ])
-})
+  it('should generate utilities with modifier data when requested', () => {
+    let config = {}
+    let context = createContext(resolveConfig(config))
+    let classes = context.getClassList({ includeMetadata: true })
 
-it('should generate plugin-defined utilities with modifier data when requested', () => {
-  let config = {
-    plugins: [
-      plugin(function ({ matchUtilities }) {
-        matchUtilities(
-          {
-            foo: (value, { modifier }) => {
-              return { color: `rgb(${value} / ${modifier ?? 1})` }
+    expect(classes).not.toContain('bg-red-500')
+    expect(classes).not.toContain('text-2xl')
+
+    expect(classes).toContainEqual([
+      'bg-red-500',
+      {
+        modifiers: [
+          '0',
+          '5',
+          '10',
+          '20',
+          '25',
+          '30',
+          '40',
+          '50',
+          '60',
+          '70',
+          '75',
+          '80',
+          '90',
+          '95',
+          '100',
+        ],
+      },
+    ])
+    expect(classes).toContainEqual([
+      'text-2xl',
+      {
+        modifiers: [
+          '3',
+          '4',
+          '5',
+          '6',
+          '7',
+          '8',
+          '9',
+          '10',
+          'none',
+          'tight',
+          'snug',
+          'normal',
+          'relaxed',
+          'loose',
+        ],
+      },
+    ])
+  })
+
+  it('should generate plugin-defined utilities with modifier data when requested', () => {
+    let config = {
+      plugins: [
+        plugin(function ({ matchUtilities }) {
+          matchUtilities(
+            {
+              foo: (value, { modifier }) => {
+                return { color: `rgb(${value} / ${modifier ?? 1})` }
+              },
             },
-          },
-          { values: { red: '255 0 0' }, modifiers: { bar: '0' } }
-        )
-      }),
-    ],
-  }
-  let context = createContext(resolveConfig(config))
-  let classes = context.getClassList({ includeMetadata: true })
-
-  expect(classes).toContainEqual([
-    'foo-red',
-    {
-      modifiers: ['bar'],
-    },
-  ])
-})
+            { values: { red: '255 0 0' }, modifiers: { bar: '0' } }
+          )
+        }),
+      ],
+    }
+    let context = createContext(resolveConfig(config))
+    let classes = context.getClassList({ includeMetadata: true })
 
-it('should not generate utilities with opacity even if safe-listed', () => {
-  let config = {
-    safelist: [
+    expect(classes).toContainEqual([
+      'foo-red',
       {
-        pattern: /^bg-red-(400|500)(\/(40|50))?$/,
+        modifiers: ['bar'],
       },
-    ],
-  }
+    ])
+  })
+
+  it('should not generate utilities with opacity even if safe-listed', () => {
+    let config = {
+      safelist: [
+        {
+          pattern: /^bg-red-(400|500)(\/(40|50))?$/,
+        },
+      ],
+    }
 
     let context = createContext(resolveConfig(config))
     let classes = context.getClassList()