@contentful/field-editor-reference 5.14.0 → 5.15.0

package/dist/cjs/common/EntityStore.js

@@ -29,10 +29,10 @@ _export(exports, {
     }
 });
 const _react = _interop_require_wildcard(require("react"));
-const _reactquery = require("@tanstack/react-query");
 const _constate = _interop_require_default(require("constate"));
 const _contentfulmanagement = require("contentful-management");
 const _pqueue = _interop_require_default(require("p-queue"));
+const _queryClient = require("./queryClient");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -180,7 +180,7 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = (0,
         props.sdk.ids.environmentAlias,
         props.sdk.ids.environment
     ]);
-    const queryClient = (0, _reactquery.useQueryClient)();
+    const queryClient = (0, _queryClient.useQueryClient)();
     const queryCache = queryClient.getQueryCache();
     const entityChangeUnsubscribers = (0, _react.useRef)({});
     const cmaClient = (0, _react.useMemo)(()=>(0, _contentfulmanagement.createClient)({
@@ -378,7 +378,7 @@ function useEntity(entityType, entityId, options) {
         options?.spaceId ?? space,
         options?.environmentId ?? environment
     ];
-    const { status , data  } = (0, _reactquery.useQuery)(queryKey, ()=>getEntity(entityType, entityId, options), {
+    const { status , data  } = (0, _queryClient.useQuery)(queryKey, ()=>getEntity(entityType, entityId, options), {
         enabled: options?.enabled
     });
     return {
@@ -393,7 +393,7 @@ function useResource(resourceType, urn, options) {
         urn
     ];
     const { getResource  } = useEntityLoader();
-    const { status , data , error  } = (0, _reactquery.useQuery)(queryKey, ()=>getResource(resourceType, urn, options), {
+    const { status , data , error  } = (0, _queryClient.useQuery)(queryKey, ()=>getResource(resourceType, urn, options), {
         enabled: options?.enabled
     });
     return {
@@ -403,24 +403,5 @@ function useResource(resourceType, urn, options) {
     };
 }
 function EntityProvider({ children , ...props }) {
-    const reactQueryClient = (0, _react.useMemo)(()=>{
-        const queryCache = new _reactquery.QueryCache();
-        const queryClient = new _reactquery.QueryClient({
-            queryCache,
-            defaultOptions: {
-                queries: {
-                    useErrorBoundary: false,
-                    refetchOnWindowFocus: false,
-                    refetchOnReconnect: true,
-                    refetchOnMount: false,
-                    staleTime: Infinity,
-                    retry: false
-                }
-            }
-        });
-        return queryClient;
-    }, []);
-    return _react.default.createElement(_reactquery.QueryClientProvider, {
-        client: reactQueryClient
-    }, _react.default.createElement(InternalServiceProvider, props, children));
+    return _react.default.createElement(_queryClient.SharedQueryClientProvider, null, _react.default.createElement(InternalServiceProvider, props, children));
 }

package/dist/cjs/common/queryClient.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    useQueryClient: function() {
+        return useQueryClient;
+    },
+    useQuery: function() {
+        return useQuery;
+    },
+    SharedQueryClientProvider: function() {
+        return SharedQueryClientProvider;
+    }
+});
+const _react = _interop_require_wildcard(require("react"));
+const _reactquery = require("@tanstack/react-query");
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {};
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+const clientContext = _react.createContext(undefined);
+function useQueryClient() {
+    const client = _react.useContext(clientContext);
+    return _react.useMemo(()=>{
+        if (client) {
+            return client;
+        }
+        return new _reactquery.QueryClient({
+            defaultOptions: {
+                queries: {
+                    useErrorBoundary: false,
+                    refetchOnWindowFocus: false,
+                    refetchOnReconnect: true,
+                    refetchOnMount: false,
+                    staleTime: Infinity,
+                    retry: false
+                }
+            }
+        });
+    }, [
+        client
+    ]);
+}
+const useQuery = (key, fn, opt)=>{
+    return (0, _reactquery.useQuery)(key, fn, {
+        ...opt,
+        context: clientContext
+    });
+};
+function SharedQueryClientProvider({ children  }) {
+    const client = useQueryClient();
+    return _react.createElement(clientContext.Provider, {
+        value: client
+    }, children);
+}

package/dist/cjs/index.js

@@ -66,6 +66,9 @@ _export(exports, {
     useResource: function() {
         return _EntityStore.useResource;
     },
+    EntityCacheProvider: function() {
+        return _queryClient.SharedQueryClientProvider;
+    },
     SingleResourceReferenceEditor: function() {
         return _resources.SingleResourceReferenceEditor;
     },
@@ -78,6 +81,7 @@ const _entries = require("./entries");
 const _assets = require("./assets");
 const _SortableLinkList = require("./common/SortableLinkList");
 const _EntityStore = require("./common/EntityStore");
+const _queryClient = require("./common/queryClient");
 const _resources = require("./resources");
 _export_star(require("./types"), exports);
 function _export_star(from, to) {

package/dist/esm/common/EntityStore.js

@@ -12,10 +12,10 @@ function _define_property(obj, key, value) {
     return obj;
 }
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
-import { QueryCache, QueryClient, QueryClientProvider, useQuery, useQueryClient } from '@tanstack/react-query';
 import constate from 'constate';
 import { createClient } from 'contentful-management';
 import PQueue from 'p-queue';
+import { SharedQueryClientProvider, useQuery, useQueryClient } from './queryClient';
 const globalQueue = new PQueue({
     concurrency: 50
 });
@@ -329,25 +329,6 @@ export function useResource(resourceType, urn, options) {
     };
 }
 function EntityProvider({ children , ...props }) {
-    const reactQueryClient = useMemo(()=>{
-        const queryCache = new QueryCache();
-        const queryClient = new QueryClient({
-            queryCache,
-            defaultOptions: {
-                queries: {
-                    useErrorBoundary: false,
-                    refetchOnWindowFocus: false,
-                    refetchOnReconnect: true,
-                    refetchOnMount: false,
-                    staleTime: Infinity,
-                    retry: false
-                }
-            }
-        });
-        return queryClient;
-    }, []);
-    return React.createElement(QueryClientProvider, {
-        client: reactQueryClient
-    }, React.createElement(InternalServiceProvider, props, children));
+    return React.createElement(SharedQueryClientProvider, null, React.createElement(InternalServiceProvider, props, children));
 }
 export { EntityProvider, useEntityLoader };

package/dist/esm/common/queryClient.js

@@ -0,0 +1,37 @@
+import * as React from 'react';
+import { QueryClient, useQuery as useRQ } from '@tanstack/react-query';
+const clientContext = React.createContext(undefined);
+export function useQueryClient() {
+    const client = React.useContext(clientContext);
+    return React.useMemo(()=>{
+        if (client) {
+            return client;
+        }
+        return new QueryClient({
+            defaultOptions: {
+                queries: {
+                    useErrorBoundary: false,
+                    refetchOnWindowFocus: false,
+                    refetchOnReconnect: true,
+                    refetchOnMount: false,
+                    staleTime: Infinity,
+                    retry: false
+                }
+            }
+        });
+    }, [
+        client
+    ]);
+}
+export const useQuery = (key, fn, opt)=>{
+    return useRQ(key, fn, {
+        ...opt,
+        context: clientContext
+    });
+};
+export function SharedQueryClientProvider({ children  }) {
+    const client = useQueryClient();
+    return React.createElement(clientContext.Provider, {
+        value: client
+    }, children);
+}

package/dist/esm/index.js

@@ -3,5 +3,6 @@ export { SingleEntryReferenceEditor, MultipleEntryReferenceEditor, WrappedEntryC
 export { SingleMediaEditor, MultipleMediaEditor, WrappedAssetCard } from './assets';
 export { SortableLinkList } from './common/SortableLinkList';
 export { EntityProvider, useEntityLoader, useEntity, useResource } from './common/EntityStore';
+export { SharedQueryClientProvider as EntityCacheProvider } from './common/queryClient';
 export { SingleResourceReferenceEditor, MultipleResourceReferenceEditor } from './resources';
 export * from './types';

package/dist/types/common/EntityStore.d.ts

@@ -54,7 +54,7 @@ declare const useEntityLoader: () => {
 };
 export declare function useEntity<E extends FetchableEntity>(entityType: FetchableEntityType, entityId: string, options?: UseEntityOptions): UseEntityResult<E>;
 export declare function useResource(resourceType: ResourceType, urn: string, options?: UseResourceOptions): {
-    status: "loading" | "error" | "success";
+    status: "error" | "success" | "loading";
     data: ResourceInfo<Resource> | undefined;
     error: unknown;
 };

package/dist/types/common/queryClient.d.ts

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { QueryClient, useQuery as useRQ } from '@tanstack/react-query';
+export declare function useQueryClient(): QueryClient;
+export declare const useQuery: typeof useRQ;
+/**
+ * Provides access to a query client either by sharing an existing client or
+ * creating a new one.
+ */
+export declare function SharedQueryClientProvider({ children }: React.PropsWithChildren<{}>): React.JSX.Element;

package/dist/types/index.d.ts

@@ -5,6 +5,7 @@ export type { CustomActionProps } from './common/ReferenceEditor';
 export type { CustomEntityCardProps, DefaultCardRenderer, MissingEntityCardProps, RenderCustomMissingEntityCard, } from './common/customCardTypes';
 export { SortableLinkList } from './common/SortableLinkList';
 export { EntityProvider, useEntityLoader, useEntity, useResource } from './common/EntityStore';
+export { SharedQueryClientProvider as EntityCacheProvider } from './common/queryClient';
 export type { ResourceInfo } from './common/EntityStore';
 export { SingleResourceReferenceEditor, MultipleResourceReferenceEditor } from './resources';
 export * from './types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-reference",
-  "version": "5.14.0",
+  "version": "5.15.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -63,5 +63,5 @@
     "@contentful/app-sdk": "^4.2.0",
     "react": ">=16.8.0"
   },
-  "gitHead": "538cc684c7cea792773969ab12cff42301c4ab9e"
+  "gitHead": "780d4eb1450f777c2d2396a86d0b1a10268b3c13"
 }