Skip to content

Commit 737dd7c

Browse files
committed
Upgrade to Yarn 18
1 parent c379e87 commit 737dd7c

File tree

5 files changed

+47
-36
lines changed

5 files changed

+47
-36
lines changed

PushMessageFromServer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const pushSubscription =
2626
"p256dh": "",
2727
"auth": ""
2828
}
29-
}
29+
};
3030

3131
const payload = {
3232
title: `Hello at ${(new Date()).toISOString()}`,

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,13 @@
4545
- https://blog.elmah.io/how-to-send-push-notifications-to-a-browser-in-asp-net-core/
4646
- https://www.bartvanuden.com/2018/01/23/push-notifications-to-your-pwa-with-asp-net-core-2-0-and-aurelia/
4747
- https://www.tpeczek.com/2017/12/push-notifications-and-aspnet-core-part.html
48-
- https://stackoverflow.com/a/47617427/1872200
48+
- https://stackoverflow.com/a/47617427/1872200
49+
50+
# Upgrade React to major release version
51+
```sh
52+
yarn upgrade react --latest
53+
yarn upgrade react-dom --latest
54+
yarn upgrade react-dom --latest
55+
yarn upgrade @types/react --latest
56+
yarn upgrade @types/react-dom --latest
57+
```

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"@testing-library/user-event": "^13.2.1",
99
"@types/jest": "^27.0.1",
1010
"@types/node": "^16.7.13",
11-
"@types/react": "^17.0.20",
12-
"@types/react-dom": "^17.0.9",
13-
"react": "^17.0.2",
14-
"react-dom": "^17.0.2",
11+
"@types/react": "^18.0.26",
12+
"@types/react-dom": "^18.0.9",
13+
"react": "^18.2.0",
14+
"react-dom": "^18.2.0",
1515
"react-scripts": "5.0.0",
1616
"typescript": "^4.4.2",
1717
"web-push": "^3.4.5",

src/index.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
import React from 'react';
2-
import ReactDOM from 'react-dom';
31
import PushSubscription from './PushSubscription';
2+
import { createRoot } from 'react-dom/client';
43

5-
ReactDOM.render(
6-
<React.StrictMode>
7-
<PushSubscription />
8-
</React.StrictMode>,
9-
document.getElementById('root')
10-
);
11-
4+
// https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html#updates-to-client-rendering-apis
5+
const container = document.getElementById('root') as HTMLElement
6+
const root = createRoot(container);
7+
root.render(<PushSubscription />);

yarn.lock

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,14 +1760,14 @@
17601760
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
17611761
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
17621762

1763-
"@types/react-dom@^17.0.9":
1764-
version "17.0.11"
1765-
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466"
1766-
integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==
1763+
"@types/react-dom@^18.0.9":
1764+
version "18.0.9"
1765+
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.9.tgz#ffee5e4bfc2a2f8774b15496474f8e7fe8d0b504"
1766+
integrity sha512-qnVvHxASt/H7i+XG1U1xMiY5t+IHcPGUK7TDMDzom08xa7e86eCeKOiLZezwCKVxJn6NEiiy2ekgX8aQssjIKg==
17671767
dependencies:
17681768
"@types/react" "*"
17691769

1770-
"@types/react@*", "@types/react@^17.0.20":
1770+
"@types/react@*":
17711771
version "17.0.38"
17721772
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.38.tgz#f24249fefd89357d5fa71f739a686b8d7c7202bd"
17731773
integrity sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==
@@ -1776,6 +1776,15 @@
17761776
"@types/scheduler" "*"
17771777
csstype "^3.0.2"
17781778

1779+
"@types/react@^18.0.26":
1780+
version "18.0.26"
1781+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.26.tgz#8ad59fc01fef8eaf5c74f4ea392621749f0b7917"
1782+
integrity sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==
1783+
dependencies:
1784+
"@types/prop-types" "*"
1785+
"@types/scheduler" "*"
1786+
csstype "^3.0.2"
1787+
17791788
"@types/resolve@1.17.1":
17801789
version "1.17.1"
17811790
resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@@ -7169,14 +7178,13 @@ react-dev-utils@^12.0.0:
71697178
strip-ansi "^6.0.1"
71707179
text-table "^0.2.0"
71717180

7172-
react-dom@^17.0.2:
7173-
version "17.0.2"
7174-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
7175-
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
7181+
react-dom@^18.2.0:
7182+
version "18.2.0"
7183+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
7184+
integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
71767185
dependencies:
71777186
loose-envify "^1.1.0"
7178-
object-assign "^4.1.1"
7179-
scheduler "^0.20.2"
7187+
scheduler "^0.23.0"
71807188

71817189
react-error-overlay@^6.0.10:
71827190
version "6.0.10"
@@ -7253,13 +7261,12 @@ react-scripts@5.0.0:
72537261
optionalDependencies:
72547262
fsevents "^2.3.2"
72557263

7256-
react@^17.0.2:
7257-
version "17.0.2"
7258-
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
7259-
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
7264+
react@^18.2.0:
7265+
version "18.2.0"
7266+
resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
7267+
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
72607268
dependencies:
72617269
loose-envify "^1.1.0"
7262-
object-assign "^4.1.1"
72637270

72647271
readable-stream@^2.0.1:
72657272
version "2.3.7"
@@ -7548,13 +7555,12 @@ saxes@^5.0.1:
75487555
dependencies:
75497556
xmlchars "^2.2.0"
75507557

7551-
scheduler@^0.20.2:
7552-
version "0.20.2"
7553-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
7554-
integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
7558+
scheduler@^0.23.0:
7559+
version "0.23.0"
7560+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
7561+
integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
75557562
dependencies:
75567563
loose-envify "^1.1.0"
7557-
object-assign "^4.1.1"
75587564

75597565
schema-utils@2.7.0:
75607566
version "2.7.0"

0 commit comments

Comments
 (0)