@automattic/data-stores 3.2.0 → 3.2.1

package/dist/esm/reader/mutations/use-site-delivery-frequency-mutation.js

@@ -1,5 +1,6 @@
+import { getSiteSubscriptionsQueryKey, } from '@automattic/api-queries';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { callApi, applyCallbackToPages, buildQueryKey } from '../helpers';
+import { callApi } from '../helpers';
 import { alterSiteSubscriptionDetails, invalidateSiteSubscriptionDetails, } from '../helpers/optimistic-update';
 import { useIsLoggedIn } from '../hooks';
 const useSiteDeliveryFrequencyMutation = () => {
@@ -29,27 +30,32 @@ const useSiteDeliveryFrequencyMutation = () => {
             return response;
         },
         onMutate: async ({ blog_id, delivery_frequency, subscriptionId }) => {
-            const siteSubscriptionsCacheKey = buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, id);
+            const siteSubscriptionsCacheKey = getSiteSubscriptionsQueryKey();
             await queryClient.cancelQueries({ queryKey: siteSubscriptionsCacheKey });
             const previousSiteSubscriptions = queryClient.getQueryData(siteSubscriptionsCacheKey);
-            const mutatedSiteSubscriptions = applyCallbackToPages(previousSiteSubscriptions, (page) => ({
-                ...page,
-                subscriptions: page.subscriptions.map((siteSubscription) => {
-                    if (siteSubscription.blog_ID === blog_id) {
-                        return {
-                            ...siteSubscription,
-                            delivery_methods: {
-                                ...siteSubscription.delivery_methods,
-                                email: {
-                                    ...(siteSubscription.delivery_methods?.email ?? { send_posts: false }),
-                                    post_delivery_frequency: delivery_frequency,
-                                },
-                            },
-                        };
-                    }
-                    return siteSubscription;
-                }),
-            }));
+            const mutatedSiteSubscriptions = previousSiteSubscriptions
+                ? {
+                    ...previousSiteSubscriptions,
+                    pages: previousSiteSubscriptions.pages.map((page) => ({
+                        ...page,
+                        subscriptions: page.subscriptions.map((siteSubscription) => {
+                            if (Number(siteSubscription.blog_ID) === Number(blog_id)) {
+                                return {
+                                    ...siteSubscription,
+                                    delivery_methods: {
+                                        ...siteSubscription.delivery_methods,
+                                        email: {
+                                            ...(siteSubscription.delivery_methods?.email ?? { send_posts: false }),
+                                            post_delivery_frequency: delivery_frequency,
+                                        },
+                                    },
+                                };
+                            }
+                            return siteSubscription;
+                        }),
+                    })),
+                }
+                : previousSiteSubscriptions;
             queryClient.setQueryData(siteSubscriptionsCacheKey, mutatedSiteSubscriptions);
             const previousSiteSubscriptionDetails = await alterSiteSubscriptionDetails(queryClient, { blogId: String(blog_id), subscriptionId: String(subscriptionId), isLoggedIn, id }, (previousData) => {
                 return {
@@ -69,7 +75,7 @@ const useSiteDeliveryFrequencyMutation = () => {
             };
         },
         onError: (err, _, context) => {
-            queryClient.setQueryData(buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, id), context?.previousSiteSubscriptions);
+            queryClient.setQueryData(getSiteSubscriptionsQueryKey(), context?.previousSiteSubscriptions);
             if (context?.previousSiteSubscriptionDetails) {
                 for (const { key, data } of context.previousSiteSubscriptionDetails) {
                     queryClient.setQueryData(key, data);

package/dist/esm/reader/mutations/use-site-delivery-frequency-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-site-delivery-frequency-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-delivery-frequency-mutation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-site-delivery-frequency-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-delivery-frequency-mutation.ts"],"names":[],"mappings":"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"}

package/dist/esm/reader/mutations/use-site-email-me-new-comments-mutation.js

@@ -1,5 +1,6 @@
+import { getSiteSubscriptionsQueryKey, } from '@automattic/api-queries';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { buildQueryKey, callApi } from '../helpers';
+import { callApi } from '../helpers';
 import { alterSiteSubscriptionDetails, invalidateSiteSubscriptionDetails, } from '../helpers/optimistic-update';
 import { useIsLoggedIn } from '../hooks';
 const useSiteEmailMeNewCommentsMutation = () => {
@@ -28,7 +29,7 @@ const useSiteEmailMeNewCommentsMutation = () => {
             return response;
         },
         onMutate: async ({ blog_id, send_comments, subscriptionId }) => {
-            const siteSubscriptionsQueryKey = buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, id);
+            const siteSubscriptionsQueryKey = getSiteSubscriptionsQueryKey();
             await queryClient.cancelQueries({ queryKey: siteSubscriptionsQueryKey });
             const previousSiteSubscriptions = queryClient.getQueryData(siteSubscriptionsQueryKey);
             if (previousSiteSubscriptions) {
@@ -38,7 +39,7 @@ const useSiteEmailMeNewCommentsMutation = () => {
                         return {
                             ...page,
                             subscriptions: page.subscriptions.map((siteSubscription) => {
-                                if (siteSubscription.blog_ID === blog_id) {
+                                if (Number(siteSubscription.blog_ID) === Number(blog_id)) {
                                     return {
                                         ...siteSubscription,
                                         delivery_methods: {
@@ -75,7 +76,7 @@ const useSiteEmailMeNewCommentsMutation = () => {
         },
         onError: (_err, _, context) => {
             if (context?.previousSiteSubscriptions) {
-                queryClient.setQueryData(buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, id), context.previousSiteSubscriptions);
+                queryClient.setQueryData(getSiteSubscriptionsQueryKey(), context.previousSiteSubscriptions);
             }
             if (context?.previousSiteSubscriptionDetails) {
                 for (const { key, data } of context.previousSiteSubscriptionDetails) {

package/dist/esm/reader/mutations/use-site-email-me-new-comments-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-site-email-me-new-comments-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-email-me-new-comments-mutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EACN,4BAA4B,EAC5B,iCAAiC,GACjC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAczC,MAAM,iCAAiC,GAAG,GAAG,EAAE;IAC9C,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,aAAa,EAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,OAAO,WAAW,CAAE;QACnB,UAAU,EAAE,KAAK,EAAG,MAAgD,EAAG,EAAE;YACxE,IAAK,CAAE,MAAM,CAAC,OAAO,IAAI,OAAO,MAAM,CAAC,aAAa,KAAK,SAAS,EAAG,CAAC;gBACrE,MAAM,IAAI,KAAK;gBACd,2DAA2D;gBAC3D,0EAA0E,CAC1E,CAAC;YACH,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;YAEvD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAgD;gBAC7E,IAAI,EAAE,cAAe,MAAM,CAAC,OAAQ,gCAAiC,MAAO,EAAE;gBAC9E,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,EAAE;gBACR,UAAU;gBACV,UAAU,EAAE,KAAK;aACjB,CAAE,CAAC;YACJ,IAAK,CAAE,QAAQ,CAAC,OAAO,EAAG,CAAC;gBAC1B,MAAM,IAAI,KAAK;gBACd,2DAA2D;gBAC3D,4EAA4E,CAC5E,CAAC;YACH,CAAC;YAED,OAAO,QAAQ,CAAC;QACjB,CAAC;QACD,QAAQ,EAAE,KAAK,EAAG,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,EAAG,EAAE;YAChE,MAAM,yBAAyB,GAAG,aAAa,CAC9C,CAAE,MAAM,EAAE,oBAAoB,CAAE,EAChC,UAAU,EACV,EAAE,CACF,CAAC;YAEF,MAAM,WAAW,CAAC,aAAa,CAAE,EAAE,QAAQ,EAAE,yBAAyB,EAAE,CAAE,CAAC;YAE3E,MAAM,yBAAyB,GAC9B,WAAW,CAAC,YAAY,CAA4B,yBAAyB,CAAE,CAAC;YAEjF,IAAK,yBAAyB,EAAG,CAAC;gBACjC,WAAW,CAAC,YAAY,CAAE,yBAAyB,EAAE;oBACpD,GAAG,yBAAyB;oBAC5B,KAAK,EAAE,yBAAyB,CAAC,KAAK,CAAC,GAAG,CAAE,CAAE,IAAI,EAAG,EAAE;wBACtD,OAAO;4BACN,GAAG,IAAI;4BACP,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAE,CAAE,gBAAgB,EAAG,EAAE;gCAC7D,IAAK,gBAAgB,CAAC,OAAO,KAAK,OAAO,EAAG,CAAC;oCAC5C,OAAO;wCACN,GAAG,gBAAgB;wCACnB,gBAAgB,EAAE;4CACjB,GAAG,gBAAgB,CAAC,gBAAgB;4CACpC,KAAK,EAAE;gDACN,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,KAAK;gDAC3C,aAAa,EAAE,aAAa;6CAC5B;yCACD;qCACD,CAAC;gCACH,CAAC;gCACD,OAAO,gBAAgB,CAAC;4BACzB,CAAC,CAAE;yBACH,CAAC;oBACH,CAAC,CAAE;iBACH,CAAE,CAAC;YACL,CAAC;YAED,MAAM,+BAA+B,GAAG,MAAM,4BAA4B,CACzE,WAAW,EACX,EAAE,MAAM,EAAE,MAAM,CAAE,OAAO,CAAE,EAAE,cAAc,EAAE,MAAM,CAAE,cAAc,CAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EACvF,CAAE,YAAY,EAAG,EAAE;gBAClB,OAAO;oBACN,GAAG,YAAY;oBACf,gBAAgB,EAAE;wBACjB,GAAG,YAAY,CAAC,gBAAgB;wBAChC,KAAK,EAAE;4BACN,GAAG,YAAY,CAAC,gBAAgB,EAAE,KAAK;4BACvC,aAAa,EAAE,aAAa;yBAC5B;qBACD;iBAC0B,CAAC;YAC9B,CAAC,CACD,CAAC;YAEF,OAAO;gBACN,yBAAyB;gBACzB,+BAA+B;aAC/B,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAG,EAAE;YAC/B,IAAK,OAAO,EAAE,yBAAyB,EAAG,CAAC;gBAC1C,WAAW,CAAC,YAAY,CACvB,aAAa,CAAE,CAAE,MAAM,EAAE,oBAAoB,CAAE,EAAE,UAAU,EAAE,EAAE,CAAE,EACjE,OAAO,CAAC,yBAAyB,CACjC,CAAC;YACH,CAAC;YAED,IAAK,OAAO,EAAE,+BAA+B,EAAG,CAAC;gBAChD,KAAM,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,+BAA+B,EAAG,CAAC;oBACvE,WAAW,CAAC,YAAY,CAAE,GAAG,EAAE,IAAI,CAAE,CAAC;gBACvC,CAAC;YACF,CAAC;QACF,CAAC;QACD,SAAS,EAAE,CAAE,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EAAG,EAAE;YACzD,iCAAiC,CAAE,WAAW,EAAE;gBAC/C,MAAM,EAAE,MAAM,CAAE,OAAO,CAAE;gBACzB,cAAc,EAAE,MAAM,CAAE,cAAc,CAAE;gBACxC,UAAU;gBACV,EAAE;aACF,CAAE,CAAC;YACJ,WAAW,CAAC,iBAAiB,CAAE;gBAC9B,QAAQ,EAAE,CAAE,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE,CAAE;aACrE,CAAE,CAAC;QACL,CAAC;KACD,CAAE,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,iCAAiC,CAAC"}
+{"version":3,"file":"use-site-email-me-new-comments-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-email-me-new-comments-mutation.ts"],"names":[],"mappings":"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"}

package/dist/esm/reader/mutations/use-site-email-me-new-posts-mutation.js

@@ -1,5 +1,6 @@
+import { getSiteSubscriptionsQueryKey, } from '@automattic/api-queries';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { buildQueryKey, callApi } from '../helpers';
+import { callApi } from '../helpers';
 import { alterSiteSubscriptionDetails, invalidateSiteSubscriptionDetails, } from '../helpers/optimistic-update';
 import { useIsLoggedIn } from '../hooks';
 const useSiteEmailMeNewPostsMutation = () => {
@@ -28,7 +29,7 @@ const useSiteEmailMeNewPostsMutation = () => {
             return response;
         },
         onMutate: async ({ blog_id, send_posts, subscriptionId }) => {
-            const siteSubscriptionsQueryKey = buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, id);
+            const siteSubscriptionsQueryKey = getSiteSubscriptionsQueryKey();
             await queryClient.cancelQueries({ queryKey: siteSubscriptionsQueryKey });
             const previousSiteSubscriptions = queryClient.getQueryData(siteSubscriptionsQueryKey);
             if (previousSiteSubscriptions) {
@@ -38,7 +39,7 @@ const useSiteEmailMeNewPostsMutation = () => {
                         return {
                             ...page,
                             subscriptions: page.subscriptions.map((siteSubscription) => {
-                                if (siteSubscription.blog_ID === blog_id) {
+                                if (Number(siteSubscription.blog_ID) === Number(blog_id)) {
                                     return {
                                         ...siteSubscription,
                                         delivery_methods: {
@@ -80,7 +81,7 @@ const useSiteEmailMeNewPostsMutation = () => {
         },
         onError: (_err, _, context) => {
             if (context?.previousSiteSubscriptions) {
-                queryClient.setQueryData(buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, id), context.previousSiteSubscriptions);
+                queryClient.setQueryData(getSiteSubscriptionsQueryKey(), context.previousSiteSubscriptions);
             }
             if (context?.previousSiteSubscriptionDetails) {
                 for (const { key, data } of context.previousSiteSubscriptionDetails) {

package/dist/esm/reader/mutations/use-site-email-me-new-posts-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-site-email-me-new-posts-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-email-me-new-posts-mutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EACN,4BAA4B,EAC5B,iCAAiC,GACjC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAczC,MAAM,8BAA8B,GAAG,GAAG,EAAE;IAC3C,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,aAAa,EAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,OAAO,WAAW,CAAE;QACnB,UAAU,EAAE,KAAK,EAAG,MAA6C,EAAG,EAAE;YACrE,IAAK,CAAE,MAAM,CAAC,OAAO,IAAI,OAAO,MAAM,CAAC,UAAU,KAAK,SAAS,EAAG,CAAC;gBAClE,MAAM,IAAI,KAAK;gBACd,2DAA2D;gBAC3D,uEAAuE,CACvE,CAAC;YACH,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;YAEpD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAA6C;gBAC1E,IAAI,EAAE,cAAe,MAAM,CAAC,OAAQ,6BAA8B,MAAO,EAAE;gBAC3E,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,EAAE;gBACR,UAAU;gBACV,UAAU,EAAE,KAAK;aACjB,CAAE,CAAC;YACJ,IAAK,CAAE,QAAQ,CAAC,OAAO,EAAG,CAAC;gBAC1B,MAAM,IAAI,KAAK;gBACd,2DAA2D;gBAC3D,uEAAuE,CACvE,CAAC;YACH,CAAC;YAED,OAAO,QAAQ,CAAC;QACjB,CAAC;QACD,QAAQ,EAAE,KAAK,EAAG,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,EAAG,EAAE;YAC7D,MAAM,yBAAyB,GAAG,aAAa,CAC9C,CAAE,MAAM,EAAE,oBAAoB,CAAE,EAChC,UAAU,EACV,EAAE,CACF,CAAC;YAEF,MAAM,WAAW,CAAC,aAAa,CAAE,EAAE,QAAQ,EAAE,yBAAyB,EAAE,CAAE,CAAC;YAE3E,MAAM,yBAAyB,GAC9B,WAAW,CAAC,YAAY,CAA4B,yBAAyB,CAAE,CAAC;YACjF,IAAK,yBAAyB,EAAG,CAAC;gBACjC,WAAW,CAAC,YAAY,CAAE,yBAAyB,EAAE;oBACpD,GAAG,yBAAyB;oBAC5B,KAAK,EAAE,yBAAyB,CAAC,KAAK,CAAC,GAAG,CAAE,CAAE,IAAI,EAAG,EAAE;wBACtD,OAAO;4BACN,GAAG,IAAI;4BACP,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAE,CAAE,gBAAgB,EAAG,EAAE;gCAC7D,IAAK,gBAAgB,CAAC,OAAO,KAAK,OAAO,EAAG,CAAC;oCAC5C,OAAO;wCACN,GAAG,gBAAgB;wCACnB,gBAAgB,EAAE;4CACjB,GAAG,gBAAgB,CAAC,gBAAgB;4CACpC,KAAK,EAAE;gDACN,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,KAAK;gDAC3C,UAAU,EAAE,UAAU;6CACtB;yCACD;qCACD,CAAC;gCACH,CAAC;gCACD,OAAO,gBAAgB,CAAC;4BACzB,CAAC,CAAE;yBACH,CAAC;oBACH,CAAC,CAAE;iBACH,CAAE,CAAC;YACL,CAAC;YAED,MAAM,+BAA+B,GAAG,MAAM,4BAA4B,CACzE,WAAW,EACX;gBACC,MAAM,EAAE,MAAM,CAAE,OAAO,CAAE;gBACzB,cAAc,EAAE,MAAM,CAAE,cAAc,CAAE;gBACxC,UAAU;gBACV,EAAE;aACF,EACD,CAAE,uBAAuB,EAAG,EAAE;gBAC7B,OAAO;oBACN,GAAG,uBAAuB;oBAC1B,gBAAgB,EAAE;wBACjB,GAAG,uBAAuB,CAAC,gBAAgB;wBAC3C,KAAK,EAAE;4BACN,GAAG,uBAAuB,CAAC,gBAAgB,EAAE,KAAK;4BAClD,UAAU,EAAE,UAAU;yBACtB;qBACD;iBAC0B,CAAC;YAC9B,CAAC,CACD,CAAC;YAEF,OAAO;gBACN,yBAAyB;gBACzB,+BAA+B;aAC/B,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAG,EAAE;YAC/B,IAAK,OAAO,EAAE,yBAAyB,EAAG,CAAC;gBAC1C,WAAW,CAAC,YAAY,CACvB,aAAa,CAAE,CAAE,MAAM,EAAE,oBAAoB,CAAE,EAAE,UAAU,EAAE,EAAE,CAAE,EACjE,OAAO,CAAC,yBAAyB,CACjC,CAAC;YACH,CAAC;YACD,IAAK,OAAO,EAAE,+BAA+B,EAAG,CAAC;gBAChD,KAAM,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,+BAA+B,EAAG,CAAC;oBACvE,WAAW,CAAC,YAAY,CAAE,GAAG,EAAE,IAAI,CAAE,CAAC;gBACvC,CAAC;YACF,CAAC;QACF,CAAC;QACD,SAAS,EAAE,CAAE,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EAAG,EAAE;YACzD,iCAAiC,CAAE,WAAW,EAAE;gBAC/C,MAAM,EAAE,MAAM,CAAE,OAAO,CAAE;gBACzB,cAAc,EAAE,MAAM,CAAE,cAAc,CAAE;gBACxC,UAAU;gBACV,EAAE;aACF,CAAE,CAAC;YACJ,WAAW,CAAC,iBAAiB,CAAE;gBAC9B,QAAQ,EAAE,CAAE,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE,CAAE;aACrE,CAAE,CAAC;QACL,CAAC;KACD,CAAE,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,8BAA8B,CAAC"}
+{"version":3,"file":"use-site-email-me-new-posts-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-email-me-new-posts-mutation.ts"],"names":[],"mappings":"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"}

package/dist/esm/reader/mutations/use-site-notify-me-of-new-posts-mutation.js

@@ -1,5 +1,6 @@
+import { getSiteSubscriptionsQueryKey, } from '@automattic/api-queries';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { buildQueryKey, callApi } from '../helpers';
+import { callApi } from '../helpers';
 import { alterSiteSubscriptionDetails, invalidateSiteSubscriptionDetails, } from '../helpers/optimistic-update';
 import { useIsLoggedIn } from '../hooks';
 const useSiteNotifyMeOfNewPostsMutation = () => {
@@ -29,7 +30,7 @@ const useSiteNotifyMeOfNewPostsMutation = () => {
             return response;
         },
         onMutate: async ({ blog_id, send_posts, subscriptionId }) => {
-            const siteSubscriptionsQueryKey = buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, id);
+            const siteSubscriptionsQueryKey = getSiteSubscriptionsQueryKey();
             await queryClient.cancelQueries({ queryKey: siteSubscriptionsQueryKey });
             const previousSiteSubscriptions = queryClient.getQueryData(siteSubscriptionsQueryKey);
             if (previousSiteSubscriptions) {
@@ -39,7 +40,7 @@ const useSiteNotifyMeOfNewPostsMutation = () => {
                         return {
                             ...page,
                             subscriptions: page.subscriptions.map((siteSubscription) => {
-                                if (siteSubscription.blog_ID === blog_id) {
+                                if (Number(siteSubscription.blog_ID) === Number(blog_id)) {
                                     return {
                                         ...siteSubscription,
                                         delivery_methods: {
@@ -81,7 +82,7 @@ const useSiteNotifyMeOfNewPostsMutation = () => {
         },
         onError: (err, _, context) => {
             if (context?.previousSiteSubscriptions) {
-                queryClient.setQueryData(buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, id), context.previousSiteSubscriptions);
+                queryClient.setQueryData(getSiteSubscriptionsQueryKey(), context.previousSiteSubscriptions);
             }
             if (context?.previousSiteSubscriptionDetails) {
                 for (const { key, data } of context.previousSiteSubscriptionDetails) {

package/dist/esm/reader/mutations/use-site-notify-me-of-new-posts-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-site-notify-me-of-new-posts-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-notify-me-of-new-posts-mutation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-site-notify-me-of-new-posts-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-notify-me-of-new-posts-mutation.ts"],"names":[],"mappings":"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"}

package/dist/esm/reader/mutations/use-site-subscribe-mutation.js

@@ -1,3 +1,4 @@
+import { getSiteSubscriptionsQueryKey, } from '@automattic/api-queries';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { buildQueryKey, callApi, getSubscriptionMutationParams, isValidId } from '../helpers';
 import { useIsLoggedIn } from '../hooks';
@@ -7,7 +8,7 @@ const buildSubscriptionDetailsByBlogIdQueryKey = (blogId, isLoggedIn, userId) =>
 const useSiteSubscribeMutation = () => {
     const { isLoggedIn, id: userId } = useIsLoggedIn();
     const queryClient = useQueryClient();
-    const siteSubscriptionsCacheKey = buildQueryKey(['read', 'site-subscriptions'], isLoggedIn, userId);
+    const siteSubscriptionsCacheKey = getSiteSubscriptionsQueryKey();
     const subscriptionsCountCacheKey = buildQueryKey(['read', 'subscriptions-count'], isLoggedIn, userId);
     return useMutation({
         mutationFn: async (params) => {
@@ -22,7 +23,7 @@ const useSiteSubscribeMutation = () => {
             if (!response.subscribed) {
                 throw new Error(
                 // reminder: translate this string when we add it to the UI
-                'Something went wrong while subscribing.');
+                'Something went wrong while subscribing.', { cause: response.info });
             }
             return response;
         },
@@ -46,13 +47,18 @@ const useSiteSubscribeMutation = () => {
                 queryClient.setQueryData(siteSubscriptionsCacheKey, {
                     ...previousSiteSubscriptions,
                     pages: previousSiteSubscriptions.pages.map((page) => {
+                        const shouldIncreaseTotalCount = page.subscriptions.some((siteSubscription) => Number(siteSubscription.blog_ID) === Number(params.blog_id) &&
+                            (siteSubscription.isDeleted || !siteSubscription.is_following));
                         return {
                             ...page,
-                            total_subscriptions: page.total_subscriptions - 1,
-                            subscriptions: page.subscriptions.map((siteSubscription) => siteSubscription.blog_ID === params.blog_id
+                            totalCount: typeof page.totalCount === 'number' && shouldIncreaseTotalCount
+                                ? page.totalCount + 1
+                                : page.totalCount,
+                            subscriptions: page.subscriptions.map((siteSubscription) => Number(siteSubscription.blog_ID) === Number(params.blog_id)
                                 ? {
                                     ...siteSubscription,
                                     date_subscribed: new Date(),
+                                    is_following: true,
                                     isDeleted: false,
                                     resubscribed: params.resubscribed ?? false,
                                 }

package/dist/esm/reader/mutations/use-site-subscribe-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-site-subscribe-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-subscribe-mutation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-site-subscribe-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-subscribe-mutation.ts"],"names":[],"mappings":"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"}

package/dist/esm/reader/mutations/use-site-unsubscribe-mutation.js

@@ -1,3 +1,4 @@
+import { getSiteSubscriptionsQueryKey, } from '@automattic/api-queries';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { buildQueryKey, callApi, getSubscriptionMutationParams, isValidId } from '../helpers';
 import { useCacheKey, useIsLoggedIn } from '../hooks';
@@ -10,7 +11,7 @@ const buildSiteSubscriptionDetailsQueryKey = (subscriptionId, isLoggedIn, userId
 const useSiteUnsubscribeMutation = () => {
     const { isLoggedIn, id: userId } = useIsLoggedIn();
     const queryClient = useQueryClient();
-    const siteSubscriptionsQueryKey = useCacheKey(['read', 'site-subscriptions']);
+    const siteSubscriptionsQueryKey = getSiteSubscriptionsQueryKey();
     const subscriptionsCountQueryKey = useCacheKey(['read', 'subscriptions-count']);
     return useMutation({
         mutationFn: async (params) => {
@@ -43,13 +44,19 @@ const useSiteUnsubscribeMutation = () => {
                 queryClient.setQueryData(siteSubscriptionsQueryKey, {
                     ...previousSiteSubscriptions,
                     pages: previousSiteSubscriptions.pages.map((page) => {
+                        const isTargetSubscription = (siteSubscription) => Number(siteSubscription.ID) === params.subscriptionId ||
+                            (isValidId(params.blog_id) &&
+                                Number(siteSubscription.blog_ID) === Number(params.blog_id));
+                        const shouldDecrementTotalCount = page.subscriptions.some(isTargetSubscription);
                         return {
                             ...page,
-                            total_subscriptions: page.total_subscriptions - 1,
-                            subscriptions: page.subscriptions.map((siteSubscription) => Number(siteSubscription.ID) === params.subscriptionId ||
-                                (isValidId(params.blog_id) && siteSubscription.blog_ID === params.blog_id) //siteSubscription.blog_ID is not valid ID for non-wpcom subscriptions, so when unsubscribing from such site, the param.blog_id will also be not valid, this would create false positive
+                            totalCount: typeof page.totalCount === 'number' && shouldDecrementTotalCount
+                                ? page.totalCount - 1
+                                : page.totalCount,
+                            subscriptions: page.subscriptions.map((siteSubscription) => isTargetSubscription(siteSubscription)
                                 ? {
                                     ...siteSubscription,
+                                    is_following: false,
                                     isDeleted: true,
                                     resubscribed: false,
                                 }

package/dist/esm/reader/mutations/use-site-unsubscribe-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-site-unsubscribe-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-unsubscribe-mutation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-site-unsubscribe-mutation.js","sourceRoot":"","sources":["../../../../src/reader/mutations/use-site-unsubscribe-mutation.ts"],"names":[],"mappings":"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"}

package/dist/esm/reader/queries/index.js

@@ -1,11 +1,8 @@
 export { default as usePendingPostSubscriptionsQuery } from './use-pending-post-subscriptions-query';
 export { default as usePendingSiteSubscriptionsQuery } from './use-pending-site-subscriptions-query';
 export { default as usePostSubscriptionsQuery } from './use-post-subscriptions-query';
-export { default as useReadFeedSearchQuery, FeedSort } from './use-read-feed-search-query';
-export { default as useReadFeedSiteQuery } from './use-read-feed-site-query';
-export { default as useReadFeedQuery } from './use-read-feed-query';
 export { default as useSiteSubscriptionDetailsQuery } from './use-site-subscription-details-query';
 export { default as useSiteSubscriptionsQuery, siteSubscriptionsQueryKeyPrefix, } from './use-site-subscriptions-query';
-export { default as useSubscriptionsCountQuery } from './use-subscriptions-count-query';
+export { default as useSubscriptionsCountQuery, subscriptionsCountQueryKeyPrefix, } from './use-subscriptions-count-query';
 export { default as useUserSettingsQuery } from './use-user-settings-query';
 //# sourceMappingURL=index.js.map

package/dist/esm/reader/queries/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/reader/queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AACrG,OAAO,EAAE,OAAO,IAAI,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AACrG,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AACnG,OAAO,EACN,OAAO,IAAI,yBAAyB,EACpC,+BAA+B,GAC/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/reader/queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AACrG,OAAO,EAAE,OAAO,IAAI,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AACrG,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,EAAE,OAAO,IAAI,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AACnG,OAAO,EACN,OAAO,IAAI,yBAAyB,EACpC,+BAA+B,GAC/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACN,OAAO,IAAI,0BAA0B,EACrC,gCAAgC,GAChC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC"}

package/dist/esm/reader/queries/use-site-subscriptions-query.js

@@ -1,17 +1,26 @@
+import { adaptSiteSubscriptionsResponse, } from '@automattic/api-core';
+import { siteSubscriptionsQuery, getSiteSubscriptionsQueryKey } from '@automattic/api-queries';
 import { useInfiniteQuery } from '@tanstack/react-query';
+import { addQueryArgs } from '@wordpress/url';
 import { useMemo, useEffect, useCallback } from 'react';
 import { SiteSubscriptionsFilterBy, SiteSubscriptionsSortBy } from '../constants';
 import { useSiteSubscriptionsQueryProps } from '../contexts';
 import { callApi } from '../helpers';
-import { useCacheKey, useIsLoggedIn, useIsQueryEnabled } from '../hooks';
-export const siteSubscriptionsQueryKeyPrefix = ['read', 'site-subscriptions'];
+import { useIsLoggedIn, useIsQueryEnabled } from '../hooks';
+export const siteSubscriptionsQueryKeyPrefix = [...getSiteSubscriptionsQueryKey()];
+// Must match the page size the shared `siteSubscriptionsQuery` (in
+// `@automattic/api-queries`) assumes for next-page detection. That query reasons
+// about how much offset it has covered, so requesting a different page size here
+// would make pagination stop early or over-fetch. The value mirrors the server
+// cap (`PER_PAGE_MAX = 100`) on `/read/following/mine`.
+const SITE_SUBSCRIPTIONS_PAGE_SIZE = 100;
 const sortByDateSubscribed = (a, b) => a.date_subscribed instanceof Date && b.date_subscribed instanceof Date
     ? b.date_subscribed.getTime() - a.date_subscribed.getTime()
     : 0;
 const sortByLastUpdated = (a, b) => a.last_updated instanceof Date && b.last_updated instanceof Date
     ? b.last_updated.getTime() - a.last_updated.getTime()
     : 0;
-const sortBySiteName = (a, b) => a.name.localeCompare(b.name);
+const sortBySiteName = (a, b) => (a.name ?? '').localeCompare(b.name ?? '');
 const getSortFunction = (sortTerm) => {
     switch (sortTerm) {
         case SiteSubscriptionsSortBy.DateSubscribed:
@@ -24,37 +33,27 @@ const getSortFunction = (sortTerm) => {
             return undefined;
     }
 };
-const useSiteSubscriptionsQuery = ({ number = 100, } = {}) => {
+const useSiteSubscriptionsQuery = () => {
     const { isLoggedIn } = useIsLoggedIn();
     const enabled = useIsQueryEnabled();
-    const cacheKey = useCacheKey(siteSubscriptionsQueryKeyPrefix);
     const { searchTerm, filterOption, sortTerm } = useSiteSubscriptionsQueryProps();
-    const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isFetching, ...rest } = useInfiniteQuery({
-        queryKey: cacheKey,
+    const query = useInfiniteQuery({
+        ...siteSubscriptionsQuery(),
         queryFn: async ({ pageParam }) => {
-            const data = await callApi({
-                path: `/read/following/mine?number=${number}&page=${pageParam}`,
-                isLoggedIn,
+            const response = await callApi({
+                path: addQueryArgs('/read/following/mine', {
+                    page: pageParam,
+                    number: SITE_SUBSCRIPTIONS_PAGE_SIZE,
+                    meta: '',
+                }),
                 apiVersion: '1.2',
+                isLoggedIn,
             });
-            return {
-                ...data,
-                subscriptions: data.subscriptions
-                    ? data.subscriptions.map((subscription) => ({
-                        ...subscription,
-                        last_updated: new Date(subscription.last_updated),
-                        date_subscribed: new Date(subscription.date_subscribed),
-                    }))
-                    : [],
-            };
+            return adaptSiteSubscriptionsResponse(response);
         },
         enabled,
-        initialPageParam: 1,
-        getNextPageParam: (lastPage, pages) => {
-            return lastPage.page * number < lastPage.total_subscriptions ? pages.length + 1 : undefined;
-        },
-        refetchOnWindowFocus: false,
     });
+    const { data, error, fetchNextPage, hasNextPage, isFetchingNextPage, isFetching, isLoading, refetch, } = query;
     const nextPage = hasNextPage && !isFetching && data ? data.pages.length + 1 : null;
     useEffect(() => {
         if (nextPage) {
@@ -90,16 +89,18 @@ const useSiteSubscriptionsQuery = ({ number = 100, } = {}) => {
             subscriptions: flattenedData
                 ?.filter((item) => item !== null && filterFunction(item) && searchFilter(item))
                 .sort(sort) ?? [],
-            totalCount: data?.pages?.[0]?.total_subscriptions ?? 0,
+            totalCount: data?.pages?.[0]?.totalCount ?? 0,
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [data?.pages, filterOption, searchTerm, sortTerm]);
     return {
         data: resultData,
+        error,
         isFetchingNextPage,
         isFetching,
         hasNextPage,
-        ...rest,
+        isLoading,
+        refetch,
     };
 };
 export default useSiteSubscriptionsQuery;

package/dist/esm/reader/queries/use-site-subscriptions-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-site-subscriptions-query.js","sourceRoot":"","sources":["../../../../src/reader/queries/use-site-subscriptions-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAGzE,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAE,MAAM,EAAE,oBAAoB,CAAE,CAAC;AAYhF,MAAM,oBAAoB,GAAG,CAC5B,CAAgC,EAChC,CAAgC,EAC/B,EAAE,CACH,CAAC,CAAC,eAAe,YAAY,IAAI,IAAI,CAAC,CAAC,eAAe,YAAY,IAAI;IACrE,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE;IAC3D,CAAC,CAAC,CAAC,CAAC;AAEN,MAAM,iBAAiB,GAAG,CAAE,CAAgC,EAAE,CAAgC,EAAG,EAAE,CAClG,CAAC,CAAC,YAAY,YAAY,IAAI,IAAI,CAAC,CAAC,YAAY,YAAY,IAAI;IAC/D,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE;IACrD,CAAC,CAAC,CAAC,CAAC;AAEN,MAAM,cAAc,GAAG,CAAE,CAAgC,EAAE,CAAgC,EAAG,EAAE,CAC/F,CAAC,CAAC,IAAI,CAAC,aAAa,CAAE,CAAC,CAAC,IAAI,CAAE,CAAC;AAEhC,MAAM,eAAe,GAAG,CAAE,QAAiC,EAAG,EAAE;IAC/D,QAAS,QAAQ,EAAG,CAAC;QACpB,KAAK,uBAAuB,CAAC,cAAc;YAC1C,OAAO,oBAAoB,CAAC;QAC7B,KAAK,uBAAuB,CAAC,WAAW;YACvC,OAAO,iBAAiB,CAAC;QAC1B,KAAK,uBAAuB,CAAC,QAAQ;YACpC,OAAO,cAAc,CAAC;QACvB;YACC,OAAO,SAAS,CAAC;IACnB,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAE,EACnC,MAAM,GAAG,GAAG,MACuC,EAAE,EAAG,EAAE;IAC1D,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,EAAE,CAAC;IACvC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,WAAW,CAAE,+BAA+B,CAAE,CAAC;IAChE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,8BAA8B,EAAE,CAAC;IAEhF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,kBAAkB,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAClF,gBAAgB,CAA0C;QACzD,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,KAAK,EAAG,EAAE,SAAS,EAAE,EAAG,EAAE;YAClC,MAAM,IAAI,GAAG,MAAM,OAAO,CAA0C;gBACnE,IAAI,EAAE,+BAAgC,MAAO,SAAU,SAAU,EAAE;gBACnE,UAAU;gBACV,UAAU,EAAE,KAAK;aACjB,CAAE,CAAC;YAEJ,OAAO;gBACN,GAAG,IAAI;gBACP,aAAa,EAAE,IAAI,CAAC,aAAa;oBAChC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAE,CAAE,YAAY,EAAG,EAAE,CAAC,CAAE;wBAC9C,GAAG,YAAY;wBACf,YAAY,EAAE,IAAI,IAAI,CAAE,YAAY,CAAC,YAAY,CAAE;wBACnD,eAAe,EAAE,IAAI,IAAI,CAAE,YAAY,CAAC,eAAe,CAAE;qBACxD,CAAE,CAAE;oBACP,CAAC,CAAC,EAAE;aACL,CAAC;QACH,CAAC;QACD,OAAO;QACP,gBAAgB,EAAE,CAAC;QACnB,gBAAgB,EAAE,CAAE,QAAQ,EAAE,KAAK,EAAG,EAAE;YACvC,OAAO,QAAQ,CAAC,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7F,CAAC;QACD,oBAAoB,EAAE,KAAK;KAC3B,CAAE,CAAC;IAEL,MAAM,QAAQ,GAAG,WAAW,IAAI,CAAE,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEpF,SAAS,CAAE,GAAG,EAAE;QACf,IAAK,QAAQ,EAAG,CAAC;YAChB,aAAa,EAAE,CAAC;QACjB,CAAC;IACF,CAAC,EAAE,CAAE,QAAQ,EAAE,aAAa,CAAE,CAAE,CAAC;IAEjC,MAAM,cAAc,GAAG,WAAW,CACjC,CAAE,IAAmC,EAAG,EAAE;QACzC,QAAS,YAAY,EAAG,CAAC;YACxB,KAAK,yBAAyB,CAAC,IAAI;gBAClC,OAAO,IAAI,CAAC,oBAAoB,CAAC;YAClC,KAAK,yBAAyB,CAAC,EAAE;gBAChC,OAAO,IAAI,CAAC,kBAAkB,CAAC;YAChC,KAAK,yBAAyB,CAAC,GAAG;gBACjC,OAAO,IAAI,CAAC,MAAM,CAAC;YACpB,KAAK,yBAAyB,CAAC,GAAG,CAAC;YACnC;gBACC,OAAO,IAAI,CAAC;QACd,CAAC;IACF,CAAC,EACD,CAAE,YAAY,CAAE,CAChB,CAAC;IAEF,MAAM,UAAU,GAAG,OAAO,CAAE,GAAG,EAAE;QAChC,yEAAyE;QACzE,MAAM,aAAa,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,CAAE,CAAE,IAAI,EAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAE,CAAC,IAAI,EAAE,CAAC;QAEhF,MAAM,mBAAmB,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,YAAY,GAAG,CAAE,IAAmC,EAAG,EAAE;YAC9D,IAAK,UAAU,KAAK,EAAE,EAAG,CAAC;gBACzB,OAAO,IAAI,CAAC;YACb,CAAC;YAED,OAAO,CACN,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAE,mBAAmB,CAAE;gBAC3D,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAE,mBAAmB,CAAE,CAC1D,CAAC;QACH,CAAC,CAAC;QACF,MAAM,IAAI,GAAG,eAAe,CAAE,QAAQ,CAAE,CAAC;QAEzC,OAAO;YACN,aAAa,EACZ,aAAa;gBACZ,EAAE,MAAM,CAAE,CAAE,IAAI,EAAG,EAAE,CAAC,IAAI,KAAK,IAAI,IAAI,cAAc,CAAE,IAAI,CAAE,IAAI,YAAY,CAAE,IAAI,CAAE,CAAE;iBACtF,IAAI,CAAE,IAAI,CAAE,IAAI,EAAE;YACrB,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAE,CAAC,CAAE,EAAE,mBAAmB,IAAI,CAAC;SACxD,CAAC;QACF,uDAAuD;IACxD,CAAC,EAAE,CAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,CAAE,CAAE,CAAC;IAEzD,OAAO;QACN,IAAI,EAAE,UAAU;QAChB,kBAAkB;QAClB,UAAU;QACV,WAAW;QACX,GAAG,IAAI;KACP,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"use-site-subscriptions-query.js","sourceRoot":"","sources":["../../../../src/reader/queries/use-site-subscriptions-query.ts"],"names":[],"mappings":"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"}

package/dist/esm/site/queries/use-site-features.js

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import wpcomRequest from 'wpcom-proxy-request';
+import wpcomRequest from '../../wpcom-request';
 import useQueryKeysFactory from './lib/use-query-keys-factory';
 /**
  * Site details from `/sites/[ siteIdOrSlug ]/features` endpoint

package/dist/esm/site/queries/use-site-media-storage.js

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import wpcomRequest from 'wpcom-proxy-request';
+import wpcomRequest from '../../wpcom-request';
 import useQueryKeysFactory from './lib/use-query-keys-factory';
 /**
  * Site media storage from `/sites/[ siteIdOrSlug ]/media-storage` endpoint

package/dist/esm/site/queries/use-site-user-query.js

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import wpcomRequest from 'wpcom-proxy-request';
+import wpcomRequest from '../../wpcom-request';
 import useQueryKeysFactory from './lib/use-query-keys-factory';
 export function getUseSiteUserQueryOptions(siteId, userId, queryKey) {
     return {

package/dist/esm/site/queries/use-site-user-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-site-user-query.js","sourceRoot":"","sources":["../../../../src/site/queries/use-site-user-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAE/C,OAAO,mBAAmB,MAAM,8BAA8B,CAAC;AAE/D,MAAM,UAAU,0BAA0B,CACzC,MAAiC,EACjC,MAA0B,EAC1B,QAAkD;IAElD,OAAO;QACN,QAAQ;QACR,OAAO,EAAE,KAAK,IAAuB,EAAE,CACtC,YAAY,CAAE,EAAE,IAAI,EAAE,UAAW,MAAO,UAAW,MAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAE;QACpF,OAAO,EAAE,CAAC,CAAE,CAAE,MAAM,IAAI,MAAM,CAAE;KAChC,CAAC;AACH,CAAC;AAED,MAAM,gBAAgB,GAAG,CAAE,MAAsB,EAAE,MAAe,EAAG,EAAE;IACtE,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;IACxC,OAAO,QAAQ,CACd,0BAA0B,CAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAE,MAAM,EAAE,MAAM,CAAE,CAAE,CAClF,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"use-site-user-query.js","sourceRoot":"","sources":["../../../../src/site/queries/use-site-user-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAC/C,OAAO,mBAAmB,MAAM,8BAA8B,CAAC;AAE/D,MAAM,UAAU,0BAA0B,CACzC,MAAiC,EACjC,MAA0B,EAC1B,QAAkD;IAElD,OAAO;QACN,QAAQ;QACR,OAAO,EAAE,KAAK,IAAuB,EAAE,CACtC,YAAY,CAAE,EAAE,IAAI,EAAE,UAAW,MAAO,UAAW,MAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAE;QACpF,OAAO,EAAE,CAAC,CAAE,CAAE,MAAM,IAAI,MAAM,CAAE;KAChC,CAAC;AACH,CAAC;AAED,MAAM,gBAAgB,GAAG,CAAE,MAAsB,EAAE,MAAe,EAAG,EAAE;IACtE,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;IACxC,OAAO,QAAQ,CACd,0BAA0B,CAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAE,MAAM,EAAE,MAAM,CAAE,CAAE,CAClF,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/esm/site/queries/use-site.js

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import wpcomRequest from 'wpcom-proxy-request';
+import wpcomRequest from '../../wpcom-request';
 import useQueryKeysFactory from './lib/use-query-keys-factory';
 /**
  * Site details from `/sites/[ siteId ]` endpoint

package/dist/esm/site/resolvers.js

@@ -1,5 +1,5 @@
 // wpcomRequest is a temporary rename while we're working on migrating generators to thunks
-import wpcomRequest from 'wpcom-proxy-request';
+import wpcomRequest from '../wpcom-request';
 /**
  * Attempt to find a site based on its id, and if not return undefined.
  * We are currently ignoring error messages and silently failing if we can't find a

package/dist/esm/site/resolvers.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/site/resolvers.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAU/C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,OAAO,GACnB,CAAE,MAAc,EAAG,EAAE,CACrB,KAAK,EAAG,EAAE,QAAQ,EAAY,EAAG,EAAE;IAClC,QAAQ,CAAC,SAAS,EAAE,CAAC;IACrB,IAAI,CAAC;QACJ,MAAM,YAAY,GAA4B,MAAM,YAAY,CAAE;YACjE,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAAE,MAAM,CAAE;YAC9C,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,aAAa;SACpB,CAAE,CAAC;QACJ,QAAQ,CAAC,WAAW,CAAE,MAAM,EAAE,YAAY,CAAE,CAAC;IAC9C,CAAC;IAAC,OAAQ,GAAG,EAAG,CAAC;QAChB,QAAQ,CAAC,iBAAiB,CAAE,MAAM,EAAE,GAA2B,CAAE,CAAC;IACnE,CAAC;AACF,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAC1B,CAAE,MAAc,EAAG,EAAE,CACrB,KAAK,EAAG,EAAE,QAAQ,EAAY,EAAG,EAAE;IAClC,MAAM,MAAM,GAA0B,MAAM,YAAY,CAAE;QACzD,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAAE,MAAM,CAAE,GAAG,UAAU;QAC3D,UAAU,EAAE,KAAK;KACjB,CAAE,CAAC;IACJ,QAAQ,CAAC,kBAAkB,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAE,CAAC;AACxD,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAC3B,CAAE,MAAc,EAAG,EAAE,CACrB,KAAK,EAAG,EAAE,QAAQ,EAAY,EAAG,EAAE;IAClC,MAAM,MAAM,GAA+B,MAAM,YAAY,CAAE;QAC9D,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAAE,MAAM,CAAE,GAAG,WAAW;QAC5D,UAAU,EAAE,KAAK;KACjB,CAAE,CAAC;IAEJ,QAAQ,CAAC,mBAAmB,CAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAE,CAAC;AAC1D,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GACxB,CAAE,MAAc,EAAG,EAAE,CACrB,KAAK,EAAG,EAAE,QAAQ,EAAY,EAAG,EAAE;IAClC,MAAM,KAAK,GAAiB,MAAM,YAAY,CAAE;QAC/C,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAAE,MAAM,CAAE,GAAG,cAAc;QAC/D,UAAU,EAAE,KAAK;KACjB,CAAE,CAAC;IAEJ,QAAQ,CAAC,gBAAgB,CAAE,MAAM,EAAE,KAAK,CAAE,CAAC;AAC5C,CAAC,CAAC"}
+{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/site/resolvers.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAU5C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,OAAO,GACnB,CAAE,MAAc,EAAG,EAAE,CACrB,KAAK,EAAG,EAAE,QAAQ,EAAY,EAAG,EAAE;IAClC,QAAQ,CAAC,SAAS,EAAE,CAAC;IACrB,IAAI,CAAC;QACJ,MAAM,YAAY,GAA4B,MAAM,YAAY,CAAE;YACjE,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAAE,MAAM,CAAE;YAC9C,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,aAAa;SACpB,CAAE,CAAC;QACJ,QAAQ,CAAC,WAAW,CAAE,MAAM,EAAE,YAAY,CAAE,CAAC;IAC9C,CAAC;IAAC,OAAQ,GAAG,EAAG,CAAC;QAChB,QAAQ,CAAC,iBAAiB,CAAE,MAAM,EAAE,GAA2B,CAAE,CAAC;IACnE,CAAC;AACF,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAC1B,CAAE,MAAc,EAAG,EAAE,CACrB,KAAK,EAAG,EAAE,QAAQ,EAAY,EAAG,EAAE;IAClC,MAAM,MAAM,GAA0B,MAAM,YAAY,CAAE;QACzD,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAAE,MAAM,CAAE,GAAG,UAAU;QAC3D,UAAU,EAAE,KAAK;KACjB,CAAE,CAAC;IACJ,QAAQ,CAAC,kBAAkB,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAE,CAAC;AACxD,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAC3B,CAAE,MAAc,EAAG,EAAE,CACrB,KAAK,EAAG,EAAE,QAAQ,EAAY,EAAG,EAAE;IAClC,MAAM,MAAM,GAA+B,MAAM,YAAY,CAAE;QAC9D,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAAE,MAAM,CAAE,GAAG,WAAW;QAC5D,UAAU,EAAE,KAAK;KACjB,CAAE,CAAC;IAEJ,QAAQ,CAAC,mBAAmB,CAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAE,CAAC;AAC1D,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GACxB,CAAE,MAAc,EAAG,EAAE,CACrB,KAAK,EAAG,EAAE,QAAQ,EAAY,EAAG,EAAE;IAClC,MAAM,KAAK,GAAiB,MAAM,YAAY,CAAE;QAC/C,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAAE,MAAM,CAAE,GAAG,cAAc;QAC/D,UAAU,EAAE,KAAK;KACjB,CAAE,CAAC;IAEJ,QAAQ,CAAC,gBAAgB,CAAE,MAAM,EAAE,KAAK,CAAE,CAAC;AAC5C,CAAC,CAAC"}