feat: bug fixes and update core deps

components/NotionPage.tsx

@@ -1,5 +1,7 @@
 import * as React from 'react'
 import Head from 'next/head'
+import Link from 'next/link'
+import Image from 'next/image'
 import dynamic from 'next/dynamic'
 import cs from 'classnames'
 import { useRouter } from 'next/router'
@@ -12,7 +14,6 @@ import { Tweet, TwitterContextProvider } from 'react-static-tweets'
 
 // core notion renderer
 import { NotionRenderer } from 'react-notion-x'
-import { Image, PageLink } from 'react-notion-x/build/esm/third-party/next'
 
 // utils
 import { getBlockTitle } from 'notion-utils'
@@ -208,8 +209,8 @@ export const NotionPage: React.FC<types.PageProps> = ({
           pageId === site.rootNotionPageId && 'index-page'
         )}
         components={{
-          Image,
-          PageLink,
+          nextImage: Image,
+          nextLink: Link,
           Code,
           Collection,
           Equation,

lib/get-all-pages.ts

@@ -8,7 +8,9 @@ import { getCanonicalPageId } from './get-canonical-page-id'
 
 const uuid = !!includeNotionIdInUrls
 
-export const getAllPages = pMemoize(getAllPagesImpl, { maxAge: 60000 * 5 })
+export const getAllPages = pMemoize(getAllPagesImpl, {
+  cacheKey: (...args) => JSON.stringify(args)
+})
 
 export async function getAllPagesImpl(
   rootNotionPageId: string,

lib/search-notion.ts

@@ -1,11 +1,15 @@
 // import ky from 'ky'
 import fetch from 'isomorphic-unfetch'
 import pMemoize from 'p-memoize'
+import ExpiryMap from 'expiry-map'
 
 import { api } from './config'
 import * as types from './types'
 
-export const searchNotion = pMemoize(searchNotionImpl, { maxAge: 10000 })
+export const searchNotion = pMemoize(searchNotionImpl, {
+  cacheKey: (args) => args[0]?.query,
+  cache: new ExpiryMap(10000)
+})
 
 async function searchNotionImpl(
   params: types.SearchParams

next.config.js

@@ -1,15 +1,8 @@
-const withPlugins = require('next-compose-plugins')
-// const withTM = require('next-transpile-modules')([
-//   'react-notion-x',
-//   'notion-client',
-//   'notion-utils',
-//   'notion-types'
-// ])
-const withBundleAnalyzer = require('@next/bundle-analyzer')({
-  enabled: process.env.ANALYZE === 'true'
-})
+import withBundleAnalyzer from '@next/bundle-analyzer'
 
-module.exports = withPlugins([withBundleAnalyzer], {
+export default withBundleAnalyzer({
+  enabled: process.env.ANALYZE === 'true'
+})({
   staticPageGenerationTimeout: 300,
   images: {
     domains: [

package.json

@@ -2,12 +2,13 @@
   "name": "nextjs-notion-starter-kit",
   "version": "0.1.0",
   "private": true,
+  "type": "module",
   "description": "The perfect starter kit for building beautiful websites with Next.js and Notion.",
   "author": "Travis Fischer <[email protected]>",
   "repository": "transitive-bullshit/nextjs-notion-starter-kit",
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "scripts": {
     "dev": "next dev",
@@ -28,23 +29,24 @@
     "@keyv/redis": "^2.2.3",
     "classnames": "^2.3.1",
     "date-fns": "^2.25.0",
+    "expiry-map": "^2.0.0",
     "fathom-client": "^3.0.0",
     "got": "^11.8.2",
     "isomorphic-unfetch": "^3.1.0",
     "keyv": "^4.1.1",
     "lqip-modern": "^1.2.0",
     "next": "^12.1.0",
     "node-fetch": "^2.6.1",
-    "notion-client": "^5.0.0",
-    "notion-types": "^5.0.0",
-    "notion-utils": "^5.0.0",
-    "p-map": "^4.0.0",
-    "p-memoize": "^4.0.0",
+    "notion-client": "^6.0.0",
+    "notion-types": "^6.0.0",
+    "notion-utils": "^6.0.0",
+    "p-map": "^5.3.0",
+    "p-memoize": "^6.0.1",
     "react": "^17.0.2",
     "react-body-classname": "^1.3.1",
     "react-dom": "^17.0.2",
     "react-icons": "^4.3.1",
-    "react-notion-x": "^5.0.0",
+    "react-notion-x": "^6.0.0",
     "react-static-tweets": "^0.7.1",
     "react-use": "^17.3.2",
     "static-tweets": "^0.7.1",
@@ -64,7 +66,6 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.3.0",
     "next-compose-plugins": "^2.2.1",
-    "next-transpile-modules": "^9.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.4.1",
     "typescript": "^4.4.4"

api/robots.txt.ts → pages/api/robots.txt.ts

@@ -1,6 +1,6 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 
-import { host } from '../lib/config'
+import { host } from '../../lib/config'
 
 export default async (
   req: NextApiRequest,

api/search-notion.ts → pages/api/search-notion.ts

@@ -1,7 +1,7 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 
-import * as types from '../lib/types'
-import { search } from '../lib/notion'
+import * as types from '../../lib/types'
+import { search } from '../../lib/notion'
 
 export default async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method !== 'POST') {

api/sitemap.xml.ts → pages/api/sitemap.xml.ts

@@ -1,8 +1,8 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 
-import { SiteMap } from '../lib/types'
-import { host } from '../lib/config'
-import { getSiteMaps } from '../lib/get-site-maps'
+import { SiteMap } from '../../lib/types'
+import { host } from '../../lib/config'
+import { getSiteMaps } from '../../lib/get-site-maps'
 
 export default async (
   req: NextApiRequest,
@@ -24,9 +24,9 @@ export default async (
   res.end()
 }
 
-const createSitemap = (
-  siteMap: SiteMap
-) => `<?xml version="1.0" encoding="UTF-8"?>
+const createSitemap = (siteMap: SiteMap) =>
+  `
+  <?xml version="1.0" encoding="UTF-8"?>
     <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
       <url>
         <loc>${host}</loc>
@@ -46,4 +46,5 @@ const createSitemap = (
         )
         .join('')}
     </urlset>
-    `
+  </xml>
+  `

site.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   // where it all starts -- the site's root Notion page (required)
   rootNotionPageId: '78fc5a4b88d74b0e824e29407e9f1ec1',