ensure tailwind config evaluates properly + update textarea -> input

onyx-dot-app · Nov 3, 2024 · c87c6cf · c87c6cf
1 parent 2bdfdb9
commit c87c6cf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 27 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/src/app/admin/connectors/[connector]/pages/DynamicConnectorCreationForm.tsx b/web/src/app/admin/connectors/[connector]/pages/DynamicConnectorCreationForm.tsx
@@ -104,7 +104,6 @@ const RenderField: FC<RenderFieldProps> = ({
           type={field.type}
           label={label}
           name={field.name}
-          isTextArea={true}
         />
       )}
     </>

diff --git a/web/tailwind.config.js b/web/tailwind.config.js
@@ -3,16 +3,13 @@ var merge = require("lodash/merge");
 // Use relative paths for imports
 const baseThemes = require("./tailwind-themes/tailwind.config.js");
 
-let customThemes = null;
-try {
-  if (process.env.NEXT_PUBLIC_THEME) {
-    customThemes = require(
-      `./tailwind-themes/custom/${process.env.NEXT_PUBLIC_THEME}/tailwind.config.js`
-    );
-  }
-} catch (error) {
-  console.warn(`Custom theme not found for: ${process.env.NEXT_PUBLIC_THEME}`);
-}
+const customThemes = process.env.NEXT_PUBLIC_THEME
+  ? require(
+      process.env.NEXT_PUBLIC_THEME
+        ? `./tailwind-themes/custom/${process.env.NEXT_PUBLIC_THEME}/tailwind.config.js`
+        : "./tailwind-themes/custom/default/tailwind.config.js"
+    )
+  : null;
 
 /** @type {import('tailwindcss').Config} */
 module.exports = customThemes ? merge(baseThemes, customThemes) : baseThemes;