Skip to content

chore: fix RSC demo #1635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions demos/server-components/components/comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default class Comment extends React.Component {
return (
<div className="comment">
<div className="meta">
{/* TODO: time hydration mismatch */}
{user} {timeAgo(new Date(date))} ago{' '}
<span onClick={this.toggle} className="toggle">
{this.state.toggled
Expand Down
1 change: 0 additions & 1 deletion demos/server-components/components/meta.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Head from 'next/head'
// import Router from 'next/router'

export default function Meta() {
return (
Expand Down
2 changes: 1 addition & 1 deletion demos/server-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"private": true,
"dependencies": {
"ms": "2.1.3",
"next": "^12.2.1",
"next": "12.2.1",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
Expand Down
8 changes: 3 additions & 5 deletions demos/server-components/pages/csr.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import Skeletons from '../components/skeletons'

function StoryWithData({ id }) {
if (typeof window === 'undefined') return <Skeletons />
const { data } = useData(`s-${id}`, () => fetchData(`item/${id}`).then(transform))
const { data } = useData(`s-${id}`, () =>
fetchData(`item/${id}`).then(transform)
)
return <Story {...data} />
}

Expand Down Expand Up @@ -48,7 +50,3 @@ export default function News() {
</Page>
)
}

export const config = {
runtime: 'experimental-edge',
}
1 change: 0 additions & 1 deletion demos/server-components/pages/item.server.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import ItemPage from '../components/item.server'

export default function Item({ id }) {
Expand Down
8 changes: 6 additions & 2 deletions demos/server-components/pages/rsc.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,16 @@ import { transform } from '../lib/get-item'
import useData from '../lib/use-data'

function StoryWithData({ id }) {
const { data } = useData(`s-${id}`, () => fetchData(`item/${id}`).then(transform))
const { data } = useData(`s-${id}`, () =>
fetchData(`item/${id}`).then(transform)
)
return <Story {...data} />
}

function NewsWithData() {
const { data: storyIds, error } = useData('top', () => fetchData('topstories'))
const { data: storyIds, error } = useData('top', () =>
fetchData('topstories')
)
return (
<>
{error ? <ErrorPlaceholder error={error} /> : null}
Expand Down
4 changes: 3 additions & 1 deletion demos/server-components/pages/slow.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ import useData from '../lib/use-data'
import Skeletons from '../components/skeletons'

function StoryWithData({ id }) {
const { data } = useData(`s-${id}`, () => fetchData(`item/${id}`).then(transform))
const { data } = useData(`s-${id}`, () =>
fetchData(`item/${id}`).then(transform)
)
return <Story {...data} />
}

Expand Down
Loading