Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.

Commit cbd2748

Browse files
authored
Merge pull request #134 from relay-tools/upgrade-to-relay-v6
[WIP] Upgrade to relay v6
2 parents 83962d2 + 499d697 commit cbd2748

40 files changed

+2819
-1362
lines changed

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"prettier": "prettier --write '{src,types,test}/**/*.ts'",
3939
"prepublish": "npm run build",
4040
"relay": "node bin/relay-compiler.js --schema test/schema.graphql --src test/ --outputDir __generated__",
41-
"sync-fixtures": "rsync -avh --delete --stats --progress ../relay/packages/relay-compiler/language/javascript/__tests__/fixtures/flow-generator/*.graphql test/fixtures/type-generator",
41+
"sync-fixtures": "rsync -avh --delete --stats --progress ../relay/packages/relay-compiler/language/javascript/__tests__/fixtures/flow-generator/**/*.graphql test/fixtures/type-generator",
4242
"test": "npm run type-check && jest",
4343
"type-check": "tsc --noEmit --pretty"
4444
},
@@ -79,16 +79,17 @@
7979
"@types/invariant": "2.2.30",
8080
"@types/jest": "^24.0.17",
8181
"@types/node": "8.10.51",
82-
"@types/relay-runtime": "^5.0.3",
82+
"@types/relay-compiler": "^6.0.1",
83+
"@types/relay-runtime": "^6.0.0",
8384
"graphql": "^14.4.2",
8485
"husky": "^3.0.2",
8586
"jest": "^24.8.0",
8687
"jest-cli": "^24.8.0",
8788
"lint-staged": "^9.2.1",
8889
"prettier": "^1.18.2",
89-
"relay-compiler": "^4.0.0",
90-
"relay-runtime": "^4.0.0",
91-
"relay-test-utils": "^4.0.0",
90+
"relay-compiler": "^6.0.0",
91+
"relay-runtime": "^6.0.0",
92+
"relay-test-utils-internal": "^6.0.0",
9293
"ts-jest": "^22.0.1",
9394
"tslint": "^5.18.0",
9495
"tslint-config-prettier": "^1.18.0",

src/FindGraphQLTags.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
import * as path from "path";
21
import * as ts from "typescript";
32
import * as util from "util";
43

5-
import { GraphQLTag, GraphQLTagFinder } from "relay-compiler";
6-
import { isPropertyAccessOrQualifiedName } from "typescript";
7-
import { callbackify } from "util";
8-
9-
interface Location {
10-
line: number;
11-
column: number;
12-
}
4+
import {
5+
GraphQLTag,
6+
GraphQLTagFinder
7+
} from "relay-compiler/lib/language/RelayLanguagePluginInterface";
138

149
function isCreateContainerFunction(
1510
fnName: string

0 commit comments

Comments
 (0)