docs: Remove now obsolete experimental app dir config and @next/font …

…dependency from examples & docs (#328 by @grzegorzpokorski) [skip ci]
amannn · Jun 20, 2023 · 6540645 · 6540645 · vercel · Jun 20, 2023
1 parent c9c2070
commit 6540645
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 60 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: 8.4.0
+          version: 8.6.0
       - uses: actions/setup-node@v3
         with:
           node-version: 18.x

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: 8.4.0
+          version: 8.6.0
       - uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'

diff --git a/docs/next.config.js b/docs/next.config.js
@@ -9,9 +9,6 @@ const withNextra = require('nextra')({
 });
 
 module.exports = withNextra({
-  experimental: {
-    appDir: true
-  },
   redirects: () => [
     // Index pages
     {

diff --git a/docs/package.json b/docs/package.json
@@ -12,7 +12,6 @@
   },
   "dependencies": {
     "@heroicons/react": "^2.0.17",
-    "@next/font": "^13.1.6",
     "@tailwindcss/typography": "^0.5.9",
     "clsx": "^1.2.1",
     "http-status-codes": "^2.2.0",

diff --git a/docs/pages/_app.tsx b/docs/pages/_app.tsx
@@ -1,6 +1,6 @@
-import {Inter} from '@next/font/google';
 import Analytics from 'components/Analytics';
 import {AppProps} from 'next/app';
+import {Inter} from 'next/font/google';
 import {ReactNode} from 'react';
 import 'nextra-theme-docs/style.css';
 import '../styles.css';

diff --git a/examples/example-next-13-next-auth/next.config.js b/examples/example-next-13-next-auth/next.config.js
diff --git a/examples/example-next-13/package.json b/examples/example-next-13/package.json
@@ -10,7 +10,6 @@
     "start": "next start"
   },
   "dependencies": {
-    "@next/font": "^13.1.6",
     "clsx": "^1.2.1",
     "next": "^13.4.6",
     "next-intl": "^2.14.3",

diff --git a/examples/example-next-13/src/app/[locale]/layout.tsx b/examples/example-next-13/src/app/[locale]/layout.tsx
@@ -1,5 +1,5 @@
-import {Inter} from '@next/font/google';
 import clsx from 'clsx';
+import {Inter} from 'next/font/google';
 import {notFound} from 'next/navigation';
 import {createTranslator, NextIntlClientProvider} from 'next-intl';
 import {ReactNode} from 'react';