Upgrade to Next.js 14 (#304)

storj · Nov 13, 2023 · c227765 · c227765
1 parent fa3cd0b
commit c227765
Show file tree

Hide file tree

Showing 5 changed files with 1,798 additions and 902 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -22,7 +22,8 @@ jobs:
             ~/.npm
             ${{ github.workspace }}/.next/cache
             # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.[jt]s', '**/*.[jt]sx') }}
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
+
             # If source files changed but packages didn't, rebuild from a prior cache.
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-

diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -20,7 +20,7 @@ jobs:
             ~/.npm
             ${{ github.workspace }}/.next/cache
             # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.[jt]s', '**/*.[jt]sx') }}
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
             # If source files changed but packages didn't, rebuild from a prior cache.
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-

diff --git a/next.config.mjs b/next.config.mjs
@@ -1,5 +1,6 @@
 import path from 'path'
 import withMarkdoc from '@markdoc/next.js'
+
 import withSearch from './src/markdoc/search.mjs'
 import withNavigation from './src/markdoc/navigation.mjs'
 import { createLoader } from 'simple-functional-loader'
@@ -48,5 +49,7 @@ const nextConfig = {
 }
 
 export default withNavigation(
-  withSearch(withMarkdoc({ schemaPath: './src/markdoc' })(nextConfig))
+  withSearch(
+    withMarkdoc({ schemaPath: './src/markdoc', nextjsExports: [] })(nextConfig)
+  )
 )