Skip to content

Commit 99c2be1

Browse files
authored
Merge pull request #69 from dubiety/feature/support-react17
Support react17
2 parents e3dc221 + 92bb92a commit 99c2be1

File tree

4 files changed

+25
-14
lines changed

4 files changed

+25
-14
lines changed

.prettierrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ module.exports = {
44
singleQuote: true,
55
printWidth: 120,
66
tabWidth: 2,
7+
endOfLine: 'auto',
78
};

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@material-ui/core": "5.0.0-beta.4",
99
"@types/jest": "24.0.19",
1010
"@types/node": "12.11.7",
11-
"@types/react": "17.0.2",
12-
"@types/react-dom": "16.9.2",
11+
"@types/react": "^17.0.39",
12+
"@types/react-dom": "^17.0.11",
1313
"@types/react-router-dom": "^5.1.3",
1414
"react": "^17.0.2",
1515
"react-azure-maps": "^0.3.0",
@@ -56,4 +56,4 @@
5656
"nth-check": "^2.0.1",
5757
"ansi-html": "git+https://github.com/mahdyar/ansi-html-community#0.0.8"
5858
}
59-
}
59+
}

src/Layout/Description.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
import React from 'react';
22

3-
const Description: React.FC = ({ children }) => {
3+
type DescriptionProps = {
4+
children: React.ReactNode;
5+
};
6+
7+
const Description: React.FC<DescriptionProps> = (props: DescriptionProps) => {
48
return (
59
<div className="description">
610
<span>Description: </span>
711
<br></br>
8-
{children}
12+
{props.children}
913
</div>
1014
);
1115
};

yarn.lock

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,12 +2211,12 @@
22112211
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
22122212
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
22132213

2214-
"@types/react-dom@16.9.2":
2215-
version "16.9.2"
2216-
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.2.tgz#90f9e6c161850be1feb31d2f448121be2a4f3b47"
2217-
integrity sha512-hgPbBoI1aTSTvZwo8HYw35UaTldW6n2ETLvHAcfcg1FaOuBV3olmyCe5eMpx2WybWMBPv0MdU2t5GOcQhP+3zA==
2214+
"@types/react-dom@^17.0.11":
2215+
version "17.0.17"
2216+
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1"
2217+
integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==
22182218
dependencies:
2219-
"@types/react" "*"
2219+
"@types/react" "^17"
22202220

22212221
"@types/react-is@^16.7.1 || ^17.0.0":
22222222
version "17.0.2"
@@ -2257,12 +2257,13 @@
22572257
"@types/prop-types" "*"
22582258
csstype "^2.2.0"
22592259

2260-
"@types/react@17.0.2":
2261-
version "17.0.2"
2262-
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
2263-
integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
2260+
"@types/react@^17", "@types/react@^17.0.39":
2261+
version "17.0.47"
2262+
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.47.tgz#4ee71aaf4c5a9e290e03aa4d0d313c5d666b3b78"
2263+
integrity sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA==
22642264
dependencies:
22652265
"@types/prop-types" "*"
2266+
"@types/scheduler" "*"
22662267
csstype "^3.0.2"
22672268

22682269
"@types/resolve@1.17.1":
@@ -2277,6 +2278,11 @@
22772278
resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
22782279
integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
22792280

2281+
"@types/scheduler@*":
2282+
version "0.16.2"
2283+
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
2284+
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
2285+
22802286
"@types/stack-utils@^2.0.0":
22812287
version "2.0.1"
22822288
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"

0 commit comments

Comments
 (0)