@@ -16,8 +23,11 @@ export default async function ArticlePage({ params, searchParams }) {
);
}
-export async function generateMetadata({ params, searchParams }) {
- const { article } = await getServersideArticle(params, searchParams);
+export async function generateMetadata({
+ params,
+ searchParams,
+}: ArticleViewProps) {
+ const { article } = await getServersideArticle({ params, searchParams });
return getSeoMetadata(article);
}
diff --git a/starters/nextjs-starter-approuter-ts/app/articles/page.tsx b/starters/nextjs-starter-approuter-ts/app/articles/page.tsx
index 3540856c..470bdde0 100644
--- a/starters/nextjs-starter-approuter-ts/app/articles/page.tsx
+++ b/starters/nextjs-starter-approuter-ts/app/articles/page.tsx
@@ -3,12 +3,12 @@ import ArticleList from "../../components/article-list";
import Layout from "../../components/layout";
import { PAGE_SIZE } from "../../constants";
-async function fetchNextPages(cursor: string) {
+async function fetchNextPages(cursor?: string | null | undefined) {
"use server";
const { data, cursor: newCursor } =
await PCCConvenienceFunctions.getPaginatedArticles({
pageSize: PAGE_SIZE,
- cursor,
+ cursor: cursor || undefined,
});
return {
data,
diff --git a/starters/nextjs-starter-approuter-ts/app/authors/[author]/page.tsx b/starters/nextjs-starter-approuter-ts/app/authors/[author]/page.tsx
index d8d2ae83..b996a1ed 100644
--- a/starters/nextjs-starter-approuter-ts/app/authors/[author]/page.tsx
+++ b/starters/nextjs-starter-approuter-ts/app/authors/[author]/page.tsx
@@ -12,8 +12,8 @@ import ArticleList from "../../../components/article-list";
import Layout from "../../../components/layout";
import { PAGE_SIZE } from "../../../constants";
-function fetchNextPages(author?: string) {
- return async (cursor: string) => {
+function fetchNextPages(author?: string | null | undefined) {
+ return async (cursor?: string | null | undefined) => {
"use server";
const { data, cursor: newCursor } =
await PCCConvenienceFunctions.getPaginatedArticles({
@@ -24,7 +24,7 @@ function fetchNextPages(author?: string) {
: {
author,
},
- cursor,
+ cursor: cursor || undefined,
});
return {
@@ -34,7 +34,11 @@ function fetchNextPages(author?: string) {
};
}
-export default async function ArticlesListTemplate({ params }) {
+export default async function ArticlesListTemplate({
+ params,
+}: {
+ params: { author: string };
+}) {
const author = params.author ? decodeURIComponent(params.author) : undefined;
const {
@@ -66,7 +70,10 @@ export default async function ArticlesListTemplate({ params }) {
totalCount={totalCount}
fetcher={fetchNextPages(author)}
additionalHeader={
-
+
{
const params = [{ uri: article.id }];
- if (article.metadata.slug) {
+ if (article.metadata?.slug) {
params.push({ uri: String(article.metadata.slug) });
}
return params;
diff --git a/starters/nextjs-starter-approuter-ts/app/examples/ssg-isr/page.tsx b/starters/nextjs-starter-approuter-ts/app/examples/ssg-isr/page.tsx
index 143f7ac8..7b1fe31f 100644
--- a/starters/nextjs-starter-approuter-ts/app/examples/ssg-isr/page.tsx
+++ b/starters/nextjs-starter-approuter-ts/app/examples/ssg-isr/page.tsx
@@ -9,12 +9,12 @@ export const metadata: Metadata = {
description: "Example of using SSG and ISR",
};
-async function fetchNextPages(cursor: string) {
+async function fetchNextPages(cursor?: string | null | undefined) {
"use server";
const { data, cursor: newCursor } =
await PCCConvenienceFunctions.getPaginatedArticles({
pageSize: PAGE_SIZE,
- cursor,
+ cursor: cursor || undefined,
});
return {
diff --git a/starters/nextjs-starter-approuter-ts/app/layout.tsx b/starters/nextjs-starter-approuter-ts/app/layout.tsx
index 8dc914ba..faefcbad 100644
--- a/starters/nextjs-starter-approuter-ts/app/layout.tsx
+++ b/starters/nextjs-starter-approuter-ts/app/layout.tsx
@@ -2,13 +2,14 @@ import { Poppins } from "next/font/google";
// import Script from "next/script";
import "../styles/globals.css";
+import { PropsWithChildren } from "react";
const poppins = Poppins({
subsets: ["latin"],
weight: ["400", "500", "700"],
});
-function MyApp({ children }) {
+function MyApp({ children }: PropsWithChildren) {
return (
diff --git a/starters/nextjs-starter-approuter-ts/app/search/page.tsx b/starters/nextjs-starter-approuter-ts/app/search/page.tsx
index 76236e7f..e50e7312 100644
--- a/starters/nextjs-starter-approuter-ts/app/search/page.tsx
+++ b/starters/nextjs-starter-approuter-ts/app/search/page.tsx
@@ -2,14 +2,20 @@ import { PCCConvenienceFunctions } from "@pantheon-systems/pcc-react-sdk/server"
import Layout from "../../components/layout";
import SearchResults from "./search-results";
-export default async function SearchPage({ searchParams }) {
+interface Props {
+ searchParams: { q?: string | null | undefined };
+}
+
+export default async function SearchPage({ searchParams }: Props) {
const searchResults = await PCCConvenienceFunctions.getAllArticlesWithSummary(
{
publishingLevel: "PRODUCTION",
},
- {
- bodyContains: searchParams.q,
- },
+ searchParams.q
+ ? {
+ bodyContains: searchParams.q,
+ }
+ : undefined,
true,
);
@@ -23,7 +29,7 @@ export default async function SearchPage({ searchParams }) {
);
}
-export function generateMetadata({ searchParams }) {
+export function generateMetadata({ searchParams }: Props) {
return {
title: `Search results for "${searchParams.q}"`,
description: `Search results for "${searchParams.q}"`,
diff --git a/starters/nextjs-starter-approuter-ts/app/search/search-results.tsx b/starters/nextjs-starter-approuter-ts/app/search/search-results.tsx
index c88e3cf9..3b536436 100644
--- a/starters/nextjs-starter-approuter-ts/app/search/search-results.tsx
+++ b/starters/nextjs-starter-approuter-ts/app/search/search-results.tsx
@@ -33,15 +33,15 @@ export default function SearchResults({
{isLoading ? (
{summary}
- )}
+ ) : null}
) : null}
- {isLoading || searchResults?.length > 0 ? (
+ {isLoading || (searchResults && searchResults.length > 0) ? (
(searchResults ?? Array.from({ length: 5 })).map((result, index) => (
) : (
diff --git a/starters/nextjs-starter-approuter-ts/components/header/search-bar.tsx b/starters/nextjs-starter-approuter-ts/components/header/search-bar.tsx
index fa41c255..cf28d52d 100644
--- a/starters/nextjs-starter-approuter-ts/components/header/search-bar.tsx
+++ b/starters/nextjs-starter-approuter-ts/components/header/search-bar.tsx
@@ -77,7 +77,7 @@ export default function SearchBar() {
function SearchBarForm({
defaultSearchQuery,
}: {
- defaultSearchQuery?: string;
+ defaultSearchQuery?: string | null | undefined;
}) {
const onSubmit: FormEventHandler = (e) => {
e.preventDefault();
@@ -96,7 +96,7 @@ function SearchBarForm({
>
;
+}) => {
return (
![]()
) => (
+ (Component: React.ComponentType) => (props: Record) => (
);
-export default SmartComponentErrorBoundary;
\ No newline at end of file
+export default SmartComponentErrorBoundary;
diff --git a/starters/nextjs-starter-ts/lib/utils.ts b/starters/nextjs-starter-ts/lib/utils.ts
index 1379565f..47404737 100644
--- a/starters/nextjs-starter-ts/lib/utils.ts
+++ b/starters/nextjs-starter-ts/lib/utils.ts
@@ -67,7 +67,7 @@ export function getSeoMetadata(article: ArticleWithoutContent) {
description,
openGraph: {
type: "website",
- title: article.title,
+ title: article.title || undefined,
images: imageProperties,
description,
article: {
diff --git a/starters/nextjs-starter-ts/package.json b/starters/nextjs-starter-ts/package.json
index 4eb5c161..6d0da273 100644
--- a/starters/nextjs-starter-ts/package.json
+++ b/starters/nextjs-starter-ts/package.json
@@ -38,7 +38,7 @@
"dotenv": "^16.4.5",
"react-icons": "^5.4.0",
"markdown-to-txt": "^2.0.1",
- "next": "^14.2.10",
+ "next": "^14.2.15",
"next-seo": "^5.15.0",
"query-string": "^8.2.0",
"react": "18.3.1",
@@ -63,7 +63,7 @@
"tailwindcss": "^3.4.1",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.5.4",
- "vite": "^5.1.8",
+ "vite": "^5.2.14",
"vitest": "^1.3.1",
"vitest-fetch-mock": "^0.2.2"
}
diff --git a/starters/nextjs-starter-ts/pages/_app.tsx b/starters/nextjs-starter-ts/pages/_app.tsx
index 6e2931af..adb920bd 100644
--- a/starters/nextjs-starter-ts/pages/_app.tsx
+++ b/starters/nextjs-starter-ts/pages/_app.tsx
@@ -2,13 +2,15 @@ import { Poppins } from "next/font/google";
// import Script from "next/script";
import "../styles/globals.css";
+import { AppProps } from "next/app";
+import React from "react";
const poppins = Poppins({
subsets: ["latin"],
weight: ["400", "500", "700"],
});
-function MyApp({ Component, pageProps }) {
+function MyApp({ Component, pageProps }: AppProps) {
return (
@@ -59,11 +59,11 @@ export default function SearchResults({
diff --git a/starters/nextjs-starter-approuter-ts/components/article-list.tsx b/starters/nextjs-starter-approuter-ts/components/article-list.tsx
index 542dd2e3..042d92a5 100644
--- a/starters/nextjs-starter-approuter-ts/components/article-list.tsx
+++ b/starters/nextjs-starter-approuter-ts/components/article-list.tsx
@@ -16,7 +16,7 @@ interface Props {
articles: PaginatedArticle[] | ArticleWithoutContent[];
totalCount: number;
cursor: string;
- fetcher: (cursor: string) => Promise<{
+ fetcher: (cursor?: string | null | undefined) => Promise<{
data: PaginatedArticle[] | ArticleWithoutContent[];
newCursor: string;
}>;
diff --git a/starters/nextjs-starter-approuter-ts/components/article-view.tsx b/starters/nextjs-starter-approuter-ts/components/article-view.tsx
index c95f836c..70ce0930 100644
--- a/starters/nextjs-starter-approuter-ts/components/article-view.tsx
+++ b/starters/nextjs-starter-approuter-ts/components/article-view.tsx
@@ -67,17 +67,21 @@ const ArticleHeader = ({
articleTitle: string;
seoMetadata: Metadata;
}) => {
+ const author = Array.isArray(seoMetadata.authors)
+ ? seoMetadata.authors[0]
+ : seoMetadata.authors;
+
return (
{isLoading ? (
{articleTitle}
- {seoMetadata.authors?.[0]?.name ? (
+ {author?.name ? (
<>
{article.title}
- {article.metadata?.["Description"] && (
+ {article.metadata?.["Description"] ? (
@@ -107,12 +107,18 @@ export function ArticleGridCard({
);
}
-function GridItemCoverImage({ imageSrc, imageAltText }) {
+function GridItemCoverImage({
+ imageSrc,
+ imageAltText,
+}: {
+ imageSrc: string | null;
+ imageAltText?: string | null | undefined;
+}) {
return imageSrc != null ? (
// eslint-disable-next-line @next/next/no-img-element
- {seoMetadata.authors?.[0]?.name}
-
+ {author?.name}
{article.metadata?.["Description"]?.toString() || ""}
- )} + ) : null}{title}
diff --git a/starters/nextjs-starter-approuter-ts/hooks/usePagination.ts b/starters/nextjs-starter-approuter-ts/hooks/usePagination.ts index 9a9f41f8..84b5c1f1 100644 --- a/starters/nextjs-starter-approuter-ts/hooks/usePagination.ts +++ b/starters/nextjs-starter-approuter-ts/hooks/usePagination.ts @@ -7,7 +7,7 @@ import { useEffect, useState } from "react"; interface Props { cursor?: string; initialArticles?: PaginatedArticle[] | ArticleWithoutContent[]; - fetcher: (cursor: string) => Promise<{ + fetcher: (cursor: string | null | undefined) => Promise<{ data: PaginatedArticle[] | ArticleWithoutContent[]; newCursor: string; }>; diff --git a/starters/nextjs-starter-approuter-ts/lib/utils.ts b/starters/nextjs-starter-approuter-ts/lib/utils.ts index dad3b900..d3b3a6ca 100644 --- a/starters/nextjs-starter-approuter-ts/lib/utils.ts +++ b/starters/nextjs-starter-approuter-ts/lib/utils.ts @@ -16,7 +16,17 @@ export function formatDate(input: string | number): string { }); } -export function getSeoMetadata(article: ArticleWithoutContent): Metadata { +export function getSeoMetadata( + article: ArticleWithoutContent | null, +): Metadata { + if (article == null) { + return { + openGraph: { + type: "website", + }, + }; + } + const tags: string[] = article.tags && article.tags.length > 0 ? article.tags : []; const imageProperties = [ @@ -53,7 +63,7 @@ export function getSeoMetadata(article: ArticleWithoutContent): Metadata { authors, openGraph: { type: "website", - title: article.title, + title: article.title || undefined, images: imageProperties, description, }, diff --git a/starters/nextjs-starter-approuter-ts/package.json b/starters/nextjs-starter-approuter-ts/package.json index 0f78d8db..22b0b170 100644 --- a/starters/nextjs-starter-approuter-ts/package.json +++ b/starters/nextjs-starter-approuter-ts/package.json @@ -36,7 +36,7 @@ "clsx": "^2.1.1", "dotenv": "^16.4.5", "markdown-to-txt": "^2.0.1", - "next": "^14.2.10", + "next": "^14.2.15", "query-string": "^8.2.0", "react": "18.3.1", "react-dom": "18.3.1", @@ -61,7 +61,7 @@ "tailwindcss": "^3.4.1", "tailwindcss-animate": "^1.0.7", "typescript": "^5.5.4", - "vite": "^5.1.8", + "vite": "^5.2.14", "vitest": "^1.3.1", "vitest-fetch-mock": "^0.2.2" } diff --git a/starters/nextjs-starter-approuter-ts/tsconfig.json b/starters/nextjs-starter-approuter-ts/tsconfig.json index c5f3cdff..7f1f45e5 100644 --- a/starters/nextjs-starter-approuter-ts/tsconfig.json +++ b/starters/nextjs-starter-approuter-ts/tsconfig.json @@ -8,7 +8,8 @@ ], "allowJs": true, "skipLibCheck": true, - "strict": false, + "strict": true, + "strictNullChecks": true, "forceConsistentCasingInFileNames": true, "noEmit": true, "incremental": true, diff --git a/starters/nextjs-starter-ts/components/article-view.tsx b/starters/nextjs-starter-ts/components/article-view.tsx index 4ad3d86f..f514853e 100644 --- a/starters/nextjs-starter-ts/components/article-view.tsx +++ b/starters/nextjs-starter-ts/components/article-view.tsx @@ -40,7 +40,15 @@ type ArticleViewProps = { onlyContent?: boolean; }; -const ArticleHeader = ({ article, articleTitle, seoMetadata }) => { +const ArticleHeader = ({ + article, + articleTitle, + seoMetadata, +}: { + article: Article; + articleTitle: string | null; + seoMetadata: ReturnType{articleTitle}
diff --git a/starters/nextjs-starter-ts/components/grid.tsx b/starters/nextjs-starter-ts/components/grid.tsx
index 4ea9f118..d1de8d1f 100644
--- a/starters/nextjs-starter-ts/components/grid.tsx
+++ b/starters/nextjs-starter-ts/components/grid.tsx
@@ -59,7 +59,7 @@ export function ArticleGridCard({
isWide = false,
}: ArticleGridCardProps) {
const targetHref = `${basePath}/${article.slug || article.id}`;
- const imageSrc = article.metadata?.["Hero Image"] || null;
+ const imageSrc = (article.metadata?.["Hero Image"] as string) || null;
return (
{article.title}
- {article.metadata?.["Description"] && (
+ {article.metadata?.["Description"] ? (
@@ -107,7 +107,13 @@ export function ArticleGridCard({
);
}
-function GridItemCoverImage({ imageSrc, imageAltText }) {
+function GridItemCoverImage({
+ imageSrc,
+ imageAltText,
+}: {
+ imageSrc: string | null | undefined;
+ imageAltText?: string | undefined;
+}) {
return imageSrc != null ? (
// eslint-disable-next-line @next/next/no-img-element
{article.metadata?.["Description"]?.toString() || ""}
- )} + ) : null}{title}
diff --git a/starters/nextjs-starter-ts/components/smart-components/error-boundary.tsx b/starters/nextjs-starter-ts/components/smart-components/error-boundary.tsx index 81ce4662..ea8ea8c9 100644 --- a/starters/nextjs-starter-ts/components/smart-components/error-boundary.tsx +++ b/starters/nextjs-starter-ts/components/smart-components/error-boundary.tsx @@ -36,10 +36,10 @@ const SmartComponentSuspenseErrorBoundary = ({ children }: Props) => { export const withSmartComponentErrorBoundary = // eslint-disable-next-line react/display-name - (Component: React.ComponentType) => (props: Record
{/* Google Analytics: Replace XXXXXXXXXX with your google analytics id and uncomment the following code. */}
diff --git a/starters/nextjs-starter-ts/pages/api/utils/oembed.ts b/starters/nextjs-starter-ts/pages/api/utils/oembed.ts
index a9938cd4..cf7e30e5 100644
--- a/starters/nextjs-starter-ts/pages/api/utils/oembed.ts
+++ b/starters/nextjs-starter-ts/pages/api/utils/oembed.ts
@@ -9,7 +9,7 @@ const oembedURLs = {
export default async function handler(
req: NextApiRequest,
- res: NextApiResponse
+ res: NextApiResponse,
) {
const url = req.query.url;
let type = req.query.type;
@@ -20,7 +20,7 @@ export default async function handler(
if (Array.isArray(type)) type = type[0];
- const oembedUrl = oembedURLs[type];
+ const oembedUrl = oembedURLs[type as keyof typeof oembedURLs];
if (!oembedUrl) {
res.status(404).json({ error: "Not found" });
@@ -29,7 +29,7 @@ export default async function handler(
const queryParams = { url };
const response = await fetch(
- `${oembedUrl}?${queryString.stringify(queryParams)}`
+ `${oembedUrl}?${queryString.stringify(queryParams)}`,
);
if (response.ok) {
diff --git a/starters/nextjs-starter-ts/pages/api/utils/paginate.ts b/starters/nextjs-starter-ts/pages/api/utils/paginate.ts
index 0993d310..5bc31550 100644
--- a/starters/nextjs-starter-ts/pages/api/utils/paginate.ts
+++ b/starters/nextjs-starter-ts/pages/api/utils/paginate.ts
@@ -5,7 +5,7 @@ export default async function handler(
req: NextApiRequest,
res: NextApiResponse,
) {
- let cursor: string;
+ let cursor: string | undefined;
if (Array.isArray(req.query.cursor)) cursor = req.query.cursor[0];
else cursor = req.query.cursor;
@@ -16,7 +16,7 @@ export default async function handler(
return res.status(400).json("Invalid pageSize");
}
- let author: string;
+ let author: string | null | undefined;
if (Array.isArray(req.query.author)) author = req.query.author[0];
else author = req.query.author;
diff --git a/starters/nextjs-starter-ts/pages/articles/[...uri].tsx b/starters/nextjs-starter-ts/pages/articles/[...uri].tsx
index 45a6531a..52e39b61 100644
--- a/starters/nextjs-starter-ts/pages/articles/[...uri].tsx
+++ b/starters/nextjs-starter-ts/pages/articles/[...uri].tsx
@@ -27,7 +27,7 @@ export default function ArticlePage({ article, grant }: ArticlePageProps) {
>
;
+ };
+ query: {
+ uri: string;
+ publishingLevel: "PRODUCTION" | "REALTIME" | undefined;
+ pccGrant: string;
+ };
}) {
const slugOrId = uri[uri.length - 1];
const grant = pccGrant || cookies["PCC-GRANT"] || null;
const article = await PCCConvenienceFunctions.getArticleBySlugOrId(
slugOrId,
- publishingLevel ? publishingLevel.toString().toUpperCase() : "PRODUCTION",
+ publishingLevel
+ ? (publishingLevel.toString().toUpperCase() as "PRODUCTION" | "REALTIME")
+ : "PRODUCTION",
);
if (!article) {
@@ -60,7 +71,8 @@ export async function getServerSideProps({
if (
article.slug?.trim().length &&
- article.slug.toLowerCase() !== slugOrId?.trim().toLowerCase()
+ article.slug.toLowerCase() !== slugOrId?.trim().toLowerCase() &&
+ pantheonAPIOptions.resolvePath != null
) {
// If the article was accessed by the id rather than the slug - then redirect to the canonical
// link (mostly for SEO purposes than anything else).
diff --git a/starters/nextjs-starter-ts/pages/articles/index.tsx b/starters/nextjs-starter-ts/pages/articles/index.tsx
index f848d056..0b407b65 100644
--- a/starters/nextjs-starter-ts/pages/articles/index.tsx
+++ b/starters/nextjs-starter-ts/pages/articles/index.tsx
@@ -1,4 +1,5 @@
import {
+ Article,
ArticleWithoutContent,
PCCConvenienceFunctions,
} from "@pantheon-systems/pcc-react-sdk";
@@ -11,7 +12,17 @@ import { usePagination } from "../../hooks/usePagination";
const PAGE_SIZE = 20;
-export default function ArticlesListTemplate({ articles, totalCount, cursor }) {
+interface Props {
+ articles: Article[];
+ totalCount: number;
+ cursor: string;
+}
+
+export default function ArticlesListTemplate({
+ articles,
+ totalCount,
+ cursor,
+}: Props) {
const {
data: currentArticles,
onPageChange,
diff --git a/starters/nextjs-starter-ts/pages/authors/[author].tsx b/starters/nextjs-starter-ts/pages/authors/[author].tsx
index b08a50e6..4c7fd3b2 100644
--- a/starters/nextjs-starter-ts/pages/authors/[author].tsx
+++ b/starters/nextjs-starter-ts/pages/authors/[author].tsx
@@ -1,4 +1,5 @@
import {
+ Article,
ArticleWithoutContent,
PCCConvenienceFunctions,
} from "@pantheon-systems/pcc-react-sdk";
@@ -24,6 +25,11 @@ export default function ArticlesListTemplate({
totalCount,
cursor,
author,
+}: {
+ articles: Article[];
+ totalCount: number;
+ cursor: string;
+ author?: string;
}) {
const {
data: currentArticles,
@@ -93,7 +99,11 @@ export default function ArticlesListTemplate({
);
}
-export async function getServerSideProps({ query: { author } }) {
+export async function getServerSideProps({
+ query: { author },
+}: {
+ query: { author: string };
+}) {
const {
data: articles,
totalCount,
diff --git a/starters/nextjs-starter-ts/pages/component-preview/[id].tsx b/starters/nextjs-starter-ts/pages/component-preview/[id].tsx
index 00b8e3f7..626eb19f 100644
--- a/starters/nextjs-starter-ts/pages/component-preview/[id].tsx
+++ b/starters/nextjs-starter-ts/pages/component-preview/[id].tsx
@@ -11,8 +11,11 @@ export default function SmartComponentPreview() {
? JSON.parse(Buffer.from(attrs, "base64").toString())
: {};
- const SmartComponent =
- clientSmartComponentMap[id?.toString()]?.reactComponent;
+ const SmartComponent = id
+ ? clientSmartComponentMap[
+ id.toString() as keyof typeof clientSmartComponentMap
+ ]?.reactComponent
+ : null;
return (
diff --git a/starters/nextjs-starter-ts/pages/examples/ssg-isr/[uri].tsx b/starters/nextjs-starter-ts/pages/examples/ssg-isr/[uri].tsx
index bccc4e94..ad755ae1 100644
--- a/starters/nextjs-starter-ts/pages/examples/ssg-isr/[uri].tsx
+++ b/starters/nextjs-starter-ts/pages/examples/ssg-isr/[uri].tsx
@@ -18,7 +18,7 @@ export default function ArticlePage({ article }: ArticlePageProps) {
return (
{data.summary}
+ {data?.summary || ""}
)}
) : null}
- {isLoading || data?.searchResults?.length > 0 ? (
+ {isLoading ||
+ (data?.searchResults != null && data.searchResults.length > 0) ? (
(data?.searchResults ?? Array.from({ length: 5 })).map(
(result, index) => (
@@ -87,11 +88,11 @@ export default function Search() {
diff --git a/starters/nextjs-starter-ts/tsconfig.json b/starters/nextjs-starter-ts/tsconfig.json
index a160b879..4987446c 100644
--- a/starters/nextjs-starter-ts/tsconfig.json
+++ b/starters/nextjs-starter-ts/tsconfig.json
@@ -8,7 +8,8 @@
],
"allowJs": true,
"skipLibCheck": true,
- "strict": false,
+ "strict": true,
+ "strictNullChecks": true,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"incremental": true,
diff --git a/starters/nextjs-starter/package.json b/starters/nextjs-starter/package.json
index 964f74b6..ac141d0d 100644
--- a/starters/nextjs-starter/package.json
+++ b/starters/nextjs-starter/package.json
@@ -36,7 +36,7 @@
"clsx": "^2.1.1",
"dotenv": "^16.4.5",
"markdown-to-txt": "^2.0.1",
- "next": "^14.2.10",
+ "next": "^14.2.15",
"next-seo": "^5.15.0",
"query-string": "^8.2.0",
"react": "18.3.1",
@@ -61,7 +61,7 @@
"tailwindcss": "^3.4.1",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.5.4",
- "vite": "^5.1.8",
+ "vite": "^5.2.14",
"vitest": "^1.3.1",
"vitest-fetch-mock": "^0.2.2"
}
diff --git a/starters/nextjs-starter/pages/component-preview/[id].tsx b/starters/nextjs-starter/pages/component-preview/[id].jsx
similarity index 85%
rename from starters/nextjs-starter/pages/component-preview/[id].tsx
rename to starters/nextjs-starter/pages/component-preview/[id].jsx
index 00b8e3f7..d4c81b4e 100644
--- a/starters/nextjs-starter/pages/component-preview/[id].tsx
+++ b/starters/nextjs-starter/pages/component-preview/[id].jsx
@@ -3,7 +3,6 @@ import { clientSmartComponentMap } from "../../components/smart-components";
export default function SmartComponentPreview() {
const router = useRouter();
-
const { id, attrs } = router.query;
const decodedAttrs =
@@ -11,8 +10,9 @@ export default function SmartComponentPreview() {
? JSON.parse(Buffer.from(attrs, "base64").toString())
: {};
- const SmartComponent =
- clientSmartComponentMap[id?.toString()]?.reactComponent;
+ const SmartComponent = id
+ ? clientSmartComponentMap[id.toString()]?.reactComponent
+ : null;
return (
{isLoading ? (
diff --git a/starters/nextjs-starter/tsconfig.json b/starters/nextjs-starter/tsconfig.json
index 6db37c02..105c03a3 100644
--- a/starters/nextjs-starter/tsconfig.json
+++ b/starters/nextjs-starter/tsconfig.json
@@ -8,7 +8,8 @@
],
"allowJs": true,
"skipLibCheck": true,
- "strict": false,
+ "strict": true,
+ "strictNullChecks": true,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"incremental": true,