Skip to content

Commit 53d4fb1

Browse files
authored
Merge 2d937cd into 4ab9ff4
2 parents 4ab9ff4 + 2d937cd commit 53d4fb1

File tree

6 files changed

+314
-14
lines changed

6 files changed

+314
-14
lines changed

demos/middleware/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"ntl": "ntl-internal"
1010
},
1111
"dependencies": {
12-
"next": "^12.1.5-canary.2",
12+
"next": "^12.1.7-canary.1",
1313
"react": "18.0.0",
1414
"react-dom": "18.0.0"
1515
},

demos/server-components/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[build]
22
command = "npm run build"
33
publish = ".next"
4+
ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../.."
45

56
[build.environment]
67
NEXT_USE_NETLIFY_EDGE = "true"

demos/server-components/next.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
module.exports = {
2+
eslint: {
3+
// Warning: This allows production builds to successfully complete even if
4+
// your project has ESLint errors.
5+
ignoreDuringBuilds: true,
6+
},
27
experimental: {
38
runtime: 'edge',
49
serverComponents: true,

demos/server-components/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"private": true,
1212
"dependencies": {
1313
"ms": "2.1.3",
14-
"next": "^12.1.5-canary.2",
14+
"next": "^12.1.7-canary.1",
1515
"react": "^18.0.0",
1616
"react-dom": "^18.0.0"
1717
},
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
12
import ItemPage from '../components/item.server'
23

3-
export default function Item({ router }) {
4-
const { id } = router.query
4+
export default function Item({ id }) {
55
return <ItemPage id={id} />
66
}
77

8-
export const config = {
9-
runtime: 'edge',
8+
export async function getServerSideProps({ query }) {
9+
return {
10+
props: {
11+
id: query.id
12+
}
13+
}
1014
}

0 commit comments

Comments
 (0)