Skip to content

Commit d44aefe

Browse files
authored
Merge pull request relay-tools#155 from sorenhoyer/master
Upgrade to relay v7
2 parents bdbc212 + 3a18103 commit d44aefe

16 files changed

+1633
-1368
lines changed

example/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,26 @@
3030
"prop-types": "^15.6.2",
3131
"react": "^16.10.2",
3232
"react-dom": "^16.10.2",
33-
"react-relay": "^6.0.0",
34-
"relay-runtime": "^6.0.0",
33+
"react-relay": "^7.0.0",
34+
"relay-runtime": "^7.0.0",
3535
"todomvc-app-css": "^2.1.0",
3636
"todomvc-common": "^1.0.3",
3737
"webpack": "^3.5.5",
3838
"webpack-dev-server": "^2.7.1",
3939
"whatwg-fetch": "2.0.3"
4040
},
4141
"devDependencies": {
42+
"@types/node": "^12.11.7",
4243
"@types/prop-types": "^15.5.5",
4344
"@types/react": "^16.4.12",
4445
"@types/react-dom": "^16.0.7",
45-
"@types/react-relay": "^6.0.1",
46+
"@types/react-relay": "^7.0.0",
4647
"@types/relay-runtime": "^6.0.7",
4748
"babel-cli": "^6.26.0",
4849
"babel-eslint": "6.1.2",
4950
"csstype": "^2.5.6",
5051
"fork-ts-checker-webpack-plugin": "^0.3.0",
51-
"relay-compiler": "^6.0.0",
52+
"relay-compiler": "^7.0.0",
5253
"relay-compiler-language-typescript": "file:.yalc/relay-compiler-language-typescript",
5354
"ts-loader": "^6.2.0",
5455
"tslint": "^5.20.0",

example/yarn.lock

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,11 @@
454454
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
455455
integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
456456

457+
"@types/node@^12.11.7":
458+
version "12.11.7"
459+
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
460+
integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
461+
457462
"@types/prop-types@*", "@types/prop-types@^15.5.5":
458463
version "15.7.3"
459464
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
@@ -466,10 +471,10 @@
466471
dependencies:
467472
"@types/react" "*"
468473

469-
"@types/react-relay@^6.0.1":
470-
version "6.0.1"
471-
resolved "https://registry.yarnpkg.com/@types/react-relay/-/react-relay-6.0.1.tgz#f9fbe5493f86cffe0ce1cc491b3898bd1cd40cdd"
472-
integrity sha512-aM0z3/7pNU/n9+pK9NKHTTTowQZ/bvQitKJX8bRpnHrApxFNhJVH1t8dqecjCz5POKIxJmIRP6k12ZaYv5YvCw==
474+
"@types/react-relay@^6.0.2":
475+
version "6.0.2"
476+
resolved "https://registry.yarnpkg.com/@types/react-relay/-/react-relay-6.0.2.tgz#96accd6814987bc00c2d690f102e5737c5fb3783"
477+
integrity sha512-Mr136B9p+reUsTFWu30JD8RfDIWTl5yiIAqn/l72WkTjEWwl5j/t3o7o8HGchqn1SCHC6eaJ6Dg3gvhMayfcKw==
473478
dependencies:
474479
"@types/react" "*"
475480
"@types/relay-runtime" "*"
@@ -482,11 +487,21 @@
482487
"@types/prop-types" "*"
483488
csstype "^2.2.0"
484489

485-
"@types/relay-runtime@*", "@types/relay-runtime@^6.0.7":
490+
"@types/relay-runtime@*":
491+
version "6.0.6"
492+
resolved "https://registry.yarnpkg.com/@types/relay-runtime/-/relay-runtime-6.0.6.tgz#ca1a2ba8eaff8fcefc584afac0df68490d5b88e8"
493+
integrity sha512-S2C2/BeXw22XKaz9F0rEn7bsyIhTZrtc+mFaTeK+5mGj7Sa6AD+8Vs9hOhPSe3aTbeDu2ORINz8mlrB/dehKKQ==
494+
495+
"@types/relay-runtime@^6.0.7":
486496
version "6.0.7"
487497
resolved "https://registry.yarnpkg.com/@types/relay-runtime/-/relay-runtime-6.0.7.tgz#2c63bca39c47a4919a7e1530814b64a68c868895"
488498
integrity sha512-WNJEWhJI/H1cYy8n3tvyeIVbiDFmnBiQn7c4hptWfYA/zUsERxiwTYv+H+zzRIvWTt1tWLRWeVvGcXtfZy9y7Q==
489499

500+
"@yarnpkg/lockfile@^1.1.0":
501+
version "1.1.0"
502+
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
503+
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
504+
490505
abbrev@1:
491506
version "1.1.1"
492507
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1442,10 +1457,10 @@ babel-preset-es2015@^6.13.2:
14421457
babel-plugin-transform-es2015-unicode-regex "^6.24.1"
14431458
babel-plugin-transform-regenerator "^6.24.1"
14441459

1445-
babel-preset-fbjs@^3.1.2:
1446-
version "3.2.0"
1447-
resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.2.0.tgz#c0e6347d3e0379ed84b3c2434d3467567aa05297"
1448-
integrity sha512-5Jo+JeWiVz2wHUUyAlvb/sSYnXNig9r+HqGAOSfh5Fzxp7SnAaR/tEGRJ1ZX7C77kfk82658w6R5Z+uPATTD9g==
1460+
babel-preset-fbjs@^3.3.0:
1461+
version "3.3.0"
1462+
resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz#a6024764ea86c8e06a22d794ca8b69534d263541"
1463+
integrity sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw==
14491464
dependencies:
14501465
"@babel/plugin-proposal-class-properties" "^7.0.0"
14511466
"@babel/plugin-proposal-object-rest-spread" "^7.0.0"
@@ -4308,7 +4323,7 @@ npmlog@^4.0.2:
43084323
gauge "~2.7.3"
43094324
set-blocking "~2.0.0"
43104325

4311-
nullthrows@^1.1.0:
4326+
nullthrows@^1.1.1:
43124327
version "1.1.1"
43134328
resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
43144329
integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
@@ -4844,15 +4859,15 @@ react-is@^16.8.1:
48444859
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz#984120fd4d16800e9a738208ab1fba422d23b5ab"
48454860
integrity sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA==
48464861

4847-
react-relay@^6.0.0:
4848-
version "6.0.0"
4849-
resolved "https://registry.yarnpkg.com/react-relay/-/react-relay-6.0.0.tgz#2a54274a471ef801a465704e58f1db91059ad1d3"
4850-
integrity sha512-F0UO50TNIyfkTaCnKgbniATIWPpaX0ukQ5QPdaRRwL1qxslx90Umi83XaaiHyy1etKVePMZ+DHCd1aV7yw1AKA==
4862+
react-relay@^7.0.0:
4863+
version "7.0.0"
4864+
resolved "https://registry.yarnpkg.com/react-relay/-/react-relay-7.0.0.tgz#c8839c2781edc51d9ac3155b66e1b22aafadcf95"
4865+
integrity sha512-ozN7T09wXXzf+VigDK98SW6lMGly9oJsgPGk4jxremMl6WSPX4bAa6A4NMvsFoV9GVLKB2EpaFs1YirIjWywYw==
48514866
dependencies:
48524867
"@babel/runtime" "^7.0.0"
48534868
fbjs "^1.0.0"
4854-
nullthrows "^1.1.0"
4855-
relay-runtime "6.0.0"
4869+
nullthrows "^1.1.1"
4870+
relay-runtime "7.0.0"
48564871

48574872
react@^16.10.2:
48584873
version "16.10.2"
@@ -5009,37 +5024,37 @@ regjsparser@^0.1.4:
50095024
jsesc "~0.5.0"
50105025

50115026
"relay-compiler-language-typescript@file:.yalc/relay-compiler-language-typescript":
5012-
version "9.0.0-ea08b9e5"
5027+
version "9.0.0-ee1602f0"
50135028
dependencies:
50145029
immutable "^4.0.0-rc.12"
50155030
invariant "^2.2.4"
50165031

5017-
relay-compiler@^6.0.0:
5018-
version "6.0.0"
5019-
resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-6.0.0.tgz#a70ecb39b59dea507261aeda704c071326d69d5e"
5020-
integrity sha512-8K8cCwrOTqu3usF8GXQ+JEgxcTxJ5qVFqfNpfMYrRpMraXrBmykcLRpj38p2MxtcjyqkE2ZnUe5huW5/469obA==
5032+
relay-compiler@^7.0.0:
5033+
version "7.0.0"
5034+
resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-7.0.0.tgz#89ea3ec49de6dddeae65dcf9c9eebce49645d3ad"
5035+
integrity sha512-LpiKplawsZAbQU1AUD6F9HnV2ZCYmpi+p3xtA7TnxDgdqqctuWnkrsMJOOrDNHbAse8W9Fb1lZlzgEcnze/Rvg==
50215036
dependencies:
50225037
"@babel/core" "^7.0.0"
50235038
"@babel/generator" "^7.0.0"
50245039
"@babel/parser" "^7.0.0"
50255040
"@babel/runtime" "^7.0.0"
50265041
"@babel/traverse" "^7.0.0"
50275042
"@babel/types" "^7.0.0"
5028-
babel-preset-fbjs "^3.1.2"
5043+
babel-preset-fbjs "^3.3.0"
50295044
chalk "^2.4.1"
50305045
fast-glob "^2.2.2"
50315046
fb-watchman "^2.0.0"
50325047
fbjs "^1.0.0"
50335048
immutable "~3.7.6"
5034-
nullthrows "^1.1.0"
5035-
relay-runtime "6.0.0"
5049+
nullthrows "^1.1.1"
5050+
relay-runtime "7.0.0"
50365051
signedsource "^1.0.0"
50375052
yargs "^9.0.0"
50385053

5039-
relay-runtime@6.0.0, relay-runtime@^6.0.0:
5040-
version "6.0.0"
5041-
resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-6.0.0.tgz#073ec2408f41a28c3a7310d71dd5f42f8e4e4bf3"
5042-
integrity sha512-zIXQqFfe0zBCVzKbMGEPMvKFxfbE3pY2RbZsKBvHAr/vMDj6OX9E+f4R4udE5xvMbI7g+baYFHi2I9NDEydGaQ==
5054+
relay-runtime@7.0.0, relay-runtime@^7.0.0:
5055+
version "7.0.0"
5056+
resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-7.0.0.tgz#49642c0e16096cd4e5f435fcbdd63ffd8da54090"
5057+
integrity sha512-w0TPq5xvL6dlxD8+tBR19gGep3kFsx0fJ2Xr4hsxpDFKskH2oOmsMSp6gNVsUd2T1zf/DYll5eJqjoiQc5nB1A==
50435058
dependencies:
50445059
"@babel/runtime" "^7.0.0"
50455060
fbjs "^1.0.0"

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
"@types/invariant": "2.2.30",
8181
"@types/jest": "^24.0.17",
8282
"@types/node": "8.10.51",
83-
"@types/relay-compiler": "^6.0.1",
84-
"@types/relay-runtime": "^6.0.7",
83+
"@types/relay-compiler": "^7.0.2",
84+
"@types/relay-runtime": "^6.0.8",
8585
"chokidar-cli": "^2.0.0",
8686
"concurrently": "^5.0.0",
8787
"graphql": "^14.4.2",
@@ -90,20 +90,20 @@
9090
"jest-cli": "^24.8.0",
9191
"lint-staged": "^9.2.1",
9292
"prettier": "^1.18.2",
93-
"relay-compiler": "^6.0.0",
94-
"relay-runtime": "^6.0.0",
95-
"relay-test-utils-internal": "^6.0.0",
93+
"relay-compiler": "^7.0.0",
94+
"relay-runtime": "^7.0.0",
95+
"relay-test-utils-internal": "^7.0.0",
9696
"ts-jest": "^22.0.1",
9797
"tslint": "^5.18.0",
9898
"tslint-config-prettier": "^1.18.0",
99-
"typescript": "3.5.3"
99+
"typescript": "3.6.4"
100100
},
101101
"peerDependencies": {
102-
"@types/react-relay": ">=1.3.9",
102+
"@types/react-relay": ">=7.0.0",
103103
"@types/relay-runtime": ">=6.0.7",
104-
"relay-compiler": ">=6.0.0",
105-
"relay-runtime": ">=6.0.0",
106-
"typescript": ">=2.9.1"
104+
"relay-compiler": ">=7.0.0",
105+
"relay-runtime": ">=7.0.0",
106+
"typescript": ">=3.6.4"
107107
},
108108
"publishConfig": {
109109
"registry": "https://registry.npmjs.org/"

0 commit comments

Comments
 (0)