Skip to content

Commit c223b17

Browse files
authored
Merge pull request #420 from netlify/next-11
chore: update to Next 11
2 parents 8e98cff + 44472f0 commit c223b17

File tree

25 files changed

+11463
-508
lines changed

25 files changed

+11463
-508
lines changed

Diff for: .eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const { overrides } = require('@netlify/eslint-config-node')
1+
const { overrides } = require('@netlify/eslint-config-node/react_config')
22

33
module.exports = {
4-
extends: '@netlify/eslint-config-node',
4+
extends: '@netlify/eslint-config-node/react_config',
55
rules: {
66
complexity: 0,
77
'fp/no-let': 0,

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,4 @@ Temporary Items
149149
.apdisk
150150

151151
# End of https://www.toptal.com/developers/gitignore/api/osx,node
152+
demo/package-lock.json

Diff for: demo/.eslintrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": "next",
3+
"root": true
4+
}

Diff for: demo/next.config.js

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
// Supported targets are "serverless" and "experimental-serverless-trace"
3+
target: "serverless"
4+
}

Diff for: demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"next": "10.2.3",
11+
"next": "^11.0.0",
1212
"react": "17.0.2",
1313
"react-dom": "17.0.2"
1414
}

Diff for: demo/pages/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const Index = ({ shows }) => (
6161
<h1>3. Catch-All Routes? Included ✔</h1>
6262
<p>
6363
You can even take advantage of{' '}
64-
<a href="https://nextjs.org/docs/routing/dynamic-routes#catch-all-routes">NextJS' catch-all routes feature</a>
64+
<a href="https://nextjs.org/docs/routing/dynamic-routes#catch-all-routes">NextJS catch-all routes feature</a>
6565
.
6666
<br />
6767
Here are three examples:
@@ -90,7 +90,7 @@ const Index = ({ shows }) => (
9090
<br />
9191
Only dynamic pages are server-side rendered.
9292
<br />
93-
Static pages are pre-rendered and served directly by Netlify's CDN.
93+
Static pages are pre-rendered and served directly by Netlify&apos;s CDN.
9494
</p>
9595

9696
<ul>

Diff for: demo/pages/static.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const Static = (props) => (
99
<br />
1010
It is never server-side rendered.
1111
<br />
12-
It is served directly by Netlify's CDN.
12+
It is served directly by Netlify&apos;s CDN.
1313
<br />
1414
The <a href="https://www.npmjs.com/package/next-on-netlify">next-on-netlify</a> npm package takes care of deciding
1515
which pages to render server-side and which ones to serve directly via CDN.

Diff for: demo/pages/static/[id].js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const StaticWithID = (props) => (
99
<br />
1010
It is never server-side rendered.
1111
<br />
12-
It is served directly by Netlify's CDN.
12+
It is served directly by Netlify&apos;s CDN.
1313
<br />
1414
<br />
1515
But it has a dynamic URL parameter: /static/:id.
@@ -18,7 +18,7 @@ const StaticWithID = (props) => (
1818
<br />
1919
I am not sure what this is useful for.
2020
<br />
21-
But it's a feature of NextJS, so... I'm supporting it.
21+
But it&apos;s a feature of NextJS, so... I&apos;m supporting it.
2222
</p>
2323

2424
<hr />

0 commit comments

Comments
 (0)