feat(merge): merge with master

Author: sibelius

package.json

@@ -43,32 +43,30 @@
   },
   "dependencies": {
     "immutable": "^3.8.2",
-    "invariant": "^2.2.2",
-    "jest-cli": "^23.6.0"
+    "invariant": "^2.2.2"
   },
   "peerDependencies": {
     "@types/react-relay": ">=1.3.9",
     "@types/relay-runtime": ">=1.3.5",
-    "graphql-compiler": "*",
-    "relay-compiler": ">=1.7.0",
+    "relay-compiler": ">=2.0.0",
     "relay-runtime": "*",
     "typescript": ">=2.9.1"
   },
   "devDependencies": {
     "@types/graphql": "^0.12.1",
-    "@types/immutable": "3.8.7",
     "@types/invariant": "2.2.29",
     "@types/jest": "^22.0.1",
     "@types/node": "8.5.7",
     "@types/relay-runtime": "^1.3.1",
-    "graphql": "^0.13.2",
+    "graphql": "^14.1.1",
     "husky": "^1.1.0",
     "jest": "^23.6.0",
+    "jest-cli": "^23.6.0",
     "lint-staged": "^7.3.0",
     "prettier": "^1.10.2",
-    "relay-compiler": "^2.0.0-rc.1",
-    "relay-runtime": "^2.0.0-rc.1",
-    "relay-test-utils": "^2.0.0-rc.1",
+    "relay-compiler": "^2.0.0",
+    "relay-runtime": "^2.0.0",
+    "relay-test-utils": "^2.0.0",
     "ts-jest": "^22.0.1",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0",

src/TypeScriptGenerator.ts

@@ -1,34 +1,25 @@
-import { IRTransforms, TypeGenerator } from "relay-compiler";
+import {
+  IRTransforms,
+  TypeGenerator,
+  TypeGeneratorOptions
+} from "relay-compiler";
+import * as RelayCompilerPublic from "relay-compiler/lib/RelayCompilerPublic";
 
-import * as path from "path";
+import { GraphQLNonNull } from "graphql";
 import * as ts from "typescript";
 
 import {
-  GraphQLEnumType,
-  GraphQLNamedType,
-  GraphQLNonNull,
-  GraphQLScalarType,
-  GraphQLType
-} from "graphql";
-import {
-  ScalarTypeMapping,
   State,
   transformInputType,
   transformScalarType
 } from "./TypeScriptTypeTransformers";
 
 // Get the types
 import * as GraphQLCompilerTypes from "graphql-compiler";
-// Load the actual code with a fallback to < Relay 1.6 which changed graphql-compiler to an actual package.
-let GraphQLCompiler: typeof GraphQLCompilerTypes;
-try {
-  GraphQLCompiler = require("relay-compiler/lib/GraphQLCompilerPublic");
-} catch (err) {
-  GraphQLCompiler = require("graphql-compiler");
-}
-const { IRVisitor, SchemaUtils } = GraphQLCompiler;
 
-import { TypeGeneratorOptions } from "relay-compiler";
+const GraphQLCompiler: typeof GraphQLCompilerTypes = RelayCompilerPublic;
+
+const { IRVisitor, SchemaUtils } = GraphQLCompiler;
 
 const { isAbstractType } = SchemaUtils;
 

test/TypeScriptGenerator-test.ts

@@ -8,7 +8,8 @@ import * as TypeScriptGenerator from '../src/TypeScriptGenerator'
 
 function generate(text, options) {
   const schema = transformASTSchema(RelayTestSchema, [
-    IRTransforms.schemaExtensions[1], // RelayRelayDirectiveTransform.SCHEMA_EXTENSION,
+    IRTransforms.schemaExtensions[1], // RelayMatchTransform.SCHEMA_EXTENSION,
+    IRTransforms.schemaExtensions[2], // RelayRelayDirectiveTransform.SCHEMA_EXTENSION,
   ]);
   const {definitions} = parseGraphQLText(schema, text);
   return new GraphQLCompilerContext(RelayTestSchema, schema)
@@ -42,6 +43,7 @@ describe('TypeScriptGenerator without a single artifact directory', () => {
       optionalInputFields: [],
       relayRuntimeModule: 'relay-runtime',
       useHaste: false,
+      useSingleArtifactDirectory: false,
     }),
   );
 });