Skip to content

Commit 5404e73

Browse files
committed
Merge branch 'master-upstream' into v10-update
# Conflicts: # example-hooks/package.json # example-hooks/yarn.lock # example/package.json # package.json # test/__snapshots__/TypeScriptGenerator-test.ts.snap # test/fixtures/type-generator/mutation-with-delete-record.graphql # yarn.lock
2 parents 318b86e + 9e68d50 commit 5404e73

File tree

8 files changed

+59
-382
lines changed

8 files changed

+59
-382
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# v13.0.0 (Mon Jul 27 2020)
2+
3+
#### 💥 Breaking Change
4+
5+
- Upgrade to support relay v10.0.1 [#199](https://github.com/relay-tools/relay-compiler-language-typescript/pull/199) ([@thicodes](https://github.com/thicodes) [@maraisr](https://github.com/maraisr))
6+
7+
#### Authors: 2
8+
9+
- [@thicodes](https://github.com/thicodes)
10+
- Marais Rossouw ([@maraisr](https://github.com/maraisr))
11+
12+
---
13+
114
# v12.0.4 (Fri Jul 24 2020)
215

316
#### 🐛 Bug Fix

example-hooks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"prop-types": "^15.6.2",
2222
"react": "0.0.0-experimental-f42431abe",
2323
"react-dom": "0.0.0-experimental-f42431abe",
24-
"react-relay": "0.0.0-experimental-8058ef82",
24+
"react-relay": "^0.0.0-experimental-8058ef82",
2525
"relay-runtime": "^10.0.1",
2626
"todomvc-app-css": "^2.1.0",
2727
"todomvc-common": "^1.0.3",

example-hooks/yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5432,7 +5432,7 @@ react-is@^16.8.1:
54325432
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa"
54335433
integrity sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw==
54345434

5435-
5435+
react-relay@^0.0.0-experimental-8058ef82:
54365436
version "0.0.0-experimental-8058ef82"
54375437
resolved "https://registry.yarnpkg.com/react-relay/-/react-relay-0.0.0-experimental-8058ef82.tgz#16b9ce15ee9563a30ef69563773d6933464bf630"
54385438
integrity sha512-YZy/k397brMlOxxdxgA1i8LMFCEB4PgHk2pFw4vSa2cd/9PmKDnlPbYp6Y6u6aW7FY/mybn5qSwjwF8vnxJhIQ==

example/yarn.lock

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3499,6 +3499,11 @@ ignore-walk@^3.0.1:
34993499
dependencies:
35003500
minimatch "^3.0.4"
35013501

3502+
immutable@^4.0.0-rc.12:
3503+
version "4.0.0-rc.12"
3504+
resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.12.tgz#ca59a7e4c19ae8d9bf74a97bdf0f6e2f2a5d0217"
3505+
integrity sha512-0M2XxkZLx/mi3t8NVwIm1g8nHoEmM9p9UBl/G9k4+hm0kBgOVdMV/B3CY5dQ8qG8qc80NN4gDV4HQv6FTJ5q7A==
3506+
35023507
immutable@~3.7.6:
35033508
version "3.7.6"
35043509
resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
@@ -3566,7 +3571,7 @@ internal-ip@^4.3.0:
35663571
default-gateway "^4.2.0"
35673572
ipaddr.js "^1.9.0"
35683573

3569-
invariant@^2.2.2:
3574+
invariant@^2.2.2, invariant@^2.2.4:
35703575
version "2.2.4"
35713576
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
35723577
integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -5242,8 +5247,11 @@ regjsparser@^0.1.4:
52425247
dependencies:
52435248
jsesc "~0.5.0"
52445249

5245-
"relay-compiler-language-typescript@file:../lib":
5246-
version "0.0.0"
5250+
"relay-compiler-language-typescript@file:..":
5251+
version "12.0.3"
5252+
dependencies:
5253+
immutable "^4.0.0-rc.12"
5254+
invariant "^2.2.4"
52475255

52485256
relay-compiler@^10.0.1:
52495257
version "10.0.1"

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "relay-compiler-language-typescript",
3-
"version": "12.0.4",
3+
"version": "13.0.0",
44
"description": "A language plugin for Relay that adds TypeScript support, including emitting type definitions.",
55
"keywords": [
66
"graphql",
@@ -27,10 +27,10 @@
2727
"email": "[email protected]"
2828
}
2929
],
30+
"main": "lib/index.js",
3031
"files": [
3132
"lib"
3233
],
33-
"main": "lib/index.js",
3434
"scripts": {
3535
"build": "rm -rf lib && tsc",
3636
"lint": "tslint -c tslint.json --project tsconfig.json",
@@ -40,8 +40,8 @@
4040
"relay": "node bin/relay-compiler.js --schema test/schema.graphql --src test/ --outputDir __generated__",
4141
"sync-fixtures": "ts-node ./syncFixtures.ts",
4242
"test": "npm run type-check && jest",
43-
"watch": "concurrently 'tsc --watch' 'chokidar \"lib/**/*.js\" -c \"yalc publish --force --push\"'",
44-
"type-check": "tsc --noEmit --pretty"
43+
"type-check": "tsc --noEmit --pretty",
44+
"watch": "concurrently 'tsc --watch' 'chokidar \"lib/**/*.js\" -c \"yalc publish --force --push\"'"
4545
},
4646
"husky": {
4747
"hooks": {
@@ -59,6 +59,7 @@
5959
"git add"
6060
]
6161
},
62+
"prettier": {},
6263
"jest": {
6364
"moduleFileExtensions": [
6465
"js",
@@ -92,9 +93,9 @@
9293
"jest-cli": "^24.8.0",
9394
"lint-staged": "^9.2.1",
9495
"prettier": "^1.19.1",
95-
"relay-compiler": "^10.0.0",
96-
"relay-runtime": "^10.0.0",
97-
"relay-test-utils-internal": "^10.0.0",
96+
"relay-compiler": "^10.0.1",
97+
"relay-runtime": "^10.0.1",
98+
"relay-test-utils-internal": "^10.0.1",
9899
"ts-jest": "^22.0.1",
99100
"ts-node": "^8.10.2",
100101
"tslint": "^5.18.0",
@@ -110,6 +111,5 @@
110111
},
111112
"publishConfig": {
112113
"registry": "https://registry.npmjs.org/"
113-
},
114-
"prettier": {}
114+
}
115115
}

0 commit comments

Comments
 (0)