@okam/directus-block 1.3.1 → 1.3.2

package/{directus-block/src/components → components}/BlockDispatcher/index.js

@@ -1,10 +1,7 @@
 "use strict";
 const jsxRuntime = require("react/jsx-runtime");
-require("@tanstack/react-query");
+require("@okam/directus-query");
 require("radash");
-require("../../../../directus-query/src/lib/request.js");
-require("graphql-request");
-require("../../../../directus-query/src/lib/config.js");
 const mergeConfigs = require("../../utils/merge-configs.js");
 const index = require("../BlockSerializer/index.js");
 const config = require("./config.js");

package/{directus-block/src/components → components}/BlockDispatcher/index.mjs

@@ -1,9 +1,6 @@
 import { jsx } from "react/jsx-runtime";
-import "@tanstack/react-query";
+import "@okam/directus-query";
 import "radash";
-import "../../../../directus-query/src/lib/request.mjs";
-import "graphql-request";
-import "../../../../directus-query/src/lib/config.mjs";
 import mergeConfigs from "../../utils/merge-configs.mjs";
 import BlockSerializer from "../BlockSerializer/index.mjs";
 import baseConfig from "./config.mjs";

package/{directus-block/src/components → components}/BlockSerializer/index.js

@@ -2,11 +2,8 @@
 const jsxRuntime = require("react/jsx-runtime");
 const graphql = require("../../generated/graphql.js");
 const fragmentMasking = require("../../generated/fragment-masking.js");
-require("@tanstack/react-query");
+require("@okam/directus-query");
 require("radash");
-require("../../../../directus-query/src/lib/request.js");
-require("graphql-request");
-require("../../../../directus-query/src/lib/config.js");
 const BlockSerializer = (props) => {
   var _a, _b, _c;
   const { item, collection, config, variables, defaultVariant, ...rest } = props;

package/{directus-block/src/components → components}/BlockSerializer/index.mjs

@@ -1,11 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import { BlockSettingsFragmentDoc } from "../../generated/graphql.mjs";
 import { useFragment } from "../../generated/fragment-masking.mjs";
-import "@tanstack/react-query";
+import "@okam/directus-query";
 import "radash";
-import "../../../../directus-query/src/lib/request.mjs";
-import "graphql-request";
-import "../../../../directus-query/src/lib/config.mjs";
 const BlockSerializer = (props) => {
   var _a, _b, _c;
   const { item, collection, config, variables, defaultVariant, ...rest } = props;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okam/directus-block",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "main": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/server.d.ts

@@ -1,4 +1,5 @@
 export { default as BlockDispatcher } from './components/BlockDispatcher';
 export { default as BlockSerializer } from './components/BlockSerializer';
 export { default as getBlockProps } from './utils/get-block-props';
+export { default as useBlock } from './hooks/useBlock';
 export { default as mergeConfigs } from './utils/merge-configs';

package/{directus-block/src/server.js → server.js}

@@ -4,8 +4,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const index = require("./components/BlockDispatcher/index.js");
 const index$1 = require("./components/BlockSerializer/index.js");
 const getBlockProps = require("./utils/get-block-props.js");
+const useBlock = require("./hooks/useBlock.js");
 const mergeConfigs = require("./utils/merge-configs.js");
 exports.BlockDispatcher = index;
 exports.BlockSerializer = index$1;
 exports.getBlockProps = getBlockProps;
+exports.useBlock = useBlock;
 exports.mergeConfigs = mergeConfigs;

package/{directus-block/src/server.mjs → server.mjs}

@@ -2,10 +2,12 @@
 import { default as default2 } from "./components/BlockDispatcher/index.mjs";
 import { default as default3 } from "./components/BlockSerializer/index.mjs";
 import { default as default4 } from "./utils/get-block-props.mjs";
-import { default as default5 } from "./utils/merge-configs.mjs";
+import { default as default5 } from "./hooks/useBlock.mjs";
+import { default as default6 } from "./utils/merge-configs.mjs";
 export {
   default2 as BlockDispatcher,
   default3 as BlockSerializer,
   default4 as getBlockProps,
-  default5 as mergeConfigs
+  default6 as mergeConfigs,
+  default5 as useBlock
 };

package/{directus-block/src/utils → utils}/get-block-props.js

@@ -1,10 +1,6 @@
 "server-only";
 "use strict";
-require("@tanstack/react-query");
-const query = require("../../../directus-query/src/lib/query.js");
-require("../../../directus-query/src/lib/request.js");
-require("graphql-request");
-require("../../../directus-query/src/lib/config.js");
+const directusQuery = require("@okam/directus-query");
 const radash = require("radash");
 function isVariables(maybeVariables) {
   return !!maybeVariables;
@@ -16,7 +12,7 @@ function isItemEmpty(item) {
 async function queryFromVariables(params) {
   const { document, blockKey, variables } = params;
   if (!document || !isVariables(variables)) return null;
-  const queriedBlockProps = await query.queryGql(document, variables);
+  const queriedBlockProps = await directusQuery.queryGql(document, variables);
   if (!queriedBlockProps || typeof queriedBlockProps !== "object" || !blockKey) return null;
   const queriedBlockFragment = queriedBlockProps[blockKey];
   return queriedBlockFragment;
@@ -35,7 +31,7 @@ async function getBlockProps(params) {
     });
   }
   if (!document || !isVariables(variables)) return null;
-  const queriedBlockProps = await query.queryGql(document, variables);
+  const queriedBlockProps = await directusQuery.queryGql(document, variables);
   if (!queriedBlockProps || typeof queriedBlockProps !== "object" || !blockKey) return null;
   const queriedBlockFragment = queriedBlockProps[blockKey];
   return queriedBlockFragment;

package/{directus-block/src/utils → utils}/get-block-props.mjs

@@ -1,9 +1,5 @@
 "server-only";
-import "@tanstack/react-query";
-import { queryGql } from "../../../directus-query/src/lib/query.mjs";
-import "../../../directus-query/src/lib/request.mjs";
-import "graphql-request";
-import "../../../directus-query/src/lib/config.mjs";
+import { queryGql } from "@okam/directus-query";
 import { isEmpty } from "radash";
 function isVariables(maybeVariables) {
   return !!maybeVariables;

package/directus-query/src/lib/config.js

@@ -1,3 +0,0 @@
-"use strict";
-process.env.NEXT_PUBLIC_GRAPHQL_URL;
-process.env.NEXT_PUBLIC_API_TOKEN;

package/directus-query/src/lib/config.mjs

@@ -1,2 +0,0 @@
-process.env.NEXT_PUBLIC_GRAPHQL_URL;
-process.env.NEXT_PUBLIC_API_TOKEN;

package/directus-query/src/lib/query.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("radash");
-const request = require("./request.js");
-function queryGql(document, queryKey, client = request.graphqlRequestClient) {
-  return client.request(document, {
-    ...queryKey
-  });
-}
-exports.queryGql = queryGql;

package/directus-query/src/lib/query.mjs

@@ -1,10 +0,0 @@
-import "radash";
-import { graphqlRequestClient } from "./request.mjs";
-function queryGql(document, queryKey, client = graphqlRequestClient) {
-  return client.request(document, {
-    ...queryKey
-  });
-}
-export {
-  queryGql
-};

package/directus-query/src/lib/request.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const reactQuery = require("@tanstack/react-query");
-const graphqlRequest = require("graphql-request");
-const GRAPHQL_ENDPOINT = process.env.NEXT_PUBLIC_GRAPHQL_URL;
-const GRAPHQL_ENDPOINT_ADMIN = process.env.NEXT_GRAPHQL_URL_ADMIN;
-const AUTH_TOKEN = process.env.NEXT_PUBLIC_API_TOKEN ?? "";
-const AUTH_TOKEN_ADMIN = process.env.NEXT_PUBLIC_API_TOKEN;
-const graphqlRequestClient = new graphqlRequest.GraphQLClient(GRAPHQL_ENDPOINT, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${AUTH_TOKEN}`
-  }
-});
-new graphqlRequest.GraphQLClient(GRAPHQL_ENDPOINT_ADMIN, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${AUTH_TOKEN_ADMIN}`
-  }
-});
-new reactQuery.QueryClient({
-  queryCache: new reactQuery.QueryCache({
-    onError: (error) => {
-      console.error(error);
-    }
-  }),
-  defaultOptions: {
-    queries: {
-      staleTime: 5 * 1e3
-    }
-  }
-});
-exports.default = graphqlRequestClient;
-exports.graphqlRequestClient = graphqlRequestClient;

package/directus-query/src/lib/request.mjs

@@ -1,38 +0,0 @@
-import { QueryClient, QueryCache } from "@tanstack/react-query";
-import { GraphQLClient } from "graphql-request";
-const GRAPHQL_ENDPOINT = process.env.NEXT_PUBLIC_GRAPHQL_URL;
-const GRAPHQL_ENDPOINT_ADMIN = process.env.NEXT_GRAPHQL_URL_ADMIN;
-const AUTH_TOKEN = process.env.NEXT_PUBLIC_API_TOKEN ?? "";
-const AUTH_TOKEN_ADMIN = process.env.NEXT_PUBLIC_API_TOKEN;
-const graphqlRequestClient = new GraphQLClient(GRAPHQL_ENDPOINT, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${AUTH_TOKEN}`
-  }
-});
-new GraphQLClient(GRAPHQL_ENDPOINT_ADMIN, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${AUTH_TOKEN_ADMIN}`
-  }
-});
-new QueryClient({
-  queryCache: new QueryCache({
-    onError: (error) => {
-      console.error(error);
-    }
-  }),
-  defaultOptions: {
-    queries: {
-      staleTime: 5 * 1e3
-    }
-  }
-});
-export {
-  graphqlRequestClient as default,
-  graphqlRequestClient
-};