fix: merge conflict

.prettierignore

@@ -3,3 +3,4 @@ node_modules
 .next
 build
 .contentlayer
+pnpm-lock.yaml

README.md

@@ -1,6 +1,6 @@
 # [Skateshop](https://skateshop.sadmn.com/)
 
-This is an open source e-commerce skateshop build with everything new in Next.js 13. It is bootstrapped with `create-t3-app`.
+This is an open source e-commerce skateshop build with everything new in Next.js 14. It is bootstrapped with `create-t3-app`.
 
 [![Skateshop](./public/images/screenshot.png)](https://skateshop.sadmn.com/)
 

contentlayer.config.ts

@@ -7,6 +7,7 @@ import rehypeAutolinkHeadings from "rehype-autolink-headings"
 import rehypeCodeTitles from "rehype-code-titles"
 import rehypePrettyCode from "rehype-pretty-code"
 import rehypeSlug from "rehype-slug"
+import remarkGfm from "remark-gfm"
 
 const computedFields: ComputedFields = {
   slug: {
@@ -111,6 +112,7 @@ export default makeSource({
   contentDirPath: "./src/content",
   documentTypes: [Post, Author, Page],
   mdx: {
+    remarkPlugins: [remarkGfm],
     rehypePlugins: [
       [
         // @ts-expect-error rehype-pretty-code has no types
@@ -120,9 +122,6 @@ export default makeSource({
             dark: "one-dark-pro",
             light: "github-light",
           },
-          defaultLang: {
-            block: "typescript",
-          },
         },
       ],
       rehypeAutolinkHeadings,

package.json

@@ -121,7 +121,6 @@
     "rehype-code-titles": "^1.2.0",
     "rehype-pretty-code": "^0.13.0",
     "rehype-slug": "^6.0.0",
-    "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0",
     "tailwindcss": "^3.4.1",
     "tsx": "^4.7.1",

src/app/(experimental)/ai/_components/chat-message.tsx

@@ -32,6 +32,7 @@ export function ChatMessage({ message }: ChatMessageProps) {
       <div className="ml-4 flex-1 space-y-2 overflow-hidden px-1">
         <MemoizedReactMarkdown
           className="prose break-words dark:prose-invert prose-p:leading-relaxed prose-pre:p-0"
+          // @ts-expect-error  type check to be implemented here for Pluggable
           remarkPlugins={[remarkGfm, remarkMath]}
           components={{
             p({ children }) {

src/app/(lobby)/(content)/pages/[...slug]/page.tsx → src/app/(lobby)/(content)/(helps)/[...slug]/page.tsx

@@ -25,7 +25,9 @@ interface PageProps {
 
 function getPageFromParams(params: PageProps["params"]) {
   const slug = params?.slug?.join("/") ?? ""
-  const page = allPages.find((page) => page.slugAsParams === slug)
+  const page = allPages.find(
+    (page: { slugAsParams: string }) => page.slugAsParams === slug
+  )
 
   if (!page) {
     null