chore(console-fb): upgrade to sveltekit-superforms v2

xmlking · Feb 11, 2024 · 6a69a44 · 6a69a44
1 parent 6834bad
commit 6a69a44
Show file tree

Hide file tree

Showing 55 changed files with 294 additions and 368 deletions.
diff --git a/apps/console-fb/package.json b/apps/console-fb/package.json
@@ -98,15 +98,16 @@
 		"svelte-time-distance": "0.0.3",
 		"sveltekit-flash-message": "2.4.1",
 		"sveltekit-rate-limiter": "0.4.3",
-		"sveltekit-superforms": "1.13.4",
+		"sveltekit-superforms": "2.0.0",
 		"sveltekit-view-transition": "0.5.3",
 		"tailwind-merge": "2.2.1",
+		"tailwind-variants": "0.2.0",
 		"tailwindcss": "3.4.1",
 		"tailwindcss-animate": "1.0.7",
 		"tslib": "2.6.2",
 		"typescript": "5.3.3",
 		"vite": "5.1.1",
-		"vite-plugin-pwa": "0.18.0",
+		"vite-plugin-pwa": "0.18.1",
 		"vite-plugin-tailwind-purgecss": "0.2.0",
 		"vitest": "1.2.2",
 		"zod": "3.22.4"

diff --git a/apps/console-fb/src/lib/components/Debug.svelte b/apps/console-fb/src/lib/components/Debug.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Accordion, AccordionItem } from '@skeletonlabs/skeleton';
-	import SuperDebug from 'sveltekit-superforms/client/SuperDebug.svelte';
+	import SuperDebug from 'sveltekit-superforms';
 
 	export let data: any;
 	export let open = false;

diff --git a/apps/console-fb/src/lib/components/form/CheckboxFB.svelte b/apps/console-fb/src/lib/components/form/CheckboxFB.svelte
@@ -1,20 +1,17 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
 <script lang="ts">
 	import { Checkbox, Helper } from 'flowbite-svelte';
 	import type { Writable } from 'svelte/store';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
+	import type { FormPathLeaves, SuperForm } from 'sveltekit-superforms';
 	import { formFieldProxy } from 'sveltekit-superforms/client';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 
 	const { superform } = getFormContext();
 	const { path, value, errors, constraints } = formFieldProxy(superform, field);

diff --git a/apps/console-fb/src/lib/components/form/DateInput.svelte b/apps/console-fb/src/lib/components/form/DateInput.svelte
@@ -1,21 +1,17 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import type { Writable } from 'svelte/store';
-
 	import { FloatingLabelInput, Helper } from 'flowbite-svelte';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { dateProxy, formFieldProxy } from 'sveltekit-superforms/client';
+	import type { SuperForm, FormPathLeaves } from 'sveltekit-superforms';
+	import { dateProxy, formFieldProxy } from 'sveltekit-superforms';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 	export let label = '';
 	export let type: 'date' | 'datetime-local' = 'date';
 	export let size: 'small' | 'default' = 'default';

diff --git a/apps/console-fb/src/lib/components/form/DeleteForm.svelte b/apps/console-fb/src/lib/components/form/DeleteForm.svelte
@@ -22,7 +22,7 @@
 	import { fail } from '@sveltejs/kit';
 	import type { GraphQLError } from 'graphql';
 	import { redirect } from 'sveltekit-flash-message/server';
-	import { setError, setMessage, superValidate } from 'sveltekit-superforms/server';
+	import { setError, setMessage, superValidate } from 'sveltekit-superforms';
 
 	const log = new Logger('rule.action.server');
 

diff --git a/apps/console-fb/src/lib/components/form/FloatingTextInput.svelte b/apps/console-fb/src/lib/components/form/FloatingTextInput.svelte
@@ -1,20 +1,18 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { FloatingLabelInput, Helper } from 'flowbite-svelte';
-	import type { InputType } from 'flowbite-svelte/dist/types';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { InputType } from 'flowbite-svelte';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 	export let label = '';
 	export let type: InputType = 'text';
 	export let size: 'small' | 'default' = 'default';

diff --git a/apps/console-fb/src/lib/components/form/Form.svelte b/apps/console-fb/src/lib/components/form/Form.svelte
@@ -1,10 +1,9 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { Alert, Button, ButtonGroup, Modal, Spinner } from 'flowbite-svelte';
 	import {
 		AdjustmentsHorizontalOutline,
@@ -13,14 +12,13 @@
 	} from 'flowbite-svelte-icons';
 	import { setContext } from 'svelte';
 	import type { HTMLFormAttributes } from 'svelte/elements';
-	import type { ZodValidation } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
+	import type { SuperForm } from 'sveltekit-superforms';
 	import { page } from '$app/stores';
 	import { FORM_KEY } from './forms';
 	import type { FormContext } from './forms';
 	interface $$restProps extends HTMLFormAttributes {}
 
-	export let superform: SuperForm<ZodValidation<T>, unknown>;
+	export let superform: SuperForm<T, unknown>;
 	export let showButtons = true;
 	export let showAlerts = true;
 	export let submitButtonText = 'Submit';

diff --git a/apps/console-fb/src/lib/components/form/RadioFB.svelte b/apps/console-fb/src/lib/components/form/RadioFB.svelte
@@ -1,21 +1,20 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { ButtonGroup, RadioButton, Helper, Label } from 'flowbite-svelte';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import generateId from '$lib/utils/generateId';
 	import { getFormContext } from './forms';
 	import type { RadioOptionType } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
+
 	export let label = '';
 	export let labelClasses = '';
 	export let items: RadioOptionType[] = [];

diff --git a/apps/console-fb/src/lib/components/form/RangeFB.svelte b/apps/console-fb/src/lib/components/form/RangeFB.svelte
@@ -1,19 +1,17 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { Helper, Label, Range } from 'flowbite-svelte';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 	const { superform } = getFormContext();
 	const { path, value, errors, constraints } = formFieldProxy(superform, field);
 </script>

diff --git a/apps/console-fb/src/lib/components/form/Select.svelte b/apps/console-fb/src/lib/components/form/Select.svelte
@@ -1,23 +1,21 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { Helper, Label } from 'flowbite-svelte';
-	import type { SelectOptionType } from 'flowbite-svelte/dist/types';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { SelectOptionType } from 'flowbite-svelte';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 	export let label = '';
 	export let labelClasses = '';
-	export let items: SelectOptionType[] = [];
+	export let items: SelectOptionType<any>[] = [];
 
 	const { superform } = getFormContext();
 	const { path, value, errors, constraints } = formFieldProxy(superform, field);

diff --git a/apps/console-fb/src/lib/components/form/SelectFB.svelte b/apps/console-fb/src/lib/components/form/SelectFB.svelte
@@ -1,24 +1,22 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { Helper, Label, Select } from 'flowbite-svelte';
-	import type { SelectOptionType } from 'flowbite-svelte/dist/types';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { SelectOptionType } from 'flowbite-svelte';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import { getFormContext } from './forms';
 
 	// eslint-disable-next-line no-undef
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 	export let label = '';
 	export let labelClasses = '';
-	export let items: SelectOptionType[] = [];
+	export let items: SelectOptionType<any>[] = [];
 
 	const { superform } = getFormContext();
 	const { path, value, errors, constraints } = formFieldProxy(superform, field);

diff --git a/apps/console-fb/src/lib/components/form/TagsInput.svelte b/apps/console-fb/src/lib/components/form/TagsInput.svelte
@@ -1,20 +1,18 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { Helper } from 'flowbite-svelte';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import { Tags } from '$lib/components';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 	export let label = '';
 	export let disabled = false;
 

diff --git a/apps/console-fb/src/lib/components/form/TextInput.svelte b/apps/console-fb/src/lib/components/form/TextInput.svelte
@@ -1,20 +1,17 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<script lang="ts">
 	import { Helper, Input, Label } from 'flowbite-svelte';
-	import type { InputType } from 'flowbite-svelte/dist/types';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { InputType } from 'flowbite-svelte';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 	export let label = '';
 	export let type: InputType = 'text';
 

diff --git a/apps/console-fb/src/lib/components/form/Textarea.svelte b/apps/console-fb/src/lib/components/form/Textarea.svelte
@@ -1,19 +1,17 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { Helper, Label, Textarea } from 'flowbite-svelte';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 	export let label = '';
 
 	const { superform } = getFormContext();

diff --git a/apps/console-fb/src/lib/components/form/ToggleFB.svelte b/apps/console-fb/src/lib/components/form/ToggleFB.svelte
@@ -1,20 +1,18 @@
 <script lang="ts" context="module">
-	// https://superforms.rocks/components#using-a-formfieldproxy
-	import type { AnyZodObject } from 'zod';
-	type T = AnyZodObject;
+	type T = Record<string, unknown>;
 </script>
 
-<script lang="ts" generics="T extends AnyZodObject">
+<!-- <script lang="ts" generics="T extends Record<string, unknown>"> -->
+<script lang="ts">
 	import { Toggle, Helper } from 'flowbite-svelte';
 	import type { Writable } from 'svelte/store';
-	import type { z } from 'zod';
-	import type { ZodValidation, FormPathLeaves } from 'sveltekit-superforms';
-	import type { SuperForm } from 'sveltekit-superforms/client';
-	import { formFieldProxy } from 'sveltekit-superforms/client';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import type { SuperForm } from 'sveltekit-superforms';
+	import { formFieldProxy } from 'sveltekit-superforms';
 	import { getFormContext } from './forms';
 
-	export let form: SuperForm<ZodValidation<T>, unknown>;
-	export let field: FormPathLeaves<z.infer<T>>;
+	export let form: SuperForm<T, unknown>;
+	export let field: FormPathLeaves<T>;
 
 	const { superform } = getFormContext();
 	const { path, value, errors, constraints } = formFieldProxy(superform, field);