From 23bee4062aecc8935966ecfff030a32abd02cc47 Mon Sep 17 00:00:00 2001
From: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date: Wed, 14 Aug 2024 12:22:51 -0700
Subject: [PATCH 1/2] refactor: consolidate css imports into global.css

---
 src/pages/_app.tsx    | 3 ---
 src/styles/global.css | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index ac556371e80..ea6b04fcec3 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -6,10 +6,7 @@ import { AppPropsWithLayout } from "@/lib/types"
 
 import ThemeProvider from "@/components/ThemeProvider"
 
-import "@docsearch/css"
 import "@/styles/global.css"
-import "@/styles/fonts.css"
-import "@/styles/docsearch.css"
 
 import { BaseLayout } from "@/layouts/BaseLayout"
 
diff --git a/src/styles/global.css b/src/styles/global.css
index 34b40c21099..5cbe9d89d3b 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -2,6 +2,10 @@
 @tailwind components;
 @tailwind utilities;
 
+@import "@docsearch/css";
+@import "@/styles/fonts.css";
+@import "@/styles/docsearch.css";
+
 @layer base {
   :root {
     --font-inter: Inter, sans-serif;

From 9fb112db17500f2411f0fab9d9d9e6754f424c4b Mon Sep 17 00:00:00 2001
From: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date: Fri, 16 Aug 2024 14:51:10 -0400
Subject: [PATCH 2/2] revert: css eslint rule change

reserve only for .scss or .css pattern
---
 .eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 85d85445f59..29cb65525fb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -42,7 +42,7 @@
           // Other relative imports. Put same-folder imports and `.` last.
           ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
           // Style imports.
-          ["^.+s?css$"],
+          ["^.+\\.s?css$"],
           // Side effect imports.
           ["^\\u0000"]
         ]