Remove beta version of Apollo 3.0

Author: w3bdesign

components/Cart/AddToCartButton.component.jsx

@@ -3,7 +3,7 @@ import { request } from 'graphql-request';
 import useSWR from 'swr';
 import { v4 as uuidv4 } from 'uuid';
 
-import { useQuery, useMutation } from '@apollo/client';
+import { useQuery, useMutation } from '@apollo/react-hooks';
 
 import { AppContext } from 'utils/context/AppContext';
 
@@ -37,26 +37,21 @@ const AddToCartButton = (props) => {
     productId: product.productId,
   };
 
-
-  	// Get Cart Data.
-	const { loading, error, data, refetch } = useQuery( GET_CART, {
-		notifyOnNetworkStatusChange: true,
-		onCompleted: () => {		
-
-      console.log("Data from add to cart button: ");
+  // Get Cart Data.
+  const { loading, error, data, refetch } = useQuery(GET_CART, {
+    notifyOnNetworkStatusChange: true,
+    onCompleted: () => {
+      console.log('Data from add to cart button: ');
       console.log(data);
-			// Update cart in the localStorage.
-      const updatedCart = getFormattedCart( data );
-      
+      // Update cart in the localStorage.
+      const updatedCart = getFormattedCart(data);
 
-			localStorage.setItem( 'woocommerce-cart', JSON.stringify( updatedCart ) );
+      localStorage.setItem('woocommerce-cart', JSON.stringify(updatedCart));
 
-			// Update cart data in React Context.
-      setCart( updatedCart );
-    
-		}
-  } );
-  
+      // Update cart data in React Context.
+      setCart(updatedCart);
+    },
+  });
 
   const [
     addToCart,

components/Cart/CartPage/CartItemsContainer.component.jsx

@@ -2,7 +2,7 @@ import Link from 'next/link';
 import { v4 } from 'uuid';
 import { useContext, useState, useEffect } from 'react';
 
-import { useQuery, useMutation } from '@apollo/client';
+import { useQuery, useMutation } from '@apollo/react-hooks';
 
 import { AppContext } from 'utils/context/AppContext';
 import {

components/Checkout/CheckoutForm.component.jsx

@@ -1,15 +1,11 @@
 import { useState, useContext, useEffect } from 'react';
-import { useQuery, useMutation } from '@apollo/client';
+import { useQuery, useMutation } from '@apollo/react-hooks';
 
 import { GET_CART } from 'utils/const/GQL_QUERIES';
 import { INITIAL_STATE } from 'utils/const/INITIAL_STATE';
 import { AppContext } from 'utils/context/AppContext';
 
-import {
-  getFormattedCart,
-  getUpdatedItems,
-  removeItemFromCart,
-} from 'utils/functions/functions';
+import { getFormattedCart } from 'utils/functions/functions';
 
 const CheckoutForm = () => {
   const [cart, setCart] = useContext(AppContext);
@@ -50,7 +46,7 @@ const CheckoutForm = () => {
 
   useEffect(() => {
     if (null !== orderData) {
-      // Call the checkout mutation when the value for orderData changes/updates.
+      // Do checkout mutation when the value for orderData changes.
       // checkout();
     }
   }, [orderData]);

package-lock.json

@@ -12,7 +12,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@apollo/client": "^3.0.0-rc.2",
+    "@apollo/react-hooks": "^3.1.5",
     "algoliasearch": "^4.2.0",
     "apollo-boost": "^0.4.9",
     "apollo-cache-inmemory": "^1.6.6",

package.json

@@ -1,4 +1,4 @@
-import { ApolloProvider } from '@apollo/client';
+import { ApolloProvider } from '@apollo/react-hooks';
 
 import { AppProvider } from 'utils/context/AppContext';
 

pages/_app.js

@@ -47,13 +47,6 @@ export async function getServerSideProps() {
     query: FETCH_ALL_PRODUCTS_QUERY,
   });
 
-  //console.log("getServerSideProps data: ")
-  //console.log(data)
-  console.log('getServerSideProps networkStatus: ');
-  console.log(networkStatus);
-  console.log('getServerSideProps loading: ');
-  console.log(loading);
-
   return {
     props: {
       // products: result.data.products.nodes,