From 644dbe431a52a4c73e40fc8dcfc7793591f04cb8 Mon Sep 17 00:00:00 2001
From: brian <contact@noimbrian.com>
Date: Tue, 11 Feb 2025 11:27:57 -0600
Subject: [PATCH] format, merge conflicts

---
 .../source-config/SourceConfigFormField.svelte | 18 +++++++-----------
 pnpm-lock.yaml                                 |  6 +++---
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/ui/core-components/src/lib/organisms/source-config/SourceConfigFormField.svelte b/packages/ui/core-components/src/lib/organisms/source-config/SourceConfigFormField.svelte
index 8069a69cff..be6bff83de 100644
--- a/packages/ui/core-components/src/lib/organisms/source-config/SourceConfigFormField.svelte
+++ b/packages/ui/core-components/src/lib/organisms/source-config/SourceConfigFormField.svelte
@@ -149,8 +149,8 @@
 
 	$: fieldDisabled = disabled || spec.forceReference || (spec.references && refVal !== null);
 
-
-	const inputClasses = "rounded-md border border-base-300 bg-base-100 shadow-sm px-2 py-1 text-sm focus-visible:ring-base-300 flex h-9 w-full transition-colors focus-visible:outline-none focus-visible:ring-1 p-1 ml-auto align-middle"
+	const inputClasses =
+		'rounded-md border border-base-300 bg-base-100 shadow-sm px-2 py-1 text-sm focus-visible:ring-base-300 flex h-9 w-full transition-colors focus-visible:outline-none focus-visible:ring-1 p-1 ml-auto align-middle';
 </script>
 
 <div class="w-full mb-2">
@@ -164,7 +164,7 @@
 		{#if spec.type === 'string'}
 			{#if spec.secret && !reveal && spec.shown !== true}
 				<input
-					class="{inputClasses}"
+					class={inputClasses}
 					disabled={fieldDisabled}
 					required={spec.required}
 					type="password"
@@ -172,7 +172,7 @@
 				/>
 			{:else}
 				<input
-					class="{inputClasses}"
+					class={inputClasses}
 					disabled={fieldDisabled}
 					required={spec.required}
 					type="text"
@@ -184,18 +184,14 @@
 			></textarea>
 		{:else if spec.type === 'number'}
 			<input
-				class="{inputClasses}"
+				class={inputClasses}
 				disabled={fieldDisabled}
 				required={spec.required}
 				type="number"
 				bind:value={fieldValue}
 			/>
 		{:else if spec.type === 'select' && Array.isArray(spec.options)}
-			<select
-				disabled={fieldDisabled}
-				bind:value={fieldValue}
-				class="{inputClasses}"
-			>
+			<select disabled={fieldDisabled} bind:value={fieldValue} class={inputClasses}>
 				<option disabled={spec.required} value={undefined} />
 				{#each spec.options as option}
 					{#if typeof option === 'string'}
@@ -236,4 +232,4 @@
 			/>
 		</div>
 	{/if}
-</div>
\ No newline at end of file
+</div>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a09d8e2122..20f077fe8a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2725,7 +2725,7 @@ packages:
       '@azure/core-tracing': 1.2.0
       '@azure/core-util': 1.11.0
       '@azure/logger': 1.1.4
-      '@azure/msal-browser': 4.2.0
+      '@azure/msal-browser': 4.2.1
       '@azure/msal-node': 2.16.2
       events: 3.3.0
       jws: 4.0.0
@@ -2775,8 +2775,8 @@ packages:
     dependencies:
       tslib: 2.8.1
 
-  /@azure/msal-browser@4.2.0:
-    resolution: {integrity: sha512-MXQjgAgjg/2VRKV+UPWHESoZPcue2ZvWKfpBLCyTUyixP+mhCl0q5D1+xDiwBGV3lru2poKZVZDQAOE40wKmWg==}
+  /@azure/msal-browser@4.2.1:
+    resolution: {integrity: sha512-pJX+HNVxEEvxqj3xvnFKMi/Yb6jadwOWN2QkDagj2GV2XXxJg3qq5zkE+czVw6Cmf4QiXxct+J0WF23sE8vZyA==}
     engines: {node: '>=0.8.0'}
     dependencies:
       '@azure/msal-common': 15.1.1