Include .client/.server directories in Tailwind globs (remix-run#9758)

Co-authored-by: Mark Dalgleish <[email protected]>
xSyki · Jul 26, 2024 · 08731d9 · 08731d9
1 parent aef2a00
commit 08731d9
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 13 deletions.
diff --git a/contributors.yml b/contributors.yml
@@ -83,6 +83,7 @@
 - bogas04
 - BogdanDevBst
 - bolchowka
+- brettscott
 - brookslybrand
 - brophdawg11
 - bruno-oliveira

diff --git a/docs/styling/tailwind.md b/docs/styling/tailwind.md
@@ -32,7 +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}"],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },

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

diff --git a/integration/postcss-test.ts b/integration/postcss-test.ts
@@ -89,7 +89,7 @@ test.describe("PostCSS enabled", () => {
         `,
         "tailwind.config.js": js`
           export default {
-            content: ["./app/**/*.{ts,tsx,jsx,js}"],
+            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,7 +23,7 @@ function runTests(ext: typeof extensions[number]) {
   let tailwindConfig = ["mjs", "ts", "js"].includes(ext)
     ? js`
       export default {
-        content: ["./app/**/*.{ts,tsx,jsx,js}"],
+        content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
         theme: {
           spacing: {
             'test': ${JSON.stringify(TEST_PADDING_VALUE)}
@@ -33,7 +33,7 @@ function runTests(ext: typeof extensions[number]) {
     `
     : js`
       module.exports = {
-        content: ["./app/**/*.{ts,tsx,jsx,js}"],
+        content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
         theme: {
           spacing: {
             'test': ${JSON.stringify(TEST_PADDING_VALUE)}
@@ -364,7 +364,7 @@ test.describe("Tailwind disabled", () => {
       files: {
         "tailwind.config.js": js`
           module.exports = {
-            content: ["./app/**/*.{ts,tsx,jsx,js}"],
+            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,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ["./app/**/*.{ts,tsx,jsx,js}"],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },

diff --git a/templates/cloudflare-workers/tailwind.config.ts b/templates/cloudflare-workers/tailwind.config.ts
@@ -1,7 +1,7 @@
 import type { Config } from "tailwindcss";
 
 export default {
-  content: ["./app/**/*.{js,jsx,ts,tsx}"],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },

diff --git a/templates/cloudflare/tailwind.config.ts b/templates/cloudflare/tailwind.config.ts
@@ -1,7 +1,7 @@
 import type { Config } from "tailwindcss";
 
 export default {
-  content: ["./app/**/*.{js,jsx,ts,tsx}"],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },

diff --git a/templates/express/tailwind.config.ts b/templates/express/tailwind.config.ts
@@ -1,7 +1,7 @@
 import type { Config } from "tailwindcss";
 
 export default {
-  content: ["./app/**/*.{js,jsx,ts,tsx}"],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },

diff --git a/templates/remix-javascript/tailwind.config.js b/templates/remix-javascript/tailwind.config.js
@@ -1,5 +1,5 @@
 export default {
-  content: ["./app/**/*.{js,jsx,ts,tsx}"],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },

diff --git a/templates/remix/tailwind.config.ts b/templates/remix/tailwind.config.ts
@@ -1,7 +1,7 @@
 import type { Config } from "tailwindcss";
 
 export default {
-  content: ["./app/**/*.{js,jsx,ts,tsx}"],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },

diff --git a/templates/spa/tailwind.config.ts b/templates/spa/tailwind.config.ts
@@ -1,7 +1,7 @@
 import type { Config } from "tailwindcss";
 
 export default {
-  content: ["./app/**/*.{js,jsx,ts,tsx}"],
+  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
   theme: {
     extend: {},
   },