update old config structure to new structure

Author: RobinMalfait

integrations/tailwindcss-cli/tests/integration.test.js

@@ -34,9 +34,9 @@ describe('static build', () => {
       javascript`
         module.exports = {
           content: {
-            content: ['./src/index.html'],
-            safelist: ['bg-red-500','bg-red-600']
+            files: ['./src/index.html'],
           },
+          safelist: ['bg-red-500','bg-red-600'],
           theme: {
             extend: {
             },

integrations/webpack-5/tests/integration.test.js

@@ -230,9 +230,9 @@ describe.each([{ TAILWIND_MODE: 'watch' }, { TAILWIND_MODE: undefined }])('watch
       javascript`
         module.exports = {
           content: {
-            content: ['./src/index.html'],
-            safelist: ['bg-red-500','bg-red-600']
+            files: ['./src/index.html'],
           },
+          safelist: ['bg-red-500','bg-red-600'],
           theme: {
             extend: {
             },

tests/color-opacity-modifiers.test.js

@@ -62,12 +62,7 @@ test('missing alpha generates nothing', async () => {
 
 test('arbitrary color with opacity from scale', async () => {
   let config = {
-    mode: 'jit',
-    purge: [
-      {
-        raw: 'bg-[wheat]/50',
-      },
-    ],
+    content: [{ raw: 'bg-[wheat]/50' }],
     theme: {},
     plugins: [],
   }
@@ -85,12 +80,7 @@ test('arbitrary color with opacity from scale', async () => {
 
 test('arbitrary color with arbitrary opacity', async () => {
   let config = {
-    mode: 'jit',
-    purge: [
-      {
-        raw: 'bg-[#bada55]/[0.2]',
-      },
-    ],
+    content: [{ raw: 'bg-[#bada55]/[0.2]' }],
     theme: {},
     plugins: [],
   }
@@ -108,12 +98,7 @@ test('arbitrary color with arbitrary opacity', async () => {
 
 test('undefined theme color with opacity from scale', async () => {
   let config = {
-    mode: 'jit',
-    purge: [
-      {
-        raw: 'bg-garbage/50',
-      },
-    ],
+    content: [{ raw: 'bg-garbage/50' }],
     theme: {},
     plugins: [],
   }

tests/custom-extractors.test.js

@@ -41,13 +41,26 @@ describe('modern', () => {
       expect(result.css).toMatchFormattedCss(expected)
     })
   })
+
+  test('extract function', () => {
+    let config = {
+      content: {
+        files: [path.resolve(__dirname, './custom-extractors.test.html')],
+        extract: customExtractor,
+      },
+    }
+
+    return run('@tailwind utilities', config).then((result) => {
+      expect(result.css).toMatchFormattedCss(expected)
+    })
+  })
 })
 
 describe('legacy', () => {
   test('defaultExtractor', () => {
     let config = {
       content: {
-        content: [path.resolve(__dirname, './custom-extractors.test.html')],
+        files: [path.resolve(__dirname, './custom-extractors.test.html')],
         options: {
           defaultExtractor: customExtractor,
         },
@@ -62,7 +75,7 @@ describe('legacy', () => {
   test('extractors array', () => {
     let config = {
       content: {
-        content: [path.resolve(__dirname, './custom-extractors.test.html')],
+        files: [path.resolve(__dirname, './custom-extractors.test.html')],
         options: {
           extractors: [
             {
@@ -78,17 +91,4 @@ describe('legacy', () => {
       expect(result.css).toMatchFormattedCss(expected)
     })
   })
-
-  test('extract function', () => {
-    let config = {
-      content: {
-        content: [path.resolve(__dirname, './custom-extractors.test.html')],
-        extract: customExtractor,
-      },
-    }
-
-    return run('@tailwind utilities', config).then((result) => {
-      expect(result.css).toMatchFormattedCss(expected)
-    })
-  })
 })

tests/custom-transformers.test.js

@@ -7,7 +7,7 @@ function customTransformer(content) {
 test('transform function', () => {
   let config = {
     content: {
-      content: [{ raw: html`<div class="uppercase"></div>` }],
+      files: [{ raw: html`<div class="uppercase"></div>` }],
       transform: customTransformer,
     },
   }
@@ -24,7 +24,7 @@ test('transform function', () => {
 test('transform.DEFAULT', () => {
   let config = {
     content: {
-      content: [{ raw: html`<div class="uppercase"></div>` }],
+      files: [{ raw: html`<div class="uppercase"></div>` }],
       transform: {
         DEFAULT: customTransformer,
       },
@@ -43,7 +43,7 @@ test('transform.DEFAULT', () => {
 test('transform.{extension}', () => {
   let config = {
     content: {
-      content: [
+      files: [
         { raw: html`<div class="uppercase"></div>`, extension: 'html' },
         { raw: html`<div class="uppercase"></div>`, extension: 'php' },
       ],

tests/raw-content.test.js

@@ -29,19 +29,14 @@ test('raw content with extension', () => {
   let tailwind = require('../src')
   let config = {
     content: {
-      content: [
+      files: [
         {
           raw: fs.readFileSync(path.resolve(__dirname, './raw-content.test.html'), 'utf8'),
           extension: 'html',
         },
       ],
-      options: {
-        extractors: [
-          {
-            extractor: () => ['invisible'],
-            extensions: ['html'],
-          },
-        ],
+      extract: {
+        html: () => ['invisible'],
       },
     },
     corePlugins: { preflight: false },