Merge pull request #20 from lirown/oriw-fix-old-gql-versions

load GraphQLCustomDirective with fallback path

Author: lirown

src/custom.js

@@ -99,6 +99,7 @@ function resolveMiddlewareWrapper(resolve = defaultResolveFn, directives = {}) {
     );
     defer.catch(e =>
       resolveWithDirective(
+        /* istanbul ignore next */
         () => Promise.reject(e),
         source,
         directive,

src/directiveLocation.js

@@ -0,0 +1,12 @@
+/**
+ * Resolve DirectiveLocation with fallback due to graphql breacking changes of module location
+ */
+let DirectiveLocation;
+try {
+  DirectiveLocation = require('graphql/language/directiveLocation')
+} catch (e) {
+  /* istanbul ignore next */
+  DirectiveLocation = require('graphql/type/directives')
+}
+
+module.exports = DirectiveLocation

src/directives/currency.js

@@ -1,5 +1,5 @@
 import {GraphQLString} from 'graphql';
-import {DirectiveLocation} from 'graphql/language/directiveLocation';
+import {DirectiveLocation} from '../directiveLocation';
 import {GraphQLCustomDirective} from '../custom';
 
 import numeral from 'numeral';

src/directives/date.js

@@ -1,5 +1,5 @@
 import {GraphQLString, GraphQLBoolean} from 'graphql';
-import {DirectiveLocation} from 'graphql/language/directiveLocation';
+import {DirectiveLocation} from '../directiveLocation';
 import {GraphQLCustomDirective} from '../custom';
 import {_} from 'lodash';
 

src/directives/number.js

@@ -1,5 +1,5 @@
 import {GraphQLString} from 'graphql';
-import {DirectiveLocation} from 'graphql/language/directiveLocation';
+import {DirectiveLocation} from '../directiveLocation';
 import {GraphQLCustomDirective} from '../custom';
 
 import numeral from 'numeral';

src/directives/string.js

@@ -1,4 +1,4 @@
-import {DirectiveLocation} from 'graphql/language/directiveLocation';
+import {DirectiveLocation} from '../directiveLocation';
 import {GraphQLString, GraphQLNonNull} from 'graphql';
 import {GraphQLCustomDirective} from '../custom';