Revert #124

lib/butter.js

@@ -46,8 +46,12 @@ export default function (apiToken, options = {}) {
     if (!apiToken) {
         throw 'ButterCMS API token not set';
     }
-
-    return new Butter(apiToken, options);
+
+    if (!(this instanceof Butter)) {
+        return new Butter(apiToken, options);
+    }
+
+    return Butter
 };
 
 /**

lib/useButter.js

@@ -78,14 +78,13 @@ export default function useButter(type, butterConfig) {
         try {
             // use static abortSignal timeout functionality to relay a cancelation 
             // when timeout is reached
-            // if AbortSignal.timeout doesn't exist (React Native/Node.js), use a regular timeout
-            let timeoutId;
+            // if AbortSignal.timeout doestn't exist (React Native), use a regular timeotu
             const timeoutSignal = AbortSignal.timeout 
                 ? AbortSignal.timeout(config.timeout)
-                : (timeoutId = setTimeout(
+                : setTimeout(
                     () => abortOnTimeout(config.timeout),
                     config.timeout
-                ))
+                )
 
             const response = await fetch(
                 `${apiEndpoint}?${new URLSearchParams(params)}`,
@@ -101,10 +100,10 @@ export default function useButter(type, butterConfig) {
                 }
             );
 
-            if (!AbortSignal.timeout && timeoutId) {
-                // if we are running on a regular timeout, 
+            if (!AbortSignal.timeout) {
+                // if we are running on a regular timout, 
                 // clear it after its use
-                clearTimeout(timeoutId)
+                clearTimeout(timeoutSignal)
             }
 
             cleanup();