feat: move from apollo to nhost.graphql.request

since we don't import react here apollo breaks some of parcels code optimization

Author: linden

packages/app/package.json

@@ -12,7 +12,6 @@
     "dev": "parcel watch"
   },
   "dependencies": {
-    "@apollo/client": "^3.6.9",
     "@firebase-proxy/core": "file:../core",
     "@nhost/nhost-js": "^1.4.11"
   },

packages/app/src/index.js

@@ -1,6 +1,4 @@
 import { NhostClient } from "@nhost/nhost-js";
-import { ApolloClient, InMemoryCache } from "@apollo/client/core";
-
 import { Logger } from "@firebase-proxy/core";
 
 export const logger = new Logger("firestore");
@@ -13,21 +11,6 @@ export function initializeApp(configuration) {
   			subdomain: process.env.REACT_APP_NHOST_SUBDOMAIN || "localhost",
   			region: process.env.REACT_APP_NHOST_REGION || null
 		});
-
-		window.apollo = new ApolloClient({
-			uri: window.nhost.graphql.getUrl(),
-			cache: new InMemoryCache(),
-			defaultOptions: {
-      			watchQuery: {
-       				fetchPolicy: "no-cache",
-					errorPolicy: "ignore"
-				},
-				query: {
-					fetchPolicy: "no-cache",
-					errorPolicy: "all"
-      			}
-    		}
-		});
 	}
 
 	return window.nhost;

packages/auth/package.json

@@ -12,9 +12,9 @@
     "dev": "parcel watch"
   },
   "dependencies": {
-    "@apollo/client": "^3.6.9",
     "@firebase-proxy/core": "file:../core",
-    "@nhost/nhost-js": "^1.4.11"
+    "@nhost/nhost-js": "^1.4.11",
+    "graphql-tag": "^2.12.6"
   },
   "devDependencies": {
     "parcel": "^2.7.0"

packages/auth/src/index.js

@@ -1,4 +1,4 @@
-import { gql } from "@apollo/client";
+import { gql } from "graphql-tag";
 import { Logger } from "@firebase-proxy/core";
 
 export const logger = new Logger("auth");
@@ -62,25 +62,21 @@ export function onAuthStateChanged(auth, callback) {
 export async function fetchSignInMethodsForEmail(auth, email) {
 	logger.log("fetchSignInMethodsForEmail", { auth, email });
 
-	if (!window.apollo) {
-		logger.log("apollo has not started");
+	if (!window.nhost) {
+		logger.log("nhost has not started");
 
 		return [];
 	}
 
-	const result = await window.apollo.query({ 
-		query: gql`
+	const result = await window.graphql.request.query(gql`
 		query CheckEmail($email: citext) {
 			users(where: {email: {_eq: $email}}) {
 				emailVerified
 			}
-		}`,
-		variables: {
-			email
 		}
-	});
+	`, { email });
 
-	if (!result || !result.data || !result.data.users[0] ) {
+	if (result.error || !result.data || !result.data.users[0]) {
 		logger.log("user does not exist", { email });
 
 		return [];

packages/firestore/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@firebase-proxy/firestore",
   "version": "0.0.1",
-  "main": "src/index.js",
+  "source": "src/index.js",
+  "main": "dist/index.js",
   "author": "",
-	"files": ["dist"],
+	"files": [
+    "dist"
+  ],
   "scripts": {
-    "build": "npm install --save-dev && rollup -c",
-    "dev": "npm install --save-dev && rollup -c -w"
+    "build": "parcel build",
+    "dev": "parcel watch"
   },
   "dependencies": {
-    "@apollo/client": "^3.6.9",
-    "@firebase-proxy/core": "file:../core"
+    "@firebase-proxy/core": "file:../core",
+    "graphql-tag": "^2.12.6"
   },
   "devDependencies": {
-    "rollup": "2.72.1"
+    "parcel": "^2.7.0"
   }
 }

packages/firestore/src/index.js

@@ -1,4 +1,4 @@
-import { gql } from "@apollo/client";
+import { gql } from "graphql-tag";
 import { Logger } from "@firebase-proxy/core";
 
 export const logger = new Logger("firestore");
@@ -49,6 +49,12 @@ export function query() {
 export async function setDoc(query, value) {
 	logger.log("setting document", { query, value });
 
+	if (!window.nhost) {
+		logger.log("nhost has not started");
+
+		return null;
+	}
+
 	const mapping = schema.mapping[query.content.table];
 
 	if (!mapping) {
@@ -73,18 +79,13 @@ export async function setDoc(query, value) {
 
 	logger.log("mapped values", { mapped });
 
-	const result = await window.apollo.mutate({ 
-	 	mutation: gql`
-	 		mutation SetDoc($value: ${mapping.name}_insert_input!) {
-				insert_${mapping.name}_one(object: $value) {
- 					ID
-				}
- 			}
- 		`,
-		variables: {
-			value: mapped
-		}
-	});
+	const result = await window.nhost.graphql.request(gql`
+		mutation SetDoc($value: ${mapping.name}_insert_input!) {
+			insert_${mapping.name}_one(object: $value) {
+ 				ID
+			}
+ 		}
+ 	`, { value: mapped });
 
 	logger.log("result", { result });
 }
@@ -113,8 +114,8 @@ class Document {
 }
 
 async function getDocuments(query) {
-	if (!window.apollo) {
-		logger.log("apollo has not started");
+	if (!window.nhost) {
+		logger.log("nhost has not started");
 
 		return null;
 	}
@@ -202,18 +203,13 @@ async function getDocuments(query) {
 
 	logger.log("got where statement", { where, query });
 
-	const result = await window.apollo.query({ 
-		query: gql`
-			query GetDoc($where: ${mapping.name}_bool_exp) {
-				${mapping.name}(where: $where) {
-					${Object.values(mapping.fields).join("\n")}
-				}
+	const result = await window.nhost.graphql.request(gql`
+		query GetDoc($where: ${mapping.name}_bool_exp) {
+			${mapping.name}(where: $where) {
+				${Object.values(mapping.fields).join("\n")}
 			}
-		`,
-		variables: { 
-			where: where
 		}
-	});
+	`, { where });
 
 	logger.log("got result", { result, query });