From 36131ae88eba2300619ea9906155fed2c5388286 Mon Sep 17 00:00:00 2001
From: WarningImHack3r <43064022+WarningImHack3r@users.noreply.github.com>
Date: Mon, 30 Sep 2024 20:38:11 +0200
Subject: [PATCH] Improve code, fix build

---
 package.json                     | 3 +--
 src/lib/elements/button/index.ts | 3 ++-
 src/routes/+layout.svelte        | 5 ++---
 src/routes/+layout.ts            | 6 +++++-
 src/routes/contact/+page.svelte  | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 5888284c..59acab10 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,5 @@
 		"typescript-eslint": "^8.8.0",
 		"vite": "^5.4.8"
 	},
-	"type": "module",
-	"packageManager": "pnpm@9.11.0+sha512.0a203ffaed5a3f63242cd064c8fb5892366c103e328079318f78062f24ea8c9d50bc6a47aa3567cabefd824d170e78fa2745ed1f16b132e16436146b7688f19b"
+	"type": "module"
 }
diff --git a/src/lib/elements/button/index.ts b/src/lib/elements/button/index.ts
index f79f4312..11be138b 100644
--- a/src/lib/elements/button/index.ts
+++ b/src/lib/elements/button/index.ts
@@ -1,3 +1,4 @@
-export { default } from "./Button.svelte";
+import Button from "./Button.svelte";
 
+export default Button;
 export * from "./types";
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 49c310f6..409eb4f6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import "../app.css";
-	import type { LayoutData } from "./$types";
 	import { afterNavigate, beforeNavigate, goto } from "$app/navigation";
 	import { page } from "$app/stores";
 	import ArrowUp from "@inqling/svelte-icons/heroicon-24-solid/arrow-up.svelte";
@@ -22,7 +21,7 @@
 	}
 
 	// Meta tags
-	export let data: LayoutData;
+	export let data;
 	let metadata: MetaTagsProps;
 	$: metadata = extend(true, {}, data.baseMetaTags, {
 		title: $page.data.pageTitle,
@@ -33,7 +32,7 @@
 		}
 	});
 	let schemas: JsonLdProps["schema"] = [];
-	$: schemas = [...(data.baseSchemas ?? []), ...($page.data.pageSchemas ?? [])].filter(Boolean);
+	$: schemas = [...data.baseSchemas, ...($page.data.pageSchemas ?? [])];
 
 	// Inlang
 	onSetLanguageTag(() => {
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 86c2dac0..d88986bc 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -13,7 +13,11 @@ import * as m from "$paraglide/messages";
 export const prerender = true;
 
 export const load: LayoutLoad = ({ route, url }) => {
-	if (!browser) return;
+	if (!browser) {
+		return {
+			baseSchemas: []
+		};
+	}
 
 	function conditionallyRedirectTo(
 		lang: (typeof availableLanguageTags)[number] = sourceLanguageTag
diff --git a/src/routes/contact/+page.svelte b/src/routes/contact/+page.svelte
index 3cb2f2d9..95b87964 100644
--- a/src/routes/contact/+page.svelte
+++ b/src/routes/contact/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { PageData, Snapshot } from "./$types";
+	import type { Snapshot } from "./$types";
 	import Check from "@inqling/svelte-icons/heroicon-24-outline/check.svelte";
 	import PaperAirplane from "@inqling/svelte-icons/heroicon-24-outline/paper-airplane.svelte";
 	import Phone from "@inqling/svelte-icons/heroicon-24-outline/phone.svelte";
@@ -8,7 +8,7 @@
 	import Section from "$layouts/Section.svelte";
 	import Button from "$elements/button";
 
-	export let data: PageData;
+	export let data;
 
 	export const snapshot: Snapshot<typeof formValues> = {
 		capture: () => formValues,