From c87c6cf915079f39c2c494c92649262d0d75bbd1 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Sun, 3 Nov 2024 10:49:36 -0800 Subject: [PATCH] ensure tailwind config evaluates properly + update textarea -> input --- web/package-lock.json | 17 +---------------- .../pages/DynamicConnectorCreationForm.tsx | 1 - web/tailwind.config.js | 17 +++++++---------- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index 2c72891b7cb..2b02ef81659 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -14851,21 +14851,6 @@ "type": "github", "url": "https://github.com/sponsors/wooorm" } - }, - "node_modules/@next/swc-win32-ia32-msvc": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz", - "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } } } -} \ No newline at end of file +} diff --git a/web/src/app/admin/connectors/[connector]/pages/DynamicConnectorCreationForm.tsx b/web/src/app/admin/connectors/[connector]/pages/DynamicConnectorCreationForm.tsx index a6ac93441e6..dc7f75e0632 100644 --- 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 = ({ type={field.type} label={label} name={field.name} - isTextArea={true} /> )} diff --git a/web/tailwind.config.js b/web/tailwind.config.js index 4917e66c6ff..8d5c2f72704 100644 --- 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;