remove unneeded types

codercatdev · codercatdev · commit a8ebd745c19e · 2023-04-13T10:37:22.000-04:00
diff --git a/apps/codingcatdev/src/routes/(content-list)/blog/+page.server.ts b/apps/codingcatdev/src/routes/(content-list)/blog/+page.server.ts
@@ -1,6 +1,6 @@
 import { listContent } from '$lib/server/content';
 import { ContentType } from '$lib/types';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.post;
 
@@ -9,4 +9,4 @@ export const load = (async () => {
 		contentType,
 		...(await listContent({ contentType }))
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-list)/courses/+page.server.ts b/apps/codingcatdev/src/routes/(content-list)/courses/+page.server.ts
@@ -1,6 +1,5 @@
 import { listContent } from '$lib/server/content';
 import { ContentType } from '$lib/types';
-import type { PageServerLoad } from './$types';
 
 const contentType = ContentType.course;
 
@@ -9,4 +8,4 @@ export const load = (async () => {
 		contentType,
 		...(await listContent({ contentType }))
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-list)/frameworks/+page.server.ts b/apps/codingcatdev/src/routes/(content-list)/frameworks/+page.server.ts
@@ -1,6 +1,5 @@
 import { listContent } from '$lib/server/content';
 import { ContentType } from '$lib/types';
-import type { PageServerLoad } from './$types';
 
 const contentType = ContentType.course;
 
@@ -9,4 +8,4 @@ export const load = (async () => {
 		contentType,
 		...(await listContent({ contentType }))
 	};
-}) satisfies PageServerLoad;
+})
diff --git a/apps/codingcatdev/src/routes/(content-list)/languages/+page.server.ts b/apps/codingcatdev/src/routes/(content-list)/languages/+page.server.ts
@@ -1,6 +1,5 @@
 import { listContent } from '$lib/server/content';
 import { ContentType } from '$lib/types';
-import type { PageServerLoad } from './$types';
 
 const contentType = ContentType.language;
 
@@ -9,4 +8,4 @@ export const load = (async () => {
 		contentType,
 		...(await listContent({ contentType }))
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-list)/podcasts/+page.server.ts b/apps/codingcatdev/src/routes/(content-list)/podcasts/+page.server.ts
@@ -1,6 +1,6 @@
 import { listContent } from '$lib/server/content';
 import { ContentType } from '$lib/types';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.podcast;
 
@@ -9,4 +9,4 @@ export const load = (async () => {
 		contentType,
 		...(await listContent({ contentType }))
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-list)/schedule/+page.server.ts b/apps/codingcatdev/src/routes/(content-list)/schedule/+page.server.ts
@@ -1,6 +1,6 @@
 import { listContent } from '$lib/server/content';
 import { ContentPublished, ContentType } from '$lib/types';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.podcast;
 
@@ -12,4 +12,4 @@ export const load = (async () => {
 			contentFilter: (c) => c.published === ContentPublished.draft
 		}))
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-list)/tutorials/+page.server.ts b/apps/codingcatdev/src/routes/(content-list)/tutorials/+page.server.ts
@@ -1,6 +1,6 @@
 import { listContent } from '$lib/server/content';
 import { ContentType } from '$lib/types';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.tutorial;
 
@@ -9,4 +9,4 @@ export const load = (async () => {
 		contentType,
 		...(await listContent({ contentType }))
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-list)/tutorials/+page.svelte b/apps/codingcatdev/src/routes/(content-list)/tutorials/+page.svelte
@@ -2,7 +2,6 @@
 	import ContentCards from '../ContentCards.svelte';
 	import { ContentType } from '$lib/types/index';
 
-	/** @type {import('./$types').PageData} */
 	export let data;
 </script>
 
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/+layout.server.ts b/apps/codingcatdev/src/routes/(content-single)/(non-course)/+layout.server.ts
@@ -1,6 +1,5 @@
 import { listContent } from '$lib/server/content';
 import { ContentType } from '$lib/types';
-import type { LayoutServerLoad } from './$types';
 
 export const load = (async () => {
     return {
@@ -9,4 +8,4 @@ export const load = (async () => {
         podcast: await (await listContent({ contentType: ContentType.podcast, limit: 3 })).content,
         post: await (await listContent({ contentType: ContentType.post, limit: 3 })).content
     };
-}) satisfies LayoutServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/+layout.svelte b/apps/codingcatdev/src/routes/(content-single)/(non-course)/+layout.svelte
@@ -3,8 +3,7 @@
 	import RecentPostsList from './RecentPostsList.svelte';
 	import { ContentType } from '$lib/types';
 
-	import type { LayoutData } from './$types';
-	export let data: LayoutData;
+	export let data;
 </script>
 
 <!-- App Shell -->
@@ -19,7 +18,7 @@
 		<!-- Div takes up same room as fixed -->
 		<div class="w-[19.5rem] xl:w-96" />
 		<div class="fixed top-[5.125rem] bottom-24 w-[19.5rem] xl:w-96 py-10 overflow-y-auto">
-			<div class="px-8 flex flex-col gap-2 md:gap-8">
+			<div class="flex flex-col gap-2 px-8 md:gap-8">
 				<TableOfContents target=".markdown" />
 				<RecentPostsList contentType={ContentType.course} list={data.course} />
 				<RecentPostsList contentType={ContentType.tutorial} list={data.tutorial} />
@@ -29,7 +28,7 @@
 		</div>
 	</svelte:fragment>
 	<svelte:fragment slot="bcu-app-shell-page-footer">
-		<div class="px-2 flex flex-col gap-2 md:gap-8">
+		<div class="flex flex-col gap-2 px-2 md:gap-8">
 			<RecentPostsList contentType={ContentType.course} list={data.course} />
 			<RecentPostsList contentType={ContentType.tutorial} list={data.tutorial} />
 			<RecentPostsList contentType={ContentType.podcast} list={data.podcast} />
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/framework/[slug]/+page.server.ts b/apps/codingcatdev/src/routes/(content-single)/(non-course)/framework/[slug]/+page.server.ts
@@ -1,7 +1,7 @@
 import { getContentBySlug } from '$lib/server/content';
 import { ContentType } from '$lib/types';
 import { error } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.framework;
 
@@ -16,4 +16,4 @@ export const load = (async ({ params }) => {
 		contentType,
 		content
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/framework/[slug]/+page.svelte b/apps/codingcatdev/src/routes/(content-single)/(non-course)/framework/[slug]/+page.svelte
@@ -1,6 +1,5 @@
 <script>
 	import Content from '../../Content.svelte';
-	/** @type {import('./$types').PageData} */
 	export let data;
 </script>
 
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/language/[slug]/+page.server.ts b/apps/codingcatdev/src/routes/(content-single)/(non-course)/language/[slug]/+page.server.ts
@@ -1,7 +1,7 @@
 import { getContentBySlug } from '$lib/server/content';
 import { ContentType } from '$lib/types';
 import { error } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.language;
 
@@ -16,4 +16,4 @@ export const load = (async ({ params }) => {
 		contentType,
 		content
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/language/[slug]/+page.svelte b/apps/codingcatdev/src/routes/(content-single)/(non-course)/language/[slug]/+page.svelte
@@ -1,6 +1,5 @@
 <script>
 	import Content from '../../Content.svelte';
-	/** @type {import('./$types').PageData} */
 	export let data;
 </script>
 
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/podcast/[slug]/+page.server.ts b/apps/codingcatdev/src/routes/(content-single)/(non-course)/podcast/[slug]/+page.server.ts
@@ -1,7 +1,7 @@
 import { getContentBySlug } from '$lib/server/content';
 import { ContentType } from '$lib/types';
 import { error } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.podcast;
 
@@ -16,4 +16,4 @@ export const load = (async ({ params }) => {
 		contentType,
 		content
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/podcast/[slug]/+page.svelte b/apps/codingcatdev/src/routes/(content-single)/(non-course)/podcast/[slug]/+page.svelte
@@ -1,6 +1,5 @@
 <script>
 	import Content from '../../Content.svelte';
-	/** @type {import('./$types').PageData} */
 	export let data;
 </script>
 
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/post/[slug]/+page.server.ts b/apps/codingcatdev/src/routes/(content-single)/(non-course)/post/[slug]/+page.server.ts
@@ -1,7 +1,7 @@
 import { getContentBySlug } from '$lib/server/content';
 import { ContentType } from '$lib/types';
 import { error } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.post;
 
@@ -16,4 +16,4 @@ export const load = (async ({ params }) => {
 		contentType,
 		content
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/post/[slug]/+page.svelte b/apps/codingcatdev/src/routes/(content-single)/(non-course)/post/[slug]/+page.svelte
@@ -1,6 +1,5 @@
 <script>
 	import Content from '../../Content.svelte';
-	/** @type {import('./$types').PageData} */
 	export let data;
 </script>
 
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/tutorial/[slug]/+page.server.ts b/apps/codingcatdev/src/routes/(content-single)/(non-course)/tutorial/[slug]/+page.server.ts
@@ -1,7 +1,7 @@
 import { getContentBySlug } from '$lib/server/content';
 import { ContentType } from '$lib/types';
 import { error } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.tutorial;
 
@@ -16,4 +16,4 @@ export const load = (async ({ params }) => {
 		contentType,
 		content
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-single)/(non-course)/tutorial/[slug]/+page.svelte b/apps/codingcatdev/src/routes/(content-single)/(non-course)/tutorial/[slug]/+page.svelte
@@ -1,6 +1,5 @@
 <script>
 	import Content from '../../Content.svelte';
-	/** @type {import('./$types').PageData} */
 	export let data;
 </script>
 
diff --git a/apps/codingcatdev/src/routes/(content-single)/course/[slug]/+layout.server.ts b/apps/codingcatdev/src/routes/(content-single)/course/[slug]/+layout.server.ts
@@ -1,7 +1,6 @@
 import { getContentBySlug } from '$lib/server/content';
 import { ContentType } from '$lib/types';
 import { error } from '@sveltejs/kit';
-import type { LayoutServerLoad } from './$types';
 
 const contentType = ContentType.course;
 
@@ -16,4 +15,4 @@ export const load = (async ({ params }) => {
         contentType,
         course
     };
-}) satisfies LayoutServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(content-single)/course/[slug]/+page.svelte b/apps/codingcatdev/src/routes/(content-single)/course/[slug]/+page.svelte
@@ -1,6 +1,5 @@
 <script>
 	import Course from './Course.svelte';
-	/** @type {import('./$types').PageData} */
 	export let data;
 </script>
 
diff --git a/apps/codingcatdev/src/routes/(content-single)/course/[slug]/lesson/[lessonSlug]/+layout.svelte b/apps/codingcatdev/src/routes/(content-single)/course/[slug]/lesson/[lessonSlug]/+layout.svelte
@@ -2,8 +2,7 @@
 	import { AppShell, TableOfContents } from '@codingcatdev/blackcatui';
 	import LessonList from './LessonList.svelte';
 
-	import type { LayoutData } from './$types';
-	export let data: LayoutData;
+	export let data;
 </script>
 
 <!-- App Shell -->
@@ -18,7 +17,7 @@
 		<!-- Div takes up same room as fixed -->
 		<div class="w-[19.5rem] xl:w-96" />
 		<div class="fixed top-[5.125rem] bottom-24 w-[19.5rem] xl:w-96 py-10 overflow-y-auto ">
-			<div class="px-8 flex flex-col gap-2 md:gap-8">
+			<div class="flex flex-col gap-2 px-8 md:gap-8">
 				<TableOfContents target=".markdown" />
 				{#if data?.course?.lesson && data?.course?.lesson.length > 0 && data?.course?.slug}
 					<LessonList courseSlug={data?.course?.slug} lesson={data.course.lesson} />
diff --git a/apps/codingcatdev/src/routes/(content-single)/course/[slug]/lesson/[lessonSlug]/+page.server.ts b/apps/codingcatdev/src/routes/(content-single)/course/[slug]/lesson/[lessonSlug]/+page.server.ts
@@ -1,7 +1,7 @@
 import { getLessonFromCourseSlug } from '$lib/server/content';
 import { ContentType } from '$lib/types';
 import { error } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
+
 
 const contentType = ContentType.lesson;
 
@@ -16,4 +16,4 @@ export const load = (async ({ params }) => {
 		contentType,
 		content
 	};
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/(protected)/+layout.server.ts b/apps/codingcatdev/src/routes/(protected)/+layout.server.ts
@@ -1,6 +1,5 @@
 import { db } from '$lib/server/firebase';
 import { redirect } from '@sveltejs/kit';
-import type { LayoutServerLoad } from './$types';
 
 export const load = (async ({ url, parent }) => {
     const data = await parent();
@@ -26,4 +25,4 @@ export const load = (async ({ url, parent }) => {
         products
     };
 
-}) satisfies LayoutServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/+layout.server.ts b/apps/codingcatdev/src/routes/+layout.server.ts
@@ -1,5 +1,4 @@
 import { ccdValidateSessionCookie, validateStripeRole } from '$lib/server/firebase';
-import type { LayoutServerLoad } from './$types';
 
 export const load = (async ({ cookies }) => {
 	try {
@@ -25,4 +24,4 @@ export const load = (async ({ cookies }) => {
 		return {
 		};
 	}
-}) satisfies LayoutServerLoad;
+});
diff --git a/apps/codingcatdev/src/routes/+layout.svelte b/apps/codingcatdev/src/routes/+layout.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-	import type { LayoutData } from './$types';
-	export let data: LayoutData;
+	export let data;
 
 	// Core
 	import { page } from '$app/stores';
diff --git a/apps/codingcatdev/src/routes/+page.svelte b/apps/codingcatdev/src/routes/+page.svelte
@@ -1,10 +1,5 @@
 <script>
 	import HomeHero from './(home-partials)/HomeHero.svelte';
-	// import HomeDetail from '$lib/components/home/HomeDetail.svelte';
-
-	// /** @type {import('./$types').PageData} */
-	// export let data;
 </script>
 
 <HomeHero />
-<!-- <HomeDetail {data} /> -->
diff --git a/apps/codingcatdev/src/routes/login/+page.server.ts b/apps/codingcatdev/src/routes/login/+page.server.ts
@@ -36,4 +36,4 @@ export const load = (async ({ parent, url }) => {
     return {
         redirectTo: url.searchParams.get('redirectTo') || ''
     }
-}) satisfies PageServerLoad;
+});
diff --git a/apps/codingcatdev/tsconfig.json b/apps/codingcatdev/tsconfig.json
@@ -8,7 +8,8 @@
 		"resolveJsonModule": true,
 		"skipLibCheck": true,
 		"sourceMap": true,
-		"strict": true
+		"strict": true,
+		"ignoreDeprecations": "5.0"
 	}
 	// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
 	//
