Merge pull request #194 from JakubMarkiewicz/fix/jsx3-gqltag-import

Change graphql-tag import to default jsx3-hooks
apollographql · May 30, 2019 · aee51fb · aee51fb
2 parents 0f4306e + 2e1ed51
commit aee51fb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/examples/realtime-chat-application/src/MessagesContainer.re b/examples/realtime-chat-application/src/MessagesContainer.re
@@ -1,4 +1,4 @@
-[@bs.module] external gql: ReasonApolloTypes.gql = "graphql-tag";
+[@bs.module "graphql-tag"] external gql: ReasonApolloTypes.gql = "default";
 
 module Styles = {
   open Css;
@@ -62,7 +62,6 @@ let make = _children => {
                           function(prev, next) {
                             if(!next.subscriptionData.data || !next.subscriptionData.data.messageAdded)
                               return prev;
-
                             return Object.assign({}, prev, {
                               messages: prev.messages.concat(next.subscriptionData.data.messageAdded)
                             });
@@ -80,4 +79,4 @@ let make = _children => {
       }
     </GetAllMessagesQuery>
 </div>
-};
+};
diff --git a/examples/swapi/src/PersonSubscribeToMore.re b/examples/swapi/src/PersonSubscribeToMore.re
@@ -1,4 +1,4 @@
-[@bs.module] external gql: ReasonApolloTypes.gql = "graphql-tag";
+  [@bs.module "graphql-tag"] external gql: ReasonApolloTypes.gql = "default";
 
 let ste = React.string;
 

diff --git a/src/ApolloClient.re b/src/ApolloClient.re
@@ -48,6 +48,8 @@ type uploadLinkOptions = {
 [@bs.module "apollo-client"] [@bs.new]
 external createApolloClientJS: 'a => generatedApolloClient = "ApolloClient";
 
+[@bs.module "graphql-tag"] external gql: ReasonApolloTypes.gql = "default";
+
 [@bs.obj]
 external apolloClientObjectParam:
   (
@@ -62,7 +64,6 @@ external apolloClientObjectParam:
   "";
 
 module ReadQuery = (Config: ReasonApolloTypes.Config) => {
-  [@bs.module] external gql: ReasonApolloTypes.gql = "graphql-tag";
   type readQueryOptions = {
     .
     "query": ReasonApolloTypes.queryString,
@@ -91,7 +92,6 @@ module ReadQuery = (Config: ReasonApolloTypes.Config) => {
 };
 
 module WriteQuery = (Config: ReasonApolloTypes.Config) => {
-  [@bs.module] external gql: ReasonApolloTypes.gql = "graphql-tag";
   type writeQueryOptions = {
     .
     "query": ReasonApolloTypes.queryString,

diff --git a/src/graphql-types/ReasonApolloMutation.re b/src/graphql-types/ReasonApolloMutation.re
@@ -20,7 +20,7 @@ module Make = (Config: Config) => {
     } =
     "%identity";
 
-  [@bs.module] external gql: ReasonApolloTypes.gql = "graphql-tag";
+  [@bs.module "graphql-tag"] external gql: ReasonApolloTypes.gql = "default";
 
   let graphqlMutationAST = gql(. Config.query);
   type response = mutationResponse(Config.t);

diff --git a/src/graphql-types/ReasonApolloQuery.re b/src/graphql-types/ReasonApolloQuery.re
@@ -50,7 +50,7 @@ type renderPropObjJS = {
 };
 
 module Make = (Config: ReasonApolloTypes.Config) => {
-  [@bs.module] external gql: ReasonApolloTypes.gql = "graphql-tag";
+  [@bs.module "graphql-tag"] external gql: ReasonApolloTypes.gql = "default";
 
   type response = queryResponse(Config.t);
 

diff --git a/src/graphql-types/ReasonApolloSubscription.re b/src/graphql-types/ReasonApolloSubscription.re
@@ -1,7 +1,7 @@
 open ReasonApolloTypes;
 
 module Make = (Config: ReasonApolloTypes.Config) => {
-  [@bs.module] external gql: ReasonApolloTypes.gql = "graphql-tag";
+  [@bs.module "graphql-tag"] external gql: ReasonApolloTypes.gql = "default";
 
   let graphQLSubscriptionAST = gql(. Config.query);