Skip to content

Commit e533bea

Browse files
committed
update to latest react
1 parent 15a860e commit e533bea

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Starting point for a Typescript, React (v16.8.0-alpha.0), Yarn & Lerna monorepo
77
This project is initialized with [Create React App](https://github.com/facebook/create-react-app) consisting of:
88

99
- TypeScript
10-
- React (v16.8.0)
11-
- react-scripts (react-scripts v3.0.1+ from createReactApp)
10+
- React (v16.8.0+, *tested up to v16.13.1*)
11+
- react-scripts (react-scripts v3.0.1+, *tested up to v3.0.1*, from createReactApp)
1212
- react-testing-library (not Enzyme)
1313
- Yarn Workspaces (multiple packages architecture)
1414
- Lerna (tool for managing the monorepo packages)
@@ -20,8 +20,8 @@ This project is initialized with [Create React App](https://github.com/facebook/
2020

2121
The project now consists of 3 packages.
2222

23-
- **www**: create-react-app with TypeScript (react v16.8.0, react-scripts v3.0.1+)
24-
- **shared**: react components with TypeScript (react v16.8.0)
23+
- **www**: create-react-app with TypeScript (react v16.13.1+, react-scripts v3.0.1+)
24+
- **shared**: react components with TypeScript (react v16.13.1+)
2525
- **utils**: shared functions with TypeScript
2626

2727
## Get Started

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"devDependencies": {
2424
"@types/jest": "^25.2.1",
2525
"@types/node": "^13.13.5",
26-
"@types/react": "^16.8.0",
27-
"@types/react-dom": "^16.8.0",
26+
"@types/react": "^16.9.34",
27+
"@types/react-dom": "^16.9.7",
2828
"@typescript-eslint/eslint-plugin": "^2.31.0",
2929
"@typescript-eslint/parser": "^2.31.0",
3030
"eslint-config-prettier": "^6.11.0",
@@ -33,8 +33,8 @@
3333
"lerna": "^3.20.2",
3434
"node-sass": "^4.14.1",
3535
"prettier": "^2.0.5",
36-
"react": "^16.8.0",
37-
"react-dom": "^16.8.0",
36+
"react": "^16.13.1",
37+
"react-dom": "^16.13.1",
3838
"react-scripts": "3.0.1",
3939
"typescript": "~3.7.2"
4040
},

packages/www/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const App = () => {
1616
<header className="App-header">
1717
<img src={logo} className="App-logo" alt="logo" />
1818
<Header>
19-
React (v16.8.0), Typescript, Yarn & Lerna Monorepo
19+
React (v16.8.0+, <i>current v16.13.1</i>), Typescript, Yarn & Lerna Monorepo
2020
</Header>
2121
<p>
2222
Starting point for a Typescript, React, Yarn & Lerna monorepo project

packages/www/src/serviceWorker.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
const isLocalhost = Boolean(
1414
window.location.hostname === 'localhost' ||
15-
// [::1] is the IPv6 localhost address.
16-
window.location.hostname === '[::1]' ||
17-
// 127.0.0.0/8 are considered localhost for IPv4.
18-
window.location.hostname.match(
19-
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
20-
)
15+
// [::1] is the IPv6 localhost address.
16+
window.location.hostname === '[::1]' ||
17+
// 127.0.0.0/8 are considered localhost for IPv4.
18+
window.location.hostname.match(
19+
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
20+
)
2121
);
2222

2323
type Config = {
@@ -51,7 +51,7 @@ export function register(config?: Config) {
5151
navigator.serviceWorker.ready.then(() => {
5252
console.log(
5353
'This web app is being served cache-first by a service ' +
54-
'worker. To learn more, visit https://bit.ly/CRA-PWA'
54+
'worker. To learn more, visit https://bit.ly/CRA-PWA'
5555
);
5656
});
5757
} else {
@@ -79,7 +79,7 @@ function registerValidSW(swUrl: string, config?: Config) {
7979
// content until all client tabs are closed.
8080
console.log(
8181
'New content is available and will be used when all ' +
82-
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
82+
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
8383
);
8484

8585
// Execute callback

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2347,14 +2347,14 @@
23472347
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
23482348
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
23492349

2350-
"@types/react-dom@^16.8.0":
2350+
"@types/react-dom@^16.9.7":
23512351
version "16.9.7"
23522352
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz#60844d48ce252d7b2dccf0c7bb937130e27c0cd2"
23532353
integrity sha512-GHTYhM8/OwUCf254WO5xqR/aqD3gC9kSTLpopWGpQLpnw23jk44RvMHsyUSEplvRJZdHxhJGMMLF0kCPYHPhQA==
23542354
dependencies:
23552355
"@types/react" "*"
23562356

2357-
"@types/react@*", "@types/react@^16.8.0":
2357+
"@types/react@*", "@types/react@^16.9.34":
23582358
version "16.9.34"
23592359
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
23602360
integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
@@ -10242,7 +10242,7 @@ react-dev-utils@^9.0.1:
1024210242
strip-ansi "5.2.0"
1024310243
text-table "0.2.0"
1024410244

10245-
react-dom@^16.8.0:
10245+
react-dom@^16.13.1:
1024610246
version "16.13.1"
1024710247
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
1024810248
integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
@@ -10322,7 +10322,7 @@ [email protected]:
1032210322
optionalDependencies:
1032310323
fsevents "2.0.6"
1032410324

10325-
react@^16.8.0:
10325+
react@^16.13.1:
1032610326
version "16.13.1"
1032710327
resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
1032810328
integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==

0 commit comments

Comments
 (0)