Skip to content

Commit

Permalink
Upgrade to React 17
Browse files Browse the repository at this point in the history
  • Loading branch information
karlhorky committed Oct 29, 2020
1 parent 363f56f commit 6e9a423
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
5 changes: 3 additions & 2 deletions components/Layout.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Fragment } from 'react';
import Head from 'next/head';
import Header from './Header';

export default function Layout(props) {
return (
<>
<Fragment>
<Head>
<link rel="icon" href="/favicon.ico" />
</Head>
Expand All @@ -13,6 +14,6 @@ export default function Layout(props) {
<main style={{ padding: 30 }}>{props.children}</main>

<footer style={{ padding: 30 }}>footer here</footer>
</>
</Fragment>
);
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"next": "10.0.0",
"next-cookies": "^2.0.3",
"postgres": "2.0.0-beta.2",
"react": "16.13.1",
"react-dom": "16.13.1",
"react": "17.0.1",
"react-dom": "17.0.1",
"snakecase-keys": "^3.2.0"
},
"devDependencies": {
Expand Down
5 changes: 3 additions & 2 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Fragment } from 'react';
import { NextPage } from 'next';
import globalStyles from '../components/GlobalStyles';

Expand All @@ -8,10 +9,10 @@ type Props = {

function MyApp({ Component, pageProps }: Props) {
return (
<>
<Fragment>
{globalStyles}
<Component {...pageProps} />
</>
</Fragment>
);
}

Expand Down
10 changes: 5 additions & 5 deletions pages/users/[id].tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Fragment, useState } from 'react';
import { GetServerSidePropsContext } from 'next';
import Head from 'next/head';
import { useState } from 'react';
import Layout from '../../components/Layout';
import { User } from '../../util/types';
import { useRouter } from 'next/router';
Expand Down Expand Up @@ -60,7 +60,7 @@ export default function SingleUser(props: Props) {
edit
</button>
) : (
<>
<Fragment>
<button
onClick={async () => {
await fetch(`/api/users/${props.user.id}`, {
Expand All @@ -83,7 +83,7 @@ export default function SingleUser(props: Props) {
>
cancel
</button>
</>
</Fragment>
)}
<br />
<h2>user lastName</h2>
Expand All @@ -104,7 +104,7 @@ export default function SingleUser(props: Props) {
edit
</button>
) : (
<>
<Fragment>
<button
onClick={() => {
setEditingKey(null);
Expand All @@ -121,7 +121,7 @@ export default function SingleUser(props: Props) {
>
cancel
</button>
</>
</Fragment>
)}
<br />
<br />
Expand Down
30 changes: 14 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7579,7 +7579,7 @@ prompts@^2.0.1:
kleur "^3.0.3"
sisteransi "^1.0.4"

[email protected], prop-types@^15.6.2, prop-types@^15.7.2:
[email protected], prop-types@^15.7.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
Expand Down Expand Up @@ -7705,15 +7705,14 @@ rc@^1.2.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-dom@16.13.1:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
react-dom@17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.19.1"
scheduler "^0.20.1"

[email protected], react-is@^16.12.0, react-is@^16.8.1:
version "16.13.1"
Expand All @@ -7725,14 +7724,13 @@ [email protected]:
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==

react@16.13.1:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
react@17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"

read-pkg-up@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -8165,10 +8163,10 @@ saxes@^5.0.0:
dependencies:
xmlchars "^2.2.0"

scheduler@^0.19.1:
version "0.19.1"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
scheduler@^0.20.1:
version "0.20.1"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
Expand Down

0 comments on commit 6e9a423

Please sign in to comment.