Skip to content
This repository was archived by the owner on Mar 15, 2024. It is now read-only.

Commit 4bb5d99

Browse files
committed
fix compatibility with multiple experimental versions
1 parent 3840693 commit 4bb5d99

9 files changed

+36
-21
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

gatsby/gatsby-browser.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ interface Callable {
1010

1111
export const replaceHydrateFunction = () => {
1212
return (element: React.ReactElement, container: Element, callback: Callable) => {
13-
ReactDOM.unstable_createRoot(container, {
13+
('createRoot' in ReactDOM
14+
// @ts-ignore
15+
? ReactDOM.createRoot
16+
: ReactDOM.unstable_createRoot
17+
)(container, {
1418
hydrate: true,
1519
hydrationOptions: { onHydrated: callback },
1620
}).render(element);

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gatsby-plugin-concurrent-mode",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"main": "index.js",
55
"license": "MIT",
66
"author": {
@@ -31,14 +31,14 @@
3131
"react-dom": "*"
3232
},
3333
"resolutions": {
34-
"react": "0.0.0-experimental-1a2d79250",
35-
"react-dom": "0.0.0-experimental-1a2d79250"
34+
"react": "0.0.0-experimental-d75105fa9",
35+
"react-dom": "0.0.0-experimental-d75105fa9"
3636
},
3737
"devDependencies": {
3838
"@babel/cli": "^7.13.16",
3939
"@babel/core": "^7.14.2",
4040
"@babel/plugin-transform-typescript": "^7.13.0",
41-
"@types/react": "^17.0.5",
41+
"@types/react": "^17.0.8",
4242
"@types/react-dom": "^17.0.5",
4343
"@yarnpkg/pnpify": "^3.0.0-rc.3",
4444
"babel-preset-gatsby-package": "^1.5.0",

yarn.lock

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2364,7 +2364,7 @@ __metadata:
23642364
languageName: node
23652365
linkType: hard
23662366

2367-
"@types/react@npm:*, @types/react@npm:^17.0.5":
2367+
"@types/react@npm:*":
23682368
version: 17.0.5
23692369
resolution: "@types/react@npm:17.0.5"
23702370
dependencies:
@@ -2375,6 +2375,17 @@ __metadata:
23752375
languageName: node
23762376
linkType: hard
23772377

2378+
"@types/react@npm:^17.0.8":
2379+
version: 17.0.8
2380+
resolution: "@types/react@npm:17.0.8"
2381+
dependencies:
2382+
"@types/prop-types": "*"
2383+
"@types/scheduler": "*"
2384+
csstype: ^3.0.2
2385+
checksum: b59a3abafd240b2880f9e6a11b2b7f75165888260c56e95a77ed10a7dd55570b307fb2356eda7fde2a8e1255d2def11797e4ae9800ae114a1f578546acabda67
2386+
languageName: node
2387+
linkType: hard
2388+
23782389
"@types/readable-stream@npm:^2.3.9":
23792390
version: 2.3.9
23802391
resolution: "@types/readable-stream@npm:2.3.9"
@@ -7016,7 +7027,7 @@ fsevents@~2.3.1:
70167027
"@babel/cli": ^7.13.16
70177028
"@babel/core": ^7.14.2
70187029
"@babel/plugin-transform-typescript": ^7.13.0
7019-
"@types/react": ^17.0.5
7030+
"@types/react": ^17.0.8
70207031
"@types/react-dom": ^17.0.5
70217032
"@yarnpkg/pnpify": ^3.0.0-rc.3
70227033
babel-preset-gatsby-package: ^1.5.0
@@ -12306,16 +12317,16 @@ fsevents@~2.3.1:
1230612317
languageName: node
1230712318
linkType: hard
1230812319

12309-
"react-dom@npm:0.0.0-experimental-1a2d79250":
12310-
version: 0.0.0-experimental-1a2d79250
12311-
resolution: "react-dom@npm:0.0.0-experimental-1a2d79250"
12320+
"react-dom@npm:0.0.0-experimental-d75105fa9":
12321+
version: 0.0.0-experimental-d75105fa9
12322+
resolution: "react-dom@npm:0.0.0-experimental-d75105fa9"
1231212323
dependencies:
1231312324
loose-envify: ^1.1.0
1231412325
object-assign: ^4.1.1
12315-
scheduler: 0.0.0-experimental-1a2d79250
12326+
scheduler: 0.0.0-experimental-d75105fa9
1231612327
peerDependencies:
12317-
react: 0.0.0-experimental-1a2d79250
12318-
checksum: 965f001f6f89ea54bd075f960ad6da5913beee7b7c395b43e1c46eec68e7402b53b821c97107737b936d5ebc7db87bda4e0230c3de3e885421ed3cf45e414561
12328+
react: 0.0.0-experimental-d75105fa9
12329+
checksum: d91dc224e08e374222a8100268fe4fc64f93459b911d7db2d3932875fa262e59b2b85ec73786de5ef5e1c788e3892a0837f394f50ed13545d9549e48c1d3eb8e
1231912330
languageName: node
1232012331
linkType: hard
1232112332

@@ -12347,13 +12358,13 @@ fsevents@~2.3.1:
1234712358
languageName: node
1234812359
linkType: hard
1234912360

12350-
"react@npm:0.0.0-experimental-1a2d79250":
12351-
version: 0.0.0-experimental-1a2d79250
12352-
resolution: "react@npm:0.0.0-experimental-1a2d79250"
12361+
"react@npm:0.0.0-experimental-d75105fa9":
12362+
version: 0.0.0-experimental-d75105fa9
12363+
resolution: "react@npm:0.0.0-experimental-d75105fa9"
1235312364
dependencies:
1235412365
loose-envify: ^1.1.0
1235512366
object-assign: ^4.1.1
12356-
checksum: 3ea5067d0e3a3e8e0eb7634b8f8f6f3788fffcfd20f18a193bf42b2620e12f4ec7d74ffd66234d80c03a1b15bfe29f76c8f64bf2af776f95db4805ffab8bab5d
12367+
checksum: 0ac000b501b97ec797b58a97ce3376a6498773164e2d14d8e8e913f54c63abc09e6adb7c6c1a9b519fc5d3ea2a0d771d29cd3482e7be69c69fff56b81f13301f
1235712368
languageName: node
1235812369
linkType: hard
1235912370

@@ -12979,13 +12990,13 @@ resolve@^2.0.0-next.3:
1297912990
languageName: node
1298012991
linkType: hard
1298112992

12982-
"scheduler@npm:0.0.0-experimental-1a2d79250":
12983-
version: 0.0.0-experimental-1a2d79250
12984-
resolution: "scheduler@npm:0.0.0-experimental-1a2d79250"
12993+
"scheduler@npm:0.0.0-experimental-d75105fa9":
12994+
version: 0.0.0-experimental-d75105fa9
12995+
resolution: "scheduler@npm:0.0.0-experimental-d75105fa9"
1298512996
dependencies:
1298612997
loose-envify: ^1.1.0
1298712998
object-assign: ^4.1.1
12988-
checksum: 77b0d712b3fde62d86178e69f0ceb307629868bab7fc24ade2529b0ba0efaf44ef84d8f552d7b4ca32f55b32c60a220ddaf5c093091cb38f847bf6d18a149a7a
12999+
checksum: e5aadbb052f3b680d2fadaab88777a946be15a2a27b53d22e2c0f56b994c2774e734548c526755cd9656df77b2d3d33a2587d389f01d23f81c981ee8e4a6c755
1298913000
languageName: node
1299013001
linkType: hard
1299113002

0 commit comments

Comments
 (0)