@apollo/client 4.1.0 → 4.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/__cjs/core/ObservableQuery.cjs +5 -3
- package/__cjs/core/ObservableQuery.cjs.map +1 -1
- package/__cjs/local-state/LocalState.cjs +1 -1
- package/__cjs/local-state/LocalState.cjs.map +1 -1
- package/__cjs/react/ssr/useSSRQuery.cjs +6 -4
- package/__cjs/react/ssr/useSSRQuery.cjs.map +1 -1
- package/__cjs/react/ssr/useSSRQuery.d.cts +2 -1
- package/__cjs/version.cjs +1 -1
- package/core/ObservableQuery.js +5 -3
- package/core/ObservableQuery.js.map +1 -1
- package/local-state/LocalState.js +1 -1
- package/local-state/LocalState.js.map +1 -1
- package/package.json +1 -1
- package/react/ssr/useSSRQuery.d.ts +2 -1
- package/react/ssr/useSSRQuery.js +7 -5
- package/react/ssr/useSSRQuery.js.map +1 -1
- package/version.js +1 -1
package/react/ssr/useSSRQuery.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { NetworkStatus } from "@apollo/client";
|
|
2
|
-
import { useApolloClient, useQuery } from "@apollo/client/react";
|
|
2
|
+
import { skipToken, useApolloClient, useQuery } from "@apollo/client/react";
|
|
3
3
|
import { maybeDeepFreeze } from "@apollo/client/utilities/internal";
|
|
4
4
|
const skipStandbyResult = maybeDeepFreeze({
|
|
5
5
|
loading: false,
|
|
@@ -14,7 +14,7 @@ export const useSSRQuery = function (query, options = {}) {
|
|
|
14
14
|
function notAllowed() {
|
|
15
15
|
throw new Error("This method cannot be called during SSR.");
|
|
16
16
|
}
|
|
17
|
-
const client = useApolloClient(options.client);
|
|
17
|
+
const client = useApolloClient(typeof options === "object" ? options.client : undefined);
|
|
18
18
|
const baseResult = {
|
|
19
19
|
client,
|
|
20
20
|
refetch: notAllowed,
|
|
@@ -23,16 +23,18 @@ export const useSSRQuery = function (query, options = {}) {
|
|
|
23
23
|
updateQuery: notAllowed,
|
|
24
24
|
startPolling: notAllowed,
|
|
25
25
|
stopPolling: notAllowed,
|
|
26
|
-
variables: options?.variables,
|
|
26
|
+
variables: typeof options === "object" ? options?.variables : undefined,
|
|
27
27
|
previousData: undefined,
|
|
28
28
|
};
|
|
29
|
-
if (options
|
|
29
|
+
if (options === skipToken ||
|
|
30
|
+
options.skip ||
|
|
31
|
+
options.fetchPolicy === "standby") {
|
|
30
32
|
return withoutObservableAccess({
|
|
31
33
|
...baseResult,
|
|
32
34
|
...skipStandbyResult,
|
|
33
35
|
});
|
|
34
36
|
}
|
|
35
|
-
if (options.ssr === false) {
|
|
37
|
+
if (options.ssr === false || options.fetchPolicy === "no-cache") {
|
|
36
38
|
return withoutObservableAccess({
|
|
37
39
|
...baseResult,
|
|
38
40
|
...useQuery.ssrDisabledResult,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSSRQuery.js","sourceRoot":"","sources":["../../../src/react/ssr/useSSRQuery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"useSSRQuery.js","sourceRoot":"","sources":["../../../src/react/ssr/useSSRQuery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAIpE,MAAM,iBAAiB,GAAgC,eAAe,CAAC;IACrE,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,KAAK,CAAQ;IACnB,SAAS,EAAE,OAAO;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,aAAa,EAAE,aAAa,CAAC,KAAK;IAClC,OAAO,EAAE,IAAI;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,UAGzB,KAAmB,EACnB,UAAkD,EAAE;IAEpD,aAAa,CAAC;IACd,SAAS,UAAU;QACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,MAAM,GAAG,eAAe,CAC5B,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CACzD,CAAC;IAEF,MAAM,UAAU,GAGZ;QACF,MAAM;QACN,OAAO,EAAE,UAAU;QACnB,SAAS,EAAE,UAAU;QACrB,eAAe,EAAE,UAAU;QAC3B,WAAW,EAAE,UAAU;QACvB,YAAY,EAAE,UAAU;QACxB,WAAW,EAAE,UAAU;QACvB,SAAS,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS;QACvE,YAAY,EAAE,SAAS;KACxB,CAAC;IAEF,IACE,OAAO,KAAK,SAAS;QACrB,OAAO,CAAC,IAAI;QACZ,OAAO,CAAC,WAAW,KAAK,SAAS,EACjC,CAAC;QACD,OAAO,uBAAuB,CAAC;YAC7B,GAAG,UAAU;YACb,GAAG,iBAAiB;SACrB,CAAC,CAAC;IACL,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK,IAAI,OAAO,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;QAChE,OAAO,uBAAuB,CAAC;YAC7B,GAAG,UAAU;YACb,GAAG,QAAQ,CAAC,iBAAiB;SAC9B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACnE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;YAC7B,KAAK;YACL,GAAG,OAAO;YACV,WAAW,EACT,CACE,OAAO,CAAC,WAAW,KAAK,cAAc;gBACtC,OAAO,CAAC,WAAW,KAAK,mBAAmB,CAC5C,CAAC,CAAC;gBACD,aAAa;gBACf,CAAC,CAAC,OAAO,CAAC,WAAW;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,wBAAwB,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;IACD,OAAO;QACL,UAAU;QACV,GAAG,UAAU,CAAC,gBAAgB,EAAE;QAChC,GAAG,UAAU;KACd,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,uBAAuB,CAC9B,KAAQ;IAER,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE;QACzC,GAAG;YACD,MAAM,IAAI,KAAK,CACb,qGAAqG,CACtG,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IACH,OAAO,KAAY,CAAC;AACtB,CAAC","sourcesContent":["import type { DocumentNode } from \"graphql\";\n\nimport type { ObservableQuery } from \"@apollo/client\";\nimport { NetworkStatus } from \"@apollo/client\";\nimport type { SkipToken } from \"@apollo/client/react\";\nimport { skipToken, useApolloClient, useQuery } from \"@apollo/client/react\";\nimport { maybeDeepFreeze } from \"@apollo/client/utilities/internal\";\n\nimport type { PrerenderStaticInternalContext } from \"./prerenderStatic.js\";\n\nconst skipStandbyResult: ObservableQuery.Result<any> = maybeDeepFreeze({\n loading: false,\n data: void 0 as any,\n dataState: \"empty\",\n error: void 0,\n networkStatus: NetworkStatus.ready,\n partial: true,\n});\n\nexport const useSSRQuery = function (\n // eslint-disable-next-line react-hooks/unsupported-syntax\n this: PrerenderStaticInternalContext,\n query: DocumentNode,\n options: useQuery.Options<any, any> | SkipToken = {}\n): useQuery.Result<any, any> {\n \"use no memo\";\n function notAllowed(): never {\n throw new Error(\"This method cannot be called during SSR.\");\n }\n const client = useApolloClient(\n typeof options === \"object\" ? options.client : undefined\n );\n\n const baseResult: Omit<\n useQuery.Result,\n \"observable\" | \"data\" | \"error\" | \"loading\" | \"networkStatus\" | \"dataState\"\n > = {\n client,\n refetch: notAllowed,\n fetchMore: notAllowed,\n subscribeToMore: notAllowed,\n updateQuery: notAllowed,\n startPolling: notAllowed,\n stopPolling: notAllowed,\n variables: typeof options === \"object\" ? options?.variables : undefined,\n previousData: undefined,\n };\n\n if (\n options === skipToken ||\n options.skip ||\n options.fetchPolicy === \"standby\"\n ) {\n return withoutObservableAccess({\n ...baseResult,\n ...skipStandbyResult,\n });\n }\n if (options.ssr === false || options.fetchPolicy === \"no-cache\") {\n return withoutObservableAccess({\n ...baseResult,\n ...useQuery.ssrDisabledResult,\n });\n }\n\n let observable = this.getObservableQuery(query, options.variables);\n if (!observable) {\n observable = client.watchQuery({\n query,\n ...options,\n fetchPolicy:\n (\n options.fetchPolicy === \"network-only\" ||\n options.fetchPolicy === \"cache-and-network\"\n ) ?\n \"cache-first\"\n : options.fetchPolicy,\n });\n this.onCreatedObservableQuery(observable, query, options.variables);\n }\n return {\n observable,\n ...observable.getCurrentResult(),\n ...baseResult,\n };\n};\n\nfunction withoutObservableAccess<T>(\n value: T\n): T & { observable: ObservableQuery<any, any> } {\n Object.defineProperty(value, \"observable\", {\n get() {\n throw new Error(\n '\"observable\" property is not accessible on skipped hooks or hook calls with `ssr: false` during SSR'\n );\n },\n });\n return value as any;\n}\n"]}
|
package/version.js
CHANGED