Update remaining Tailwind globs

remix-run · Jul 26, 2024 · 90e048d · 90e048d
1 parent cb42b0d
commit 90e048d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 28 deletions.
diff --git a/docs/styling/tailwind.md b/docs/styling/tailwind.md
@@ -32,10 +32,7 @@ Now we can tell it which files to generate classes from:
 import type { Config } from "tailwindcss";
 
 export default {
-  content: [
-    "./app/**/*.{js,jsx,ts,tsx}",
-    "./app/**/.client/**/*.{js,jsx,ts,tsx}",
-  ],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },

diff --git a/integration/hmr-test.ts b/integration/hmr-test.ts
@@ -25,10 +25,7 @@ let files = {
   "tailwind.config.js": js`
       /** @type {import('tailwindcss').Config} */
       export default {
-        content: [
-          "./app/**/*.{ts,tsx,jsx,js}",
-          "./app/**/.client/**/*.{js,jsx,ts,tsx}",
-        ],
+        content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
         theme: {
           extend: {},
         },

diff --git a/integration/postcss-test.ts b/integration/postcss-test.ts
@@ -89,10 +89,7 @@ test.describe("PostCSS enabled", () => {
         `,
         "tailwind.config.js": js`
           export default {
-            content: [
-              "./app/**/*.{ts,tsx,jsx,js}",
-              "./app/**/.client/**/*.{js,jsx,ts,tsx}",              
-            ],
+            content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
             theme: {
               spacing: {
                 'test': ${JSON.stringify(TEST_PADDING_VALUE)}

diff --git a/integration/tailwind-test.ts b/integration/tailwind-test.ts
@@ -23,10 +23,7 @@ function runTests(ext: typeof extensions[number]) {
   let tailwindConfig = ["mjs", "ts", "js"].includes(ext)
     ? js`
       export default {
-        content: [
-          "./app/**/*.{ts,tsx,jsx,js}",
-          "./app/**/.client/**/*.{js,jsx,ts,tsx}",          
-        ],
+        content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
         theme: {
           spacing: {
             'test': ${JSON.stringify(TEST_PADDING_VALUE)}
@@ -36,10 +33,7 @@ function runTests(ext: typeof extensions[number]) {
     `
     : js`
       module.exports = {
-        content: [
-          "./app/**/*.{ts,tsx,jsx,js}",
-          "./app/**/.client/**/*.{js,jsx,ts,tsx}",
-        ],
+        content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
         theme: {
           spacing: {
             'test': ${JSON.stringify(TEST_PADDING_VALUE)}
@@ -370,10 +364,7 @@ test.describe("Tailwind disabled", () => {
       files: {
         "tailwind.config.js": js`
           module.exports = {
-            content: [
-              "./app/**/*.{ts,tsx,jsx,js}",
-              "./app/**/.client/**/*.{js,jsx,ts,tsx}",
-            ],
+            content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
             theme: {
               spacing: {
                 'test': ${JSON.stringify(TEST_PADDING_VALUE)}

diff --git a/scripts/playground/template/tailwind.config.js b/scripts/playground/template/tailwind.config.js
@@ -1,9 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: [
-    "./app/**/*.{ts,tsx,jsx,js}",
-    "./app/**/.client/**/*.{js,jsx,ts,tsx}",    
-  ],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },