Merge pull request #948 from tszhong0411/app-32-fix-searchparams-type

Fix searchParams type
tszhong0411 · Jan 10, 2025 · 3955510 · 3955510
2 parents 4b62937 + bd9a5a8
commit 3955510
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 14 deletions.
diff --git a/apps/docs/src/app/(embed)/embed/page.tsx b/apps/docs/src/app/(embed)/embed/page.tsx
@@ -1,15 +1,17 @@
 import { getErrorMessage } from '@tszhong0411/utils'
 
 type PageProps = {
-  params: Promise<Record<string, never>>
-  searchParams: Promise<{
-    component: string
-  }>
+  params: Promise<Record<string, string | string[] | undefined>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 const Page = async (props: PageProps) => {
   const { component } = await props.searchParams
 
+  if (!component || typeof component !== 'string') {
+    return <div>Error: Invalid component name</div>
+  }
+
   try {
     const Component = (await import(`@/components/demos/${component}`)).default
 

diff --git a/apps/web/src/app/[locale]/(admin)/layout.tsx b/apps/web/src/app/[locale]/(admin)/layout.tsx
@@ -9,7 +9,7 @@ type LayoutProps = {
   params: Promise<{
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
   children: React.ReactNode
 }
 

diff --git a/apps/web/src/app/[locale]/(main)/about/page.tsx b/apps/web/src/app/[locale]/(main)/about/page.tsx
@@ -22,7 +22,7 @@ type PageProps = {
   params: Promise<{
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ locale: string }> => {

diff --git a/apps/web/src/app/[locale]/(main)/blog/[slug]/page.tsx b/apps/web/src/app/[locale]/(main)/blog/[slug]/page.tsx
@@ -25,7 +25,7 @@ type PageProps = {
     slug: string
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ slug: string; locale: string }> => {

diff --git a/apps/web/src/app/[locale]/(main)/blog/page.tsx b/apps/web/src/app/[locale]/(main)/blog/page.tsx
@@ -13,7 +13,7 @@ type PageProps = {
   params: Promise<{
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ locale: string }> => {

diff --git a/apps/web/src/app/[locale]/(main)/dashboard/page.tsx b/apps/web/src/app/[locale]/(main)/dashboard/page.tsx
@@ -14,7 +14,7 @@ type PageProps = {
   params: Promise<{
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ locale: string }> => {

diff --git a/apps/web/src/app/[locale]/(main)/guestbook/page.tsx b/apps/web/src/app/[locale]/(main)/guestbook/page.tsx
@@ -18,7 +18,7 @@ type PageProps = {
   params: Promise<{
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ locale: string }> => {

diff --git a/apps/web/src/app/[locale]/(main)/page.tsx b/apps/web/src/app/[locale]/(main)/page.tsx
@@ -24,7 +24,7 @@ type PageProps = {
   params: Promise<{
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ locale: string }> => {

diff --git a/apps/web/src/app/[locale]/(main)/projects/[slug]/page.tsx b/apps/web/src/app/[locale]/(main)/projects/[slug]/page.tsx
@@ -16,7 +16,7 @@ type PageProps = {
     slug: string
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ slug: string; locale: string }> => {

diff --git a/apps/web/src/app/[locale]/(main)/projects/page.tsx b/apps/web/src/app/[locale]/(main)/projects/page.tsx
@@ -13,7 +13,7 @@ type PageProps = {
   params: Promise<{
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ locale: string }> => {

diff --git a/apps/web/src/app/[locale]/(main)/uses/page.tsx b/apps/web/src/app/[locale]/(main)/uses/page.tsx
@@ -14,7 +14,7 @@ type PageProps = {
   params: Promise<{
     locale: string
   }>
-  searchParams: Promise<Record<string, never>>
+  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
 export const generateStaticParams = (): Array<{ locale: string }> => {