naystack 1.7.5 → 1.7.6

package/dist/auth/client.cjs.js

@@ -112,14 +112,17 @@ var AuthWrapper = ({
   skipInitialFetch
 }) => {
   const [token, setToken] = (0, import_react.useState)();
-  useAuthFetch({ getRefreshToken, skip: skipInitialFetch });
   (0, import_react.useEffect)(() => {
     if (onTokenUpdate && token !== void 0) {
       onTokenUpdate(token);
     }
   }, [token]);
-  return /* @__PURE__ */ import_react.default.createElement(TokenContext.Provider, { value: { token, setToken } }, children);
+  return /* @__PURE__ */ import_react.default.createElement(TokenContext.Provider, { value: { token, setToken } }, !skipInitialFetch && /* @__PURE__ */ import_react.default.createElement(AuthChildComponent, { getRefreshToken }), children);
 };
+function AuthChildComponent({ getRefreshToken }) {
+  useAuthFetch({ getRefreshToken });
+  return null;
+}
 function useAuthFetch({ getRefreshToken, skip }) {
   const setToken = useSetToken();
   const fetchToken = async () => {

package/dist/auth/client.esm.js

@@ -74,14 +74,17 @@ var AuthWrapper = ({
   skipInitialFetch
 }) => {
   const [token, setToken] = useState();
-  useAuthFetch({ getRefreshToken, skip: skipInitialFetch });
   useEffect(() => {
     if (onTokenUpdate && token !== void 0) {
       onTokenUpdate(token);
     }
   }, [token]);
-  return /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, children);
+  return /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, !skipInitialFetch && /* @__PURE__ */ React.createElement(AuthChildComponent, { getRefreshToken }), children);
 };
+function AuthChildComponent({ getRefreshToken }) {
+  useAuthFetch({ getRefreshToken });
+  return null;
+}
 function useAuthFetch({ getRefreshToken, skip }) {
   const setToken = useSetToken();
   const fetchToken = async () => {

package/dist/auth/email/client.cjs.js

@@ -109,14 +109,17 @@ var AuthWrapper = ({
   skipInitialFetch
 }) => {
   const [token, setToken] = (0, import_react.useState)();
-  useAuthFetch({ getRefreshToken, skip: skipInitialFetch });
   (0, import_react.useEffect)(() => {
     if (onTokenUpdate && token !== void 0) {
       onTokenUpdate(token);
     }
   }, [token]);
-  return /* @__PURE__ */ import_react.default.createElement(TokenContext.Provider, { value: { token, setToken } }, children);
+  return /* @__PURE__ */ import_react.default.createElement(TokenContext.Provider, { value: { token, setToken } }, !skipInitialFetch && /* @__PURE__ */ import_react.default.createElement(AuthChildComponent, { getRefreshToken }), children);
 };
+function AuthChildComponent({ getRefreshToken }) {
+  useAuthFetch({ getRefreshToken });
+  return null;
+}
 function useAuthFetch({ getRefreshToken, skip }) {
   const setToken = useSetToken();
   const fetchToken = async () => {

package/dist/auth/email/client.esm.js

@@ -74,14 +74,17 @@ var AuthWrapper = ({
   skipInitialFetch
 }) => {
   const [token, setToken] = useState();
-  useAuthFetch({ getRefreshToken, skip: skipInitialFetch });
   useEffect(() => {
     if (onTokenUpdate && token !== void 0) {
       onTokenUpdate(token);
     }
   }, [token]);
-  return /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, children);
+  return /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, !skipInitialFetch && /* @__PURE__ */ React.createElement(AuthChildComponent, { getRefreshToken }), children);
 };
+function AuthChildComponent({ getRefreshToken }) {
+  useAuthFetch({ getRefreshToken });
+  return null;
+}
 function useAuthFetch({ getRefreshToken, skip }) {
   const setToken = useSetToken();
   const fetchToken = async () => {

package/dist/auth/index.cjs.js

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var auth_exports = {};
 __export(auth_exports, {
   AuthFetch: () => AuthFetch,
+  AuthWrapper: () => AuthWrapper,
   checkAuthStatus: () => checkAuthStatus,
   getContext: () => getContext,
   getRefreshToken: () => getRefreshToken,
@@ -416,6 +417,9 @@ function AuthFetch() {
     }
   );
 }
+function AuthWrapper({ children, getRefreshToken: getRefreshToken2, onTokenUpdate, skipInitialFetch }) {
+  return /* @__PURE__ */ import_react3.default.createElement(import_react3.default.Fragment, null, /* @__PURE__ */ import_react3.default.createElement(import_client2.AuthWrapper, { skipInitialFetch: true, getRefreshToken: getRefreshToken2, onTokenUpdate }, !skipInitialFetch && /* @__PURE__ */ import_react3.default.createElement(AuthFetch, null), children));
+}
 
 // src/auth/email/index.ts
 function setupEmailAuth(options) {
@@ -642,6 +646,7 @@ async function getRefreshToken() {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AuthFetch,
+  AuthWrapper,
   checkAuthStatus,
   getContext,
   getRefreshToken,

package/dist/auth/index.d.mts

@@ -1,8 +1,8 @@
 export { setupEmailAuth } from './email/index.mjs';
-export { setupGoogleAuth } from './google/index.mjs';
-export { setupInstagramAuth } from './instagram/index.mjs';
+export { SetupGoogleAuthOptions, setupGoogleAuth } from './google/index.mjs';
+export { SetupInstagramAuthOptions, setupInstagramAuth } from './instagram/index.mjs';
 export { getRefreshToken } from './utils/token.mjs';
-export { AuthFetch } from './email/next.mjs';
+export { AuthFetch, AuthWrapper } from './email/next.mjs';
 export { checkAuthStatus } from './email/token.mjs';
 export { getContext } from './email/utils.mjs';
 export { getRefreshedInstagramAccessToken } from './instagram/utils.mjs';

package/dist/auth/index.d.ts

@@ -1,8 +1,8 @@
 export { setupEmailAuth } from './email/index.js';
-export { setupGoogleAuth } from './google/index.js';
-export { setupInstagramAuth } from './instagram/index.js';
+export { SetupGoogleAuthOptions, setupGoogleAuth } from './google/index.js';
+export { SetupInstagramAuthOptions, setupInstagramAuth } from './instagram/index.js';
 export { getRefreshToken } from './utils/token.js';
-export { AuthFetch } from './email/next.js';
+export { AuthFetch, AuthWrapper } from './email/next.js';
 export { checkAuthStatus } from './email/token.js';
 export { getContext } from './email/utils.js';
 export { getRefreshedInstagramAccessToken } from './instagram/utils.js';

package/dist/auth/index.esm.js

@@ -377,6 +377,9 @@ function AuthFetch() {
     }
   );
 }
+function AuthWrapper({ children, getRefreshToken: getRefreshToken2, onTokenUpdate, skipInitialFetch }) {
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(AuthWrapperClient, { skipInitialFetch: true, getRefreshToken: getRefreshToken2, onTokenUpdate }, !skipInitialFetch && /* @__PURE__ */ React2.createElement(AuthFetch, null), children));
+}
 
 // src/auth/email/index.ts
 function setupEmailAuth(options) {
@@ -602,6 +605,7 @@ async function getRefreshToken() {
 }
 export {
   AuthFetch,
+  AuthWrapper,
   checkAuthStatus,
   getContext,
   getRefreshToken,

package/dist/graphql/client.cjs.js

@@ -31,15 +31,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/graphql/client.tsx
 var client_exports = {};
 __export(client_exports, {
-  ApolloWrapper: () => ApolloWrapper,
+  ApolloWrapperClient: () => ApolloWrapperClient,
+  ApolloWrapperNext: () => ApolloWrapper,
   tokenContext: () => tokenContext,
   useAuthMutation: () => useAuthMutation,
   useAuthQuery: () => useAuthQuery
 });
 module.exports = __toCommonJS(client_exports);
-var import_client = require("@apollo/client");
-var import_client2 = require("naystack/auth/client");
-var import_react = __toESM(require("react"));
+var import_client2 = require("@apollo/client");
+var import_client3 = require("naystack/auth/client");
+var import_react2 = __toESM(require("react"));
 
 // src/env.ts
 var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
@@ -91,10 +92,13 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/graphql/client.tsx
+// src/graphql/next.tsx
+var import_client = require("@apollo/client");
+var import_client_integration_nextjs = require("@apollo/client-integration-nextjs");
+var import_react = __toESM(require("react"));
 function makeClient(cacheConfig) {
-  return new import_client.ApolloClient({
-    cache: new import_client.InMemoryCache(cacheConfig),
+  return new import_client_integration_nextjs.ApolloClient({
+    cache: new import_client_integration_nextjs.InMemoryCache(cacheConfig),
     link: new import_client.HttpLink({
       uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
     })
@@ -104,7 +108,23 @@ var ApolloWrapper = ({
   children,
   cacheConfig
 }) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_client.ApolloProvider, { client: makeClient(cacheConfig) }, children);
+  return /* @__PURE__ */ import_react.default.createElement(import_client_integration_nextjs.ApolloNextAppProvider, { makeClient: () => makeClient(cacheConfig) }, children);
+};
+
+// src/graphql/client.tsx
+function makeClient2(cacheConfig) {
+  return new import_client2.ApolloClient({
+    cache: new import_client2.InMemoryCache(cacheConfig),
+    link: new import_client2.HttpLink({
+      uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
+    })
+  });
+}
+var ApolloWrapperClient = ({
+  children,
+  cacheConfig
+}) => {
+  return /* @__PURE__ */ import_react2.default.createElement(import_client2.ApolloProvider, { client: makeClient2(cacheConfig) }, children);
 };
 var tokenContext = (token) => {
   if (!token) return void 0;
@@ -116,12 +136,12 @@ var tokenContext = (token) => {
   };
 };
 function useAuthQuery(query, variables) {
-  const token = (0, import_client2.useToken)();
-  const [fetch, result] = (0, import_client.useLazyQuery)(query, {
+  const token = (0, import_client3.useToken)();
+  const [fetch, result] = (0, import_client2.useLazyQuery)(query, {
     fetchPolicy: "no-cache"
   });
-  const prevVarsRef = (0, import_react.useRef)(null);
-  (0, import_react.useEffect)(() => {
+  const prevVarsRef = (0, import_react2.useRef)(null);
+  (0, import_react2.useEffect)(() => {
     const serialized = JSON.stringify(variables);
     if (token && variables && prevVarsRef.current !== serialized) {
       prevVarsRef.current = serialized;
@@ -132,7 +152,7 @@ function useAuthQuery(query, variables) {
       });
     }
   }, [fetch, token, variables]);
-  const reFetch = (0, import_react.useCallback)(
+  const reFetch = (0, import_react2.useCallback)(
     (input) => fetch({
       // @ts-expect-error -- to allow dynamic props
       variables: { input },
@@ -143,9 +163,9 @@ function useAuthQuery(query, variables) {
   return [reFetch, { ...result, hasAuth: !!token }];
 }
 function useAuthMutation(mutation, options) {
-  const token = (0, import_client2.useToken)();
-  const [mutate, result] = (0, import_client.useMutation)(mutation, options);
-  const method = (0, import_react.useCallback)(
+  const token = (0, import_client3.useToken)();
+  const [mutate, result] = (0, import_client2.useMutation)(mutation, options);
+  const method = (0, import_react2.useCallback)(
     (input) => mutate({
       // @ts-expect-error -- to allow dynamic props
       variables: { input },
@@ -157,7 +177,8 @@ function useAuthMutation(mutation, options) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ApolloWrapper,
+  ApolloWrapperClient,
+  ApolloWrapperNext,
   tokenContext,
   useAuthMutation,
   useAuthQuery

package/dist/graphql/client.d.mts

@@ -3,8 +3,9 @@ import * as _apollo_client from '@apollo/client';
 import { InMemoryCacheConfig, OperationVariables, ApolloClient, MutationHookOptions } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import React__default, { PropsWithChildren } from 'react';
+export { ApolloWrapper as ApolloWrapperNext } from './next.mjs';
 
-declare const ApolloWrapper: ({ children, cacheConfig, }: PropsWithChildren<{
+declare const ApolloWrapperClient: ({ children, cacheConfig, }: PropsWithChildren<{
     cacheConfig?: InMemoryCacheConfig;
 }>) => React__default.JSX.Element;
 /**
@@ -129,4 +130,4 @@ declare function useAuthMutation<T, V extends OperationVariables>(mutation: Type
     readonly reset: () => void;
 }];
 
-export { ApolloWrapper, tokenContext, useAuthMutation, useAuthQuery };
+export { ApolloWrapperClient, tokenContext, useAuthMutation, useAuthQuery };

package/dist/graphql/client.d.ts

@@ -3,8 +3,9 @@ import * as _apollo_client from '@apollo/client';
 import { InMemoryCacheConfig, OperationVariables, ApolloClient, MutationHookOptions } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import React__default, { PropsWithChildren } from 'react';
+export { ApolloWrapper as ApolloWrapperNext } from './next.js';
 
-declare const ApolloWrapper: ({ children, cacheConfig, }: PropsWithChildren<{
+declare const ApolloWrapperClient: ({ children, cacheConfig, }: PropsWithChildren<{
     cacheConfig?: InMemoryCacheConfig;
 }>) => React__default.JSX.Element;
 /**
@@ -129,4 +130,4 @@ declare function useAuthMutation<T, V extends OperationVariables>(mutation: Type
     readonly reset: () => void;
 }];
 
-export { ApolloWrapper, tokenContext, useAuthMutation, useAuthQuery };
+export { ApolloWrapperClient, tokenContext, useAuthMutation, useAuthQuery };

package/dist/graphql/client.esm.js

@@ -2,15 +2,15 @@
 
 // src/graphql/client.tsx
 import {
-  ApolloClient,
+  ApolloClient as ApolloClient2,
   ApolloProvider,
-  HttpLink,
-  InMemoryCache,
+  HttpLink as HttpLink2,
+  InMemoryCache as InMemoryCache2,
   useLazyQuery,
   useMutation
 } from "@apollo/client";
 import { useToken } from "naystack/auth/client";
-import React, {
+import React2, {
   useCallback,
   useEffect,
   useRef
@@ -66,7 +66,14 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/graphql/client.tsx
+// src/graphql/next.tsx
+import { HttpLink } from "@apollo/client";
+import {
+  ApolloClient,
+  ApolloNextAppProvider,
+  InMemoryCache
+} from "@apollo/client-integration-nextjs";
+import React from "react";
 function makeClient(cacheConfig) {
   return new ApolloClient({
     cache: new InMemoryCache(cacheConfig),
@@ -79,7 +86,23 @@ var ApolloWrapper = ({
   children,
   cacheConfig
 }) => {
-  return /* @__PURE__ */ React.createElement(ApolloProvider, { client: makeClient(cacheConfig) }, children);
+  return /* @__PURE__ */ React.createElement(ApolloNextAppProvider, { makeClient: () => makeClient(cacheConfig) }, children);
+};
+
+// src/graphql/client.tsx
+function makeClient2(cacheConfig) {
+  return new ApolloClient2({
+    cache: new InMemoryCache2(cacheConfig),
+    link: new HttpLink2({
+      uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
+    })
+  });
+}
+var ApolloWrapperClient = ({
+  children,
+  cacheConfig
+}) => {
+  return /* @__PURE__ */ React2.createElement(ApolloProvider, { client: makeClient2(cacheConfig) }, children);
 };
 var tokenContext = (token) => {
   if (!token) return void 0;
@@ -131,7 +154,8 @@ function useAuthMutation(mutation, options) {
   return [method, { ...result, hasAuth: !!token }];
 }
 export {
-  ApolloWrapper,
+  ApolloWrapperClient,
+  ApolloWrapper as ApolloWrapperNext,
   tokenContext,
   useAuthMutation,
   useAuthQuery

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "A stack built with Next + GraphQL + S3 + Auth",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -33,11 +33,6 @@
       "import": "./dist/graphql/client.esm.js",
       "require": "./dist/graphql/client.cjs.js"
     },
-    "./graphql/next": {
-      "types": "./dist/graphql/next.d.ts",
-      "import": "./dist/graphql/next.esm.js",
-      "require": "./dist/graphql/next.cjs.js"
-    },
     "./file": {
       "types": "./dist/file/index.d.ts",
       "import": "./dist/file/index.esm.js",