@tanstack/solid-query 4.13.0 → 4.14.0

package/build/lib/QueryClientProvider.esm.js

@@ -40,7 +40,13 @@ const QueryClientProvider = props => {
   const mergedProps = mergeProps({
     contextSharing: false
   }, props);
-  onMount(() => mergedProps.client.mount());
+  onMount(() => {
+    mergedProps.client.mount();
+
+    if (process.env.NODE_ENV !== 'production' && mergedProps.contextSharing) {
+      mergedProps.client.getLogger().error("The contextSharing option has been deprecated and will be removed in the next major version");
+    }
+  });
   onCleanup(() => mergedProps.client.unmount());
   const QueryClientContext = getQueryClientContext(mergedProps.context, mergedProps.contextSharing);
   return createComponent(QueryClientSharingContext.Provider, {

package/build/lib/QueryClientProvider.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryClientProvider.esm.js","sources":["../../src/QueryClientProvider.tsx"],"sourcesContent":["import type { QueryClient } from '@tanstack/query-core'\nimport type { Context, JSX } from 'solid-js'\nimport {\n  createContext,\n  useContext,\n  onMount,\n  onCleanup,\n  mergeProps,\n} from 'solid-js'\nimport type { ContextOptions } from './types'\n\ndeclare global {\n  interface Window {\n    SolidQueryClientContext?: Context<QueryClient | undefined>\n  }\n}\n\nexport const defaultContext = createContext<QueryClient | undefined>(undefined)\nconst QueryClientSharingContext = createContext<boolean>(false)\n\n// If we are given a context, we will use it.\n// Otherwise, if contextSharing is on, we share the first and at least one\n// instance of the context across the window\n// to ensure that if Solid Query is used across\n// different bundles or microfrontends they will\n// all use the same **instance** of context, regardless\n// of module scoping.\nfunction getQueryClientContext(\n  context: Context<QueryClient | undefined> | undefined,\n  contextSharing: boolean,\n) {\n  if (context) {\n    return context\n  }\n  if (contextSharing && typeof window !== 'undefined') {\n    if (!window.SolidQueryClientContext) {\n      window.SolidQueryClientContext = defaultContext\n    }\n\n    return window.SolidQueryClientContext\n  }\n\n  return defaultContext\n}\n\nexport const useQueryClient = ({ context }: ContextOptions = {}) => {\n  const queryClient = useContext(\n    getQueryClientContext(context, useContext(QueryClientSharingContext)),\n  )\n\n  if (!queryClient) {\n    throw new Error('No QueryClient set, use QueryClientProvider to set one')\n  }\n\n  return queryClient\n}\n\ntype QueryClientProviderPropsBase = {\n  client: QueryClient\n  children?: JSX.Element\n}\ntype QueryClientProviderPropsWithContext = ContextOptions & {\n  contextSharing?: never\n} & QueryClientProviderPropsBase\ntype QueryClientProviderPropsWithContextSharing = {\n  context?: never\n  contextSharing?: boolean\n} & QueryClientProviderPropsBase\n\nexport type QueryClientProviderProps =\n  | QueryClientProviderPropsWithContext\n  | QueryClientProviderPropsWithContextSharing\n\nexport const QueryClientProvider = (\n  props: QueryClientProviderProps,\n): JSX.Element => {\n  const mergedProps = mergeProps(\n    {\n      contextSharing: false,\n    },\n    props,\n  )\n  onMount(() => mergedProps.client.mount())\n  onCleanup(() => mergedProps.client.unmount())\n\n  const QueryClientContext = getQueryClientContext(\n    mergedProps.context,\n    mergedProps.contextSharing,\n  )\n\n  return (\n    <QueryClientSharingContext.Provider\n      value={!mergedProps.context && mergedProps.contextSharing}\n    >\n      <QueryClientContext.Provider value={mergedProps.client}>\n        {mergedProps.children}\n      </QueryClientContext.Provider>\n    </QueryClientSharingContext.Provider>\n  )\n}\n"],"names":["defaultContext","createContext","undefined","QueryClientSharingContext","getQueryClientContext","context","contextSharing","window","SolidQueryClientContext","useQueryClient","queryClient","useContext","Error","QueryClientProvider","props","mergedProps","mergeProps","onMount","client","mount","onCleanup","unmount","QueryClientContext","_$createComponent","children"],"mappings":";;MAiBaA,cAAc,GAAGC,aAAa,CAA0BC,SAA1B,EAApC;AACP,MAAMC,yBAAyB,GAAGF,aAAa,CAAU,KAAV,CAA/C;AAGA;AACA;AACA;AACA;AACA;AACA;;AACA,SAASG,qBAAT,CACEC,OADF,EAEEC,cAFF,EAGE;AACA,EAAA,IAAID,OAAJ,EAAa;AACX,IAAA,OAAOA,OAAP,CAAA;AACD,GAAA;;AACD,EAAA,IAAIC,cAAc,IAAI,OAAOC,MAAP,KAAkB,WAAxC,EAAqD;AACnD,IAAA,IAAI,CAACA,MAAM,CAACC,uBAAZ,EAAqC;MACnCD,MAAM,CAACC,uBAAP,GAAiCR,cAAjC,CAAA;AACD,KAAA;;IAED,OAAOO,MAAM,CAACC,uBAAd,CAAA;AACD,GAAA;;AAED,EAAA,OAAOR,cAAP,CAAA;AACD,CAAA;;AAEM,MAAMS,cAAc,GAAG,CAAC;AAAEJ,EAAAA,OAAAA;AAAF,CAAA,GAA8B,EAA/B,KAAsC;AAClE,EAAA,MAAMK,WAAW,GAAGC,UAAU,CAC5BP,qBAAqB,CAACC,OAAD,EAAUM,UAAU,CAACR,yBAAD,CAApB,CADO,CAA9B,CAAA;;EAIA,IAAI,CAACO,WAAL,EAAkB;AAChB,IAAA,MAAM,IAAIE,KAAJ,CAAU,wDAAV,CAAN,CAAA;AACD,GAAA;;AAED,EAAA,OAAOF,WAAP,CAAA;AACD,EAVM;AA4BMG,MAAAA,mBAAmB,GAC9BC,KADiC,IAEjB;EAChB,MAAMC,WAAW,GAAGC,UAAU,CAC5B;AACEV,IAAAA,cAAc,EAAE,KAAA;GAFU,EAI5BQ,KAJ4B,CAA9B,CAAA;EAMAG,OAAO,CAAC,MAAMF,WAAW,CAACG,MAAZ,CAAmBC,KAAnB,EAAP,CAAP,CAAA;EACAC,SAAS,CAAC,MAAML,WAAW,CAACG,MAAZ,CAAmBG,OAAnB,EAAP,CAAT,CAAA;EAEA,MAAMC,kBAAkB,GAAGlB,qBAAqB,CAC9CW,WAAW,CAACV,OADkC,EAE9CU,WAAW,CAACT,cAFkC,CAAhD,CAAA;EAKA,OACGiB,eAAA,CAAA,yBADH,CAC6B,QAD7B,EAAA;AAAA,IAAA,IAEI,KAFJ,GAAA;AAAA,MAAA,OAEW,CAACR,WAAW,CAACV,OAAb,IAAwBU,WAAW,CAACT,cAF/C,CAAA;AAAA,KAAA;;AAAA,IAAA,IAAA,QAAA,GAAA;MAAA,OAIKiB,eAAA,CAAA,kBAJL,CAIwB,QAJxB,EAAA;AAAA,QAAA,IAIiC,KAJjC,GAAA;UAAA,OAIwCR,WAAW,CAACG,MAJpD,CAAA;AAAA,SAAA;;AAAA,QAAA,IAAA,QAAA,GAAA;UAAA,OAKOH,WAAW,CAACS,QALnB,CAAA;AAAA,SAAA;;AAAA,OAAA,CAAA,CAAA;AAAA,KAAA;;AAAA,GAAA,CAAA,CAAA;AASD;;;;"}
+{"version":3,"file":"QueryClientProvider.esm.js","sources":["../../src/QueryClientProvider.tsx"],"sourcesContent":["import type { QueryClient } from '@tanstack/query-core'\nimport type { Context, JSX } from 'solid-js'\nimport {\n  createContext,\n  useContext,\n  onMount,\n  onCleanup,\n  mergeProps,\n} from 'solid-js'\nimport type { ContextOptions } from './types'\n\ndeclare global {\n  interface Window {\n    SolidQueryClientContext?: Context<QueryClient | undefined>\n  }\n}\n\nexport const defaultContext = createContext<QueryClient | undefined>(undefined)\nconst QueryClientSharingContext = createContext<boolean>(false)\n\n// If we are given a context, we will use it.\n// Otherwise, if contextSharing is on, we share the first and at least one\n// instance of the context across the window\n// to ensure that if Solid Query is used across\n// different bundles or microfrontends they will\n// all use the same **instance** of context, regardless\n// of module scoping.\nfunction getQueryClientContext(\n  context: Context<QueryClient | undefined> | undefined,\n  contextSharing: boolean,\n) {\n  if (context) {\n    return context\n  }\n  if (contextSharing && typeof window !== 'undefined') {\n    if (!window.SolidQueryClientContext) {\n      window.SolidQueryClientContext = defaultContext\n    }\n\n    return window.SolidQueryClientContext\n  }\n\n  return defaultContext\n}\n\nexport const useQueryClient = ({ context }: ContextOptions = {}) => {\n  const queryClient = useContext(\n    getQueryClientContext(context, useContext(QueryClientSharingContext)),\n  )\n\n  if (!queryClient) {\n    throw new Error('No QueryClient set, use QueryClientProvider to set one')\n  }\n\n  return queryClient\n}\n\ntype QueryClientProviderPropsBase = {\n  client: QueryClient\n  children?: JSX.Element\n}\ntype QueryClientProviderPropsWithContext = ContextOptions & {\n  contextSharing?: never\n} & QueryClientProviderPropsBase\ntype QueryClientProviderPropsWithContextSharing = {\n  context?: never\n  contextSharing?: boolean\n} & QueryClientProviderPropsBase\n\nexport type QueryClientProviderProps =\n  | QueryClientProviderPropsWithContext\n  | QueryClientProviderPropsWithContextSharing\n\nexport const QueryClientProvider = (\n  props: QueryClientProviderProps,\n): JSX.Element => {\n  const mergedProps = mergeProps(\n    {\n      contextSharing: false,\n    },\n    props,\n  )\n  onMount(() => {\n    mergedProps.client.mount()\n\n    if (process.env.NODE_ENV !== 'production' && mergedProps.contextSharing) {\n      mergedProps.client\n        .getLogger()\n        .error(\n          `The contextSharing option has been deprecated and will be removed in the next major version`,\n        )\n    }\n  })\n  onCleanup(() => mergedProps.client.unmount())\n\n  const QueryClientContext = getQueryClientContext(\n    mergedProps.context,\n    mergedProps.contextSharing,\n  )\n\n  return (\n    <QueryClientSharingContext.Provider\n      value={!mergedProps.context && mergedProps.contextSharing}\n    >\n      <QueryClientContext.Provider value={mergedProps.client}>\n        {mergedProps.children}\n      </QueryClientContext.Provider>\n    </QueryClientSharingContext.Provider>\n  )\n}\n"],"names":["defaultContext","createContext","undefined","QueryClientSharingContext","getQueryClientContext","context","contextSharing","window","SolidQueryClientContext","useQueryClient","queryClient","useContext","Error","QueryClientProvider","props","mergedProps","mergeProps","onMount","client","mount","process","env","NODE_ENV","getLogger","error","onCleanup","unmount","QueryClientContext","_$createComponent","children"],"mappings":";;MAiBaA,cAAc,GAAGC,aAAa,CAA0BC,SAA1B,EAApC;AACP,MAAMC,yBAAyB,GAAGF,aAAa,CAAU,KAAV,CAA/C;AAGA;AACA;AACA;AACA;AACA;AACA;;AACA,SAASG,qBAAT,CACEC,OADF,EAEEC,cAFF,EAGE;AACA,EAAA,IAAID,OAAJ,EAAa;AACX,IAAA,OAAOA,OAAP,CAAA;AACD,GAAA;;AACD,EAAA,IAAIC,cAAc,IAAI,OAAOC,MAAP,KAAkB,WAAxC,EAAqD;AACnD,IAAA,IAAI,CAACA,MAAM,CAACC,uBAAZ,EAAqC;MACnCD,MAAM,CAACC,uBAAP,GAAiCR,cAAjC,CAAA;AACD,KAAA;;IAED,OAAOO,MAAM,CAACC,uBAAd,CAAA;AACD,GAAA;;AAED,EAAA,OAAOR,cAAP,CAAA;AACD,CAAA;;AAEM,MAAMS,cAAc,GAAG,CAAC;AAAEJ,EAAAA,OAAAA;AAAF,CAAA,GAA8B,EAA/B,KAAsC;AAClE,EAAA,MAAMK,WAAW,GAAGC,UAAU,CAC5BP,qBAAqB,CAACC,OAAD,EAAUM,UAAU,CAACR,yBAAD,CAApB,CADO,CAA9B,CAAA;;EAIA,IAAI,CAACO,WAAL,EAAkB;AAChB,IAAA,MAAM,IAAIE,KAAJ,CAAU,wDAAV,CAAN,CAAA;AACD,GAAA;;AAED,EAAA,OAAOF,WAAP,CAAA;AACD,EAVM;AA4BMG,MAAAA,mBAAmB,GAC9BC,KADiC,IAEjB;EAChB,MAAMC,WAAW,GAAGC,UAAU,CAC5B;AACEV,IAAAA,cAAc,EAAE,KAAA;GAFU,EAI5BQ,KAJ4B,CAA9B,CAAA;AAMAG,EAAAA,OAAO,CAAC,MAAM;IACZF,WAAW,CAACG,MAAZ,CAAmBC,KAAnB,EAAA,CAAA;;IAEA,IAAIC,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAAzB,IAAyCP,WAAW,CAACT,cAAzD,EAAyE;AACvES,MAAAA,WAAW,CAACG,MAAZ,CACGK,SADH,GAEGC,KAFH,CAAA,6FAAA,CAAA,CAAA;AAKD,KAAA;AACF,GAVM,CAAP,CAAA;EAWAC,SAAS,CAAC,MAAMV,WAAW,CAACG,MAAZ,CAAmBQ,OAAnB,EAAP,CAAT,CAAA;EAEA,MAAMC,kBAAkB,GAAGvB,qBAAqB,CAC9CW,WAAW,CAACV,OADkC,EAE9CU,WAAW,CAACT,cAFkC,CAAhD,CAAA;EAKA,OACGsB,eAAA,CAAA,yBADH,CAC6B,QAD7B,EAAA;AAAA,IAAA,IAEI,KAFJ,GAAA;AAAA,MAAA,OAEW,CAACb,WAAW,CAACV,OAAb,IAAwBU,WAAW,CAACT,cAF/C,CAAA;AAAA,KAAA;;AAAA,IAAA,IAAA,QAAA,GAAA;MAAA,OAIKsB,eAAA,CAAA,kBAJL,CAIwB,QAJxB,EAAA;AAAA,QAAA,IAIiC,KAJjC,GAAA;UAAA,OAIwCb,WAAW,CAACG,MAJpD,CAAA;AAAA,SAAA;;AAAA,QAAA,IAAA,QAAA,GAAA;UAAA,OAKOH,WAAW,CAACc,QALnB,CAAA;AAAA,SAAA;;AAAA,OAAA,CAAA,CAAA;AAAA,KAAA;;AAAA,GAAA,CAAA,CAAA;AASD;;;;"}

package/build/lib/QueryClientProvider.js

@@ -44,7 +44,13 @@ const QueryClientProvider = props => {
   const mergedProps = solidJs.mergeProps({
     contextSharing: false
   }, props);
-  solidJs.onMount(() => mergedProps.client.mount());
+  solidJs.onMount(() => {
+    mergedProps.client.mount();
+
+    if (process.env.NODE_ENV !== 'production' && mergedProps.contextSharing) {
+      mergedProps.client.getLogger().error("The contextSharing option has been deprecated and will be removed in the next major version");
+    }
+  });
   solidJs.onCleanup(() => mergedProps.client.unmount());
   const QueryClientContext = getQueryClientContext(mergedProps.context, mergedProps.contextSharing);
   return solidJs.createComponent(QueryClientSharingContext.Provider, {

package/build/lib/QueryClientProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryClientProvider.js","sources":["../../src/QueryClientProvider.tsx"],"sourcesContent":["import type { QueryClient } from '@tanstack/query-core'\nimport type { Context, JSX } from 'solid-js'\nimport {\n  createContext,\n  useContext,\n  onMount,\n  onCleanup,\n  mergeProps,\n} from 'solid-js'\nimport type { ContextOptions } from './types'\n\ndeclare global {\n  interface Window {\n    SolidQueryClientContext?: Context<QueryClient | undefined>\n  }\n}\n\nexport const defaultContext = createContext<QueryClient | undefined>(undefined)\nconst QueryClientSharingContext = createContext<boolean>(false)\n\n// If we are given a context, we will use it.\n// Otherwise, if contextSharing is on, we share the first and at least one\n// instance of the context across the window\n// to ensure that if Solid Query is used across\n// different bundles or microfrontends they will\n// all use the same **instance** of context, regardless\n// of module scoping.\nfunction getQueryClientContext(\n  context: Context<QueryClient | undefined> | undefined,\n  contextSharing: boolean,\n) {\n  if (context) {\n    return context\n  }\n  if (contextSharing && typeof window !== 'undefined') {\n    if (!window.SolidQueryClientContext) {\n      window.SolidQueryClientContext = defaultContext\n    }\n\n    return window.SolidQueryClientContext\n  }\n\n  return defaultContext\n}\n\nexport const useQueryClient = ({ context }: ContextOptions = {}) => {\n  const queryClient = useContext(\n    getQueryClientContext(context, useContext(QueryClientSharingContext)),\n  )\n\n  if (!queryClient) {\n    throw new Error('No QueryClient set, use QueryClientProvider to set one')\n  }\n\n  return queryClient\n}\n\ntype QueryClientProviderPropsBase = {\n  client: QueryClient\n  children?: JSX.Element\n}\ntype QueryClientProviderPropsWithContext = ContextOptions & {\n  contextSharing?: never\n} & QueryClientProviderPropsBase\ntype QueryClientProviderPropsWithContextSharing = {\n  context?: never\n  contextSharing?: boolean\n} & QueryClientProviderPropsBase\n\nexport type QueryClientProviderProps =\n  | QueryClientProviderPropsWithContext\n  | QueryClientProviderPropsWithContextSharing\n\nexport const QueryClientProvider = (\n  props: QueryClientProviderProps,\n): JSX.Element => {\n  const mergedProps = mergeProps(\n    {\n      contextSharing: false,\n    },\n    props,\n  )\n  onMount(() => mergedProps.client.mount())\n  onCleanup(() => mergedProps.client.unmount())\n\n  const QueryClientContext = getQueryClientContext(\n    mergedProps.context,\n    mergedProps.contextSharing,\n  )\n\n  return (\n    <QueryClientSharingContext.Provider\n      value={!mergedProps.context && mergedProps.contextSharing}\n    >\n      <QueryClientContext.Provider value={mergedProps.client}>\n        {mergedProps.children}\n      </QueryClientContext.Provider>\n    </QueryClientSharingContext.Provider>\n  )\n}\n"],"names":["defaultContext","createContext","undefined","QueryClientSharingContext","getQueryClientContext","context","contextSharing","window","SolidQueryClientContext","useQueryClient","queryClient","useContext","Error","QueryClientProvider","props","mergedProps","mergeProps","onMount","client","mount","onCleanup","unmount","QueryClientContext","_$createComponent","children"],"mappings":";;;;;;MAiBaA,cAAc,GAAGC,qBAAa,CAA0BC,SAA1B,EAApC;AACP,MAAMC,yBAAyB,GAAGF,qBAAa,CAAU,KAAV,CAA/C;AAGA;AACA;AACA;AACA;AACA;AACA;;AACA,SAASG,qBAAT,CACEC,OADF,EAEEC,cAFF,EAGE;AACA,EAAA,IAAID,OAAJ,EAAa;AACX,IAAA,OAAOA,OAAP,CAAA;AACD,GAAA;;AACD,EAAA,IAAIC,cAAc,IAAI,OAAOC,MAAP,KAAkB,WAAxC,EAAqD;AACnD,IAAA,IAAI,CAACA,MAAM,CAACC,uBAAZ,EAAqC;MACnCD,MAAM,CAACC,uBAAP,GAAiCR,cAAjC,CAAA;AACD,KAAA;;IAED,OAAOO,MAAM,CAACC,uBAAd,CAAA;AACD,GAAA;;AAED,EAAA,OAAOR,cAAP,CAAA;AACD,CAAA;;AAEM,MAAMS,cAAc,GAAG,CAAC;AAAEJ,EAAAA,OAAAA;AAAF,CAAA,GAA8B,EAA/B,KAAsC;AAClE,EAAA,MAAMK,WAAW,GAAGC,kBAAU,CAC5BP,qBAAqB,CAACC,OAAD,EAAUM,kBAAU,CAACR,yBAAD,CAApB,CADO,CAA9B,CAAA;;EAIA,IAAI,CAACO,WAAL,EAAkB;AAChB,IAAA,MAAM,IAAIE,KAAJ,CAAU,wDAAV,CAAN,CAAA;AACD,GAAA;;AAED,EAAA,OAAOF,WAAP,CAAA;AACD,EAVM;AA4BMG,MAAAA,mBAAmB,GAC9BC,KADiC,IAEjB;EAChB,MAAMC,WAAW,GAAGC,kBAAU,CAC5B;AACEV,IAAAA,cAAc,EAAE,KAAA;GAFU,EAI5BQ,KAJ4B,CAA9B,CAAA;EAMAG,eAAO,CAAC,MAAMF,WAAW,CAACG,MAAZ,CAAmBC,KAAnB,EAAP,CAAP,CAAA;EACAC,iBAAS,CAAC,MAAML,WAAW,CAACG,MAAZ,CAAmBG,OAAnB,EAAP,CAAT,CAAA;EAEA,MAAMC,kBAAkB,GAAGlB,qBAAqB,CAC9CW,WAAW,CAACV,OADkC,EAE9CU,WAAW,CAACT,cAFkC,CAAhD,CAAA;EAKA,OACGiB,uBAAA,CAAA,yBADH,CAC6B,QAD7B,EAAA;AAAA,IAAA,IAEI,KAFJ,GAAA;AAAA,MAAA,OAEW,CAACR,WAAW,CAACV,OAAb,IAAwBU,WAAW,CAACT,cAF/C,CAAA;AAAA,KAAA;;AAAA,IAAA,IAAA,QAAA,GAAA;MAAA,OAIKiB,uBAAA,CAAA,kBAJL,CAIwB,QAJxB,EAAA;AAAA,QAAA,IAIiC,KAJjC,GAAA;UAAA,OAIwCR,WAAW,CAACG,MAJpD,CAAA;AAAA,SAAA;;AAAA,QAAA,IAAA,QAAA,GAAA;UAAA,OAKOH,WAAW,CAACS,QALnB,CAAA;AAAA,SAAA;;AAAA,OAAA,CAAA,CAAA;AAAA,KAAA;;AAAA,GAAA,CAAA,CAAA;AASD;;;;;;"}
+{"version":3,"file":"QueryClientProvider.js","sources":["../../src/QueryClientProvider.tsx"],"sourcesContent":["import type { QueryClient } from '@tanstack/query-core'\nimport type { Context, JSX } from 'solid-js'\nimport {\n  createContext,\n  useContext,\n  onMount,\n  onCleanup,\n  mergeProps,\n} from 'solid-js'\nimport type { ContextOptions } from './types'\n\ndeclare global {\n  interface Window {\n    SolidQueryClientContext?: Context<QueryClient | undefined>\n  }\n}\n\nexport const defaultContext = createContext<QueryClient | undefined>(undefined)\nconst QueryClientSharingContext = createContext<boolean>(false)\n\n// If we are given a context, we will use it.\n// Otherwise, if contextSharing is on, we share the first and at least one\n// instance of the context across the window\n// to ensure that if Solid Query is used across\n// different bundles or microfrontends they will\n// all use the same **instance** of context, regardless\n// of module scoping.\nfunction getQueryClientContext(\n  context: Context<QueryClient | undefined> | undefined,\n  contextSharing: boolean,\n) {\n  if (context) {\n    return context\n  }\n  if (contextSharing && typeof window !== 'undefined') {\n    if (!window.SolidQueryClientContext) {\n      window.SolidQueryClientContext = defaultContext\n    }\n\n    return window.SolidQueryClientContext\n  }\n\n  return defaultContext\n}\n\nexport const useQueryClient = ({ context }: ContextOptions = {}) => {\n  const queryClient = useContext(\n    getQueryClientContext(context, useContext(QueryClientSharingContext)),\n  )\n\n  if (!queryClient) {\n    throw new Error('No QueryClient set, use QueryClientProvider to set one')\n  }\n\n  return queryClient\n}\n\ntype QueryClientProviderPropsBase = {\n  client: QueryClient\n  children?: JSX.Element\n}\ntype QueryClientProviderPropsWithContext = ContextOptions & {\n  contextSharing?: never\n} & QueryClientProviderPropsBase\ntype QueryClientProviderPropsWithContextSharing = {\n  context?: never\n  contextSharing?: boolean\n} & QueryClientProviderPropsBase\n\nexport type QueryClientProviderProps =\n  | QueryClientProviderPropsWithContext\n  | QueryClientProviderPropsWithContextSharing\n\nexport const QueryClientProvider = (\n  props: QueryClientProviderProps,\n): JSX.Element => {\n  const mergedProps = mergeProps(\n    {\n      contextSharing: false,\n    },\n    props,\n  )\n  onMount(() => {\n    mergedProps.client.mount()\n\n    if (process.env.NODE_ENV !== 'production' && mergedProps.contextSharing) {\n      mergedProps.client\n        .getLogger()\n        .error(\n          `The contextSharing option has been deprecated and will be removed in the next major version`,\n        )\n    }\n  })\n  onCleanup(() => mergedProps.client.unmount())\n\n  const QueryClientContext = getQueryClientContext(\n    mergedProps.context,\n    mergedProps.contextSharing,\n  )\n\n  return (\n    <QueryClientSharingContext.Provider\n      value={!mergedProps.context && mergedProps.contextSharing}\n    >\n      <QueryClientContext.Provider value={mergedProps.client}>\n        {mergedProps.children}\n      </QueryClientContext.Provider>\n    </QueryClientSharingContext.Provider>\n  )\n}\n"],"names":["defaultContext","createContext","undefined","QueryClientSharingContext","getQueryClientContext","context","contextSharing","window","SolidQueryClientContext","useQueryClient","queryClient","useContext","Error","QueryClientProvider","props","mergedProps","mergeProps","onMount","client","mount","process","env","NODE_ENV","getLogger","error","onCleanup","unmount","QueryClientContext","_$createComponent","children"],"mappings":";;;;;;MAiBaA,cAAc,GAAGC,qBAAa,CAA0BC,SAA1B,EAApC;AACP,MAAMC,yBAAyB,GAAGF,qBAAa,CAAU,KAAV,CAA/C;AAGA;AACA;AACA;AACA;AACA;AACA;;AACA,SAASG,qBAAT,CACEC,OADF,EAEEC,cAFF,EAGE;AACA,EAAA,IAAID,OAAJ,EAAa;AACX,IAAA,OAAOA,OAAP,CAAA;AACD,GAAA;;AACD,EAAA,IAAIC,cAAc,IAAI,OAAOC,MAAP,KAAkB,WAAxC,EAAqD;AACnD,IAAA,IAAI,CAACA,MAAM,CAACC,uBAAZ,EAAqC;MACnCD,MAAM,CAACC,uBAAP,GAAiCR,cAAjC,CAAA;AACD,KAAA;;IAED,OAAOO,MAAM,CAACC,uBAAd,CAAA;AACD,GAAA;;AAED,EAAA,OAAOR,cAAP,CAAA;AACD,CAAA;;AAEM,MAAMS,cAAc,GAAG,CAAC;AAAEJ,EAAAA,OAAAA;AAAF,CAAA,GAA8B,EAA/B,KAAsC;AAClE,EAAA,MAAMK,WAAW,GAAGC,kBAAU,CAC5BP,qBAAqB,CAACC,OAAD,EAAUM,kBAAU,CAACR,yBAAD,CAApB,CADO,CAA9B,CAAA;;EAIA,IAAI,CAACO,WAAL,EAAkB;AAChB,IAAA,MAAM,IAAIE,KAAJ,CAAU,wDAAV,CAAN,CAAA;AACD,GAAA;;AAED,EAAA,OAAOF,WAAP,CAAA;AACD,EAVM;AA4BMG,MAAAA,mBAAmB,GAC9BC,KADiC,IAEjB;EAChB,MAAMC,WAAW,GAAGC,kBAAU,CAC5B;AACEV,IAAAA,cAAc,EAAE,KAAA;GAFU,EAI5BQ,KAJ4B,CAA9B,CAAA;AAMAG,EAAAA,eAAO,CAAC,MAAM;IACZF,WAAW,CAACG,MAAZ,CAAmBC,KAAnB,EAAA,CAAA;;IAEA,IAAIC,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAAzB,IAAyCP,WAAW,CAACT,cAAzD,EAAyE;AACvES,MAAAA,WAAW,CAACG,MAAZ,CACGK,SADH,GAEGC,KAFH,CAAA,6FAAA,CAAA,CAAA;AAKD,KAAA;AACF,GAVM,CAAP,CAAA;EAWAC,iBAAS,CAAC,MAAMV,WAAW,CAACG,MAAZ,CAAmBQ,OAAnB,EAAP,CAAT,CAAA;EAEA,MAAMC,kBAAkB,GAAGvB,qBAAqB,CAC9CW,WAAW,CAACV,OADkC,EAE9CU,WAAW,CAACT,cAFkC,CAAhD,CAAA;EAKA,OACGsB,uBAAA,CAAA,yBADH,CAC6B,QAD7B,EAAA;AAAA,IAAA,IAEI,KAFJ,GAAA;AAAA,MAAA,OAEW,CAACb,WAAW,CAACV,OAAb,IAAwBU,WAAW,CAACT,cAF/C,CAAA;AAAA,KAAA;;AAAA,IAAA,IAAA,QAAA,GAAA;MAAA,OAIKsB,uBAAA,CAAA,kBAJL,CAIwB,QAJxB,EAAA;AAAA,QAAA,IAIiC,KAJjC,GAAA;UAAA,OAIwCb,WAAW,CAACG,MAJpD,CAAA;AAAA,SAAA;;AAAA,QAAA,IAAA,QAAA,GAAA;UAAA,OAKOH,WAAW,CAACc,QALnB,CAAA;AAAA,SAAA;;AAAA,OAAA,CAAA,CAAA;AAAA,KAAA;;AAAA,GAAA,CAAA,CAAA;AASD;;;;;;"}

package/build/lib/QueryClientProvider.mjs

@@ -40,7 +40,13 @@ const QueryClientProvider = props => {
   const mergedProps = mergeProps({
     contextSharing: false
   }, props);
-  onMount(() => mergedProps.client.mount());
+  onMount(() => {
+    mergedProps.client.mount();
+
+    if (process.env.NODE_ENV !== 'production' && mergedProps.contextSharing) {
+      mergedProps.client.getLogger().error("The contextSharing option has been deprecated and will be removed in the next major version");
+    }
+  });
   onCleanup(() => mergedProps.client.unmount());
   const QueryClientContext = getQueryClientContext(mergedProps.context, mergedProps.contextSharing);
   return createComponent(QueryClientSharingContext.Provider, {

package/build/lib/QueryClientProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"QueryClientProvider.mjs","sources":["../../src/QueryClientProvider.tsx"],"sourcesContent":["import type { QueryClient } from '@tanstack/query-core'\nimport type { Context, JSX } from 'solid-js'\nimport {\n  createContext,\n  useContext,\n  onMount,\n  onCleanup,\n  mergeProps,\n} from 'solid-js'\nimport type { ContextOptions } from './types'\n\ndeclare global {\n  interface Window {\n    SolidQueryClientContext?: Context<QueryClient | undefined>\n  }\n}\n\nexport const defaultContext = createContext<QueryClient | undefined>(undefined)\nconst QueryClientSharingContext = createContext<boolean>(false)\n\n// If we are given a context, we will use it.\n// Otherwise, if contextSharing is on, we share the first and at least one\n// instance of the context across the window\n// to ensure that if Solid Query is used across\n// different bundles or microfrontends they will\n// all use the same **instance** of context, regardless\n// of module scoping.\nfunction getQueryClientContext(\n  context: Context<QueryClient | undefined> | undefined,\n  contextSharing: boolean,\n) {\n  if (context) {\n    return context\n  }\n  if (contextSharing && typeof window !== 'undefined') {\n    if (!window.SolidQueryClientContext) {\n      window.SolidQueryClientContext = defaultContext\n    }\n\n    return window.SolidQueryClientContext\n  }\n\n  return defaultContext\n}\n\nexport const useQueryClient = ({ context }: ContextOptions = {}) => {\n  const queryClient = useContext(\n    getQueryClientContext(context, useContext(QueryClientSharingContext)),\n  )\n\n  if (!queryClient) {\n    throw new Error('No QueryClient set, use QueryClientProvider to set one')\n  }\n\n  return queryClient\n}\n\ntype QueryClientProviderPropsBase = {\n  client: QueryClient\n  children?: JSX.Element\n}\ntype QueryClientProviderPropsWithContext = ContextOptions & {\n  contextSharing?: never\n} & QueryClientProviderPropsBase\ntype QueryClientProviderPropsWithContextSharing = {\n  context?: never\n  contextSharing?: boolean\n} & QueryClientProviderPropsBase\n\nexport type QueryClientProviderProps =\n  | QueryClientProviderPropsWithContext\n  | QueryClientProviderPropsWithContextSharing\n\nexport const QueryClientProvider = (\n  props: QueryClientProviderProps,\n): JSX.Element => {\n  const mergedProps = mergeProps(\n    {\n      contextSharing: false,\n    },\n    props,\n  )\n  onMount(() => mergedProps.client.mount())\n  onCleanup(() => mergedProps.client.unmount())\n\n  const QueryClientContext = getQueryClientContext(\n    mergedProps.context,\n    mergedProps.contextSharing,\n  )\n\n  return (\n    <QueryClientSharingContext.Provider\n      value={!mergedProps.context && mergedProps.contextSharing}\n    >\n      <QueryClientContext.Provider value={mergedProps.client}>\n        {mergedProps.children}\n      </QueryClientContext.Provider>\n    </QueryClientSharingContext.Provider>\n  )\n}\n"],"names":["defaultContext","createContext","undefined","QueryClientSharingContext","getQueryClientContext","context","contextSharing","window","SolidQueryClientContext","useQueryClient","queryClient","useContext","Error","QueryClientProvider","props","mergedProps","mergeProps","onMount","client","mount","onCleanup","unmount","QueryClientContext","_$createComponent","children"],"mappings":";;MAiBaA,cAAc,GAAGC,aAAa,CAA0BC,SAA1B,EAApC;AACP,MAAMC,yBAAyB,GAAGF,aAAa,CAAU,KAAV,CAA/C;AAGA;AACA;AACA;AACA;AACA;AACA;;AACA,SAASG,qBAAT,CACEC,OADF,EAEEC,cAFF,EAGE;AACA,EAAA,IAAID,OAAJ,EAAa;AACX,IAAA,OAAOA,OAAP,CAAA;AACD,GAAA;;AACD,EAAA,IAAIC,cAAc,IAAI,OAAOC,MAAP,KAAkB,WAAxC,EAAqD;AACnD,IAAA,IAAI,CAACA,MAAM,CAACC,uBAAZ,EAAqC;MACnCD,MAAM,CAACC,uBAAP,GAAiCR,cAAjC,CAAA;AACD,KAAA;;IAED,OAAOO,MAAM,CAACC,uBAAd,CAAA;AACD,GAAA;;AAED,EAAA,OAAOR,cAAP,CAAA;AACD,CAAA;;AAEM,MAAMS,cAAc,GAAG,CAAC;AAAEJ,EAAAA,OAAAA;AAAF,CAAA,GAA8B,EAA/B,KAAsC;AAClE,EAAA,MAAMK,WAAW,GAAGC,UAAU,CAC5BP,qBAAqB,CAACC,OAAD,EAAUM,UAAU,CAACR,yBAAD,CAApB,CADO,CAA9B,CAAA;;EAIA,IAAI,CAACO,WAAL,EAAkB;AAChB,IAAA,MAAM,IAAIE,KAAJ,CAAU,wDAAV,CAAN,CAAA;AACD,GAAA;;AAED,EAAA,OAAOF,WAAP,CAAA;AACD,EAVM;AA4BMG,MAAAA,mBAAmB,GAC9BC,KADiC,IAEjB;EAChB,MAAMC,WAAW,GAAGC,UAAU,CAC5B;AACEV,IAAAA,cAAc,EAAE,KAAA;GAFU,EAI5BQ,KAJ4B,CAA9B,CAAA;EAMAG,OAAO,CAAC,MAAMF,WAAW,CAACG,MAAZ,CAAmBC,KAAnB,EAAP,CAAP,CAAA;EACAC,SAAS,CAAC,MAAML,WAAW,CAACG,MAAZ,CAAmBG,OAAnB,EAAP,CAAT,CAAA;EAEA,MAAMC,kBAAkB,GAAGlB,qBAAqB,CAC9CW,WAAW,CAACV,OADkC,EAE9CU,WAAW,CAACT,cAFkC,CAAhD,CAAA;EAKA,OACGiB,eAAA,CAAA,yBADH,CAC6B,QAD7B,EAAA;AAAA,IAAA,IAEI,KAFJ,GAAA;AAAA,MAAA,OAEW,CAACR,WAAW,CAACV,OAAb,IAAwBU,WAAW,CAACT,cAF/C,CAAA;AAAA,KAAA;;AAAA,IAAA,IAAA,QAAA,GAAA;MAAA,OAIKiB,eAAA,CAAA,kBAJL,CAIwB,QAJxB,EAAA;AAAA,QAAA,IAIiC,KAJjC,GAAA;UAAA,OAIwCR,WAAW,CAACG,MAJpD,CAAA;AAAA,SAAA;;AAAA,QAAA,IAAA,QAAA,GAAA;UAAA,OAKOH,WAAW,CAACS,QALnB,CAAA;AAAA,SAAA;;AAAA,OAAA,CAAA,CAAA;AAAA,KAAA;;AAAA,GAAA,CAAA,CAAA;AASD;;;;"}
+{"version":3,"file":"QueryClientProvider.mjs","sources":["../../src/QueryClientProvider.tsx"],"sourcesContent":["import type { QueryClient } from '@tanstack/query-core'\nimport type { Context, JSX } from 'solid-js'\nimport {\n  createContext,\n  useContext,\n  onMount,\n  onCleanup,\n  mergeProps,\n} from 'solid-js'\nimport type { ContextOptions } from './types'\n\ndeclare global {\n  interface Window {\n    SolidQueryClientContext?: Context<QueryClient | undefined>\n  }\n}\n\nexport const defaultContext = createContext<QueryClient | undefined>(undefined)\nconst QueryClientSharingContext = createContext<boolean>(false)\n\n// If we are given a context, we will use it.\n// Otherwise, if contextSharing is on, we share the first and at least one\n// instance of the context across the window\n// to ensure that if Solid Query is used across\n// different bundles or microfrontends they will\n// all use the same **instance** of context, regardless\n// of module scoping.\nfunction getQueryClientContext(\n  context: Context<QueryClient | undefined> | undefined,\n  contextSharing: boolean,\n) {\n  if (context) {\n    return context\n  }\n  if (contextSharing && typeof window !== 'undefined') {\n    if (!window.SolidQueryClientContext) {\n      window.SolidQueryClientContext = defaultContext\n    }\n\n    return window.SolidQueryClientContext\n  }\n\n  return defaultContext\n}\n\nexport const useQueryClient = ({ context }: ContextOptions = {}) => {\n  const queryClient = useContext(\n    getQueryClientContext(context, useContext(QueryClientSharingContext)),\n  )\n\n  if (!queryClient) {\n    throw new Error('No QueryClient set, use QueryClientProvider to set one')\n  }\n\n  return queryClient\n}\n\ntype QueryClientProviderPropsBase = {\n  client: QueryClient\n  children?: JSX.Element\n}\ntype QueryClientProviderPropsWithContext = ContextOptions & {\n  contextSharing?: never\n} & QueryClientProviderPropsBase\ntype QueryClientProviderPropsWithContextSharing = {\n  context?: never\n  contextSharing?: boolean\n} & QueryClientProviderPropsBase\n\nexport type QueryClientProviderProps =\n  | QueryClientProviderPropsWithContext\n  | QueryClientProviderPropsWithContextSharing\n\nexport const QueryClientProvider = (\n  props: QueryClientProviderProps,\n): JSX.Element => {\n  const mergedProps = mergeProps(\n    {\n      contextSharing: false,\n    },\n    props,\n  )\n  onMount(() => {\n    mergedProps.client.mount()\n\n    if (process.env.NODE_ENV !== 'production' && mergedProps.contextSharing) {\n      mergedProps.client\n        .getLogger()\n        .error(\n          `The contextSharing option has been deprecated and will be removed in the next major version`,\n        )\n    }\n  })\n  onCleanup(() => mergedProps.client.unmount())\n\n  const QueryClientContext = getQueryClientContext(\n    mergedProps.context,\n    mergedProps.contextSharing,\n  )\n\n  return (\n    <QueryClientSharingContext.Provider\n      value={!mergedProps.context && mergedProps.contextSharing}\n    >\n      <QueryClientContext.Provider value={mergedProps.client}>\n        {mergedProps.children}\n      </QueryClientContext.Provider>\n    </QueryClientSharingContext.Provider>\n  )\n}\n"],"names":["defaultContext","createContext","undefined","QueryClientSharingContext","getQueryClientContext","context","contextSharing","window","SolidQueryClientContext","useQueryClient","queryClient","useContext","Error","QueryClientProvider","props","mergedProps","mergeProps","onMount","client","mount","process","env","NODE_ENV","getLogger","error","onCleanup","unmount","QueryClientContext","_$createComponent","children"],"mappings":";;MAiBaA,cAAc,GAAGC,aAAa,CAA0BC,SAA1B,EAApC;AACP,MAAMC,yBAAyB,GAAGF,aAAa,CAAU,KAAV,CAA/C;AAGA;AACA;AACA;AACA;AACA;AACA;;AACA,SAASG,qBAAT,CACEC,OADF,EAEEC,cAFF,EAGE;AACA,EAAA,IAAID,OAAJ,EAAa;AACX,IAAA,OAAOA,OAAP,CAAA;AACD,GAAA;;AACD,EAAA,IAAIC,cAAc,IAAI,OAAOC,MAAP,KAAkB,WAAxC,EAAqD;AACnD,IAAA,IAAI,CAACA,MAAM,CAACC,uBAAZ,EAAqC;MACnCD,MAAM,CAACC,uBAAP,GAAiCR,cAAjC,CAAA;AACD,KAAA;;IAED,OAAOO,MAAM,CAACC,uBAAd,CAAA;AACD,GAAA;;AAED,EAAA,OAAOR,cAAP,CAAA;AACD,CAAA;;AAEM,MAAMS,cAAc,GAAG,CAAC;AAAEJ,EAAAA,OAAAA;AAAF,CAAA,GAA8B,EAA/B,KAAsC;AAClE,EAAA,MAAMK,WAAW,GAAGC,UAAU,CAC5BP,qBAAqB,CAACC,OAAD,EAAUM,UAAU,CAACR,yBAAD,CAApB,CADO,CAA9B,CAAA;;EAIA,IAAI,CAACO,WAAL,EAAkB;AAChB,IAAA,MAAM,IAAIE,KAAJ,CAAU,wDAAV,CAAN,CAAA;AACD,GAAA;;AAED,EAAA,OAAOF,WAAP,CAAA;AACD,EAVM;AA4BMG,MAAAA,mBAAmB,GAC9BC,KADiC,IAEjB;EAChB,MAAMC,WAAW,GAAGC,UAAU,CAC5B;AACEV,IAAAA,cAAc,EAAE,KAAA;GAFU,EAI5BQ,KAJ4B,CAA9B,CAAA;AAMAG,EAAAA,OAAO,CAAC,MAAM;IACZF,WAAW,CAACG,MAAZ,CAAmBC,KAAnB,EAAA,CAAA;;IAEA,IAAIC,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAAzB,IAAyCP,WAAW,CAACT,cAAzD,EAAyE;AACvES,MAAAA,WAAW,CAACG,MAAZ,CACGK,SADH,GAEGC,KAFH,CAAA,6FAAA,CAAA,CAAA;AAKD,KAAA;AACF,GAVM,CAAP,CAAA;EAWAC,SAAS,CAAC,MAAMV,WAAW,CAACG,MAAZ,CAAmBQ,OAAnB,EAAP,CAAT,CAAA;EAEA,MAAMC,kBAAkB,GAAGvB,qBAAqB,CAC9CW,WAAW,CAACV,OADkC,EAE9CU,WAAW,CAACT,cAFkC,CAAhD,CAAA;EAKA,OACGsB,eAAA,CAAA,yBADH,CAC6B,QAD7B,EAAA;AAAA,IAAA,IAEI,KAFJ,GAAA;AAAA,MAAA,OAEW,CAACb,WAAW,CAACV,OAAb,IAAwBU,WAAW,CAACT,cAF/C,CAAA;AAAA,KAAA;;AAAA,IAAA,IAAA,QAAA,GAAA;MAAA,OAIKsB,eAAA,CAAA,kBAJL,CAIwB,QAJxB,EAAA;AAAA,QAAA,IAIiC,KAJjC,GAAA;UAAA,OAIwCb,WAAW,CAACG,MAJpD,CAAA;AAAA,SAAA;;AAAA,QAAA,IAAA,QAAA,GAAA;UAAA,OAKOH,WAAW,CAACc,QALnB,CAAA;AAAA,SAAA;;AAAA,OAAA,CAAA,CAAA;AAAA,KAAA;;AAAA,GAAA,CAAA,CAAA;AASD;;;;"}

package/build/solid/QueryClientProvider.jsx

@@ -31,7 +31,14 @@ export const QueryClientProvider = (props) => {
     const mergedProps = mergeProps({
         contextSharing: false,
     }, props);
-    onMount(() => mergedProps.client.mount());
+    onMount(() => {
+        mergedProps.client.mount();
+        if (process.env.NODE_ENV !== 'production' && mergedProps.contextSharing) {
+            mergedProps.client
+                .getLogger()
+                .error(`The contextSharing option has been deprecated and will be removed in the next major version`);
+        }
+    });
     onCleanup(() => mergedProps.client.unmount());
     const QueryClientContext = getQueryClientContext(mergedProps.context, mergedProps.contextSharing);
     return (<QueryClientSharingContext.Provider value={!mergedProps.context && mergedProps.contextSharing}>

package/build/solid/__tests__/createQuery.test.jsx

@@ -1429,16 +1429,20 @@ describe('createQuery', () => {
             createRenderEffect(() => {
                 states.push({ ...state });
             });
-            createEffect(() => {
-                setActTimeout(() => {
-                    setCount(1);
-                }, 20);
-            });
-            return null;
+            return (<div>
+          <h1>
+            data: {state.data}, count: {count}, isFetching:{' '}
+            {String(state.isFetching)}
+          </h1>
+          <button onClick={() => setCount(1)}>inc</button>
+        </div>);
         }
         render(() => (<QueryClientProvider client={queryClient}>
         <Page />
       </QueryClientProvider>));
+        await waitFor(() => screen.getByText('data: 0, count: 0, isFetching: false'));
+        fireEvent.click(screen.getByRole('button', { name: 'inc' }));
+        await waitFor(() => screen.getByText('data: 1, count: 1, isFetching: false'));
         await waitFor(() => expect(states.length).toBe(4));
         // Initial
         expect(states[0]).toMatchObject({
@@ -1456,10 +1460,10 @@ describe('createQuery', () => {
         });
         // Set state
         expect(states[2]).toMatchObject({
-            data: 0,
+            data: 99,
             isFetching: true,
             isSuccess: true,
-            isPreviousData: true,
+            isPreviousData: false,
         });
         // New data
         expect(states[3]).toMatchObject({

package/build/umd/index.development.js

@@ -1232,9 +1232,8 @@
 
   function getDefaultState$1(options) {
     const data = typeof options.initialData === 'function' ? options.initialData() : options.initialData;
-    const hasInitialData = typeof options.initialData !== 'undefined';
-    const initialDataUpdatedAt = hasInitialData ? typeof options.initialDataUpdatedAt === 'function' ? options.initialDataUpdatedAt() : options.initialDataUpdatedAt : 0;
     const hasData = typeof data !== 'undefined';
+    const initialDataUpdatedAt = hasData ? typeof options.initialDataUpdatedAt === 'function' ? options.initialDataUpdatedAt() : options.initialDataUpdatedAt : 0;
     return {
       data,
       dataUpdateCount: 0,
@@ -1842,6 +1841,10 @@
       this.defaultOptions = config.defaultOptions || {};
       this.queryDefaults = [];
       this.mutationDefaults = [];
+
+      if (config.logger) {
+        this.logger.error("Passing a custom logger has been deprecated and will be removed in the next major version.");
+      }
     }
 
     mount() {
@@ -2215,6 +2218,10 @@
       const prevQuery = this.currentQuery;
       this.options = this.client.defaultQueryOptions(options);
 
+      if (typeof (options == null ? void 0 : options.isDataEqual) !== 'undefined') {
+        this.client.getLogger().error("The isDataEqual option has been deprecated and will be removed in the next major version. You can achieve the same functionality by passing a function as the structuralSharing option");
+      }
+
       if (!shallowEqualObjects(prevOptions, this.options)) {
         this.client.getQueryCache().notify({
           type: 'observerOptionsUpdated',
@@ -2427,7 +2434,7 @@
       } // Keep previous data if needed
 
 
-      if (options.keepPreviousData && !state.dataUpdateCount && prevQueryResult != null && prevQueryResult.isSuccess && status !== 'error') {
+      if (options.keepPreviousData && !state.dataUpdatedAt && prevQueryResult != null && prevQueryResult.isSuccess && status !== 'error') {
         data = prevQueryResult.data;
         dataUpdatedAt = prevQueryResult.dataUpdatedAt;
         status = prevQueryResult.status;
@@ -2469,7 +2476,6 @@
           if (options.select && typeof placeholderData !== 'undefined') {
             try {
               placeholderData = options.select(placeholderData);
-              placeholderData = replaceData(prevResult == null ? void 0 : prevResult.data, placeholderData, options);
               this.selectError = null;
             } catch (selectError) {
               {
@@ -2483,7 +2489,7 @@
 
         if (typeof placeholderData !== 'undefined') {
           status = 'success';
-          data = placeholderData;
+          data = replaceData(prevResult == null ? void 0 : prevResult.data, placeholderData, options);
           isPlaceholderData = true;
         }
       }
@@ -3213,7 +3219,13 @@
     const mergedProps = solidJs.mergeProps({
       contextSharing: false
     }, props);
-    solidJs.onMount(() => mergedProps.client.mount());
+    solidJs.onMount(() => {
+      mergedProps.client.mount();
+
+      if (mergedProps.contextSharing) {
+        mergedProps.client.getLogger().error("The contextSharing option has been deprecated and will be removed in the next major version");
+      }
+    });
     solidJs.onCleanup(() => mergedProps.client.unmount());
     const QueryClientContext = getQueryClientContext(mergedProps.context, mergedProps.contextSharing);
     return solidJs.createComponent(QueryClientSharingContext.Provider, {
@@ -3501,6 +3513,7 @@
   exports.parseMutationArgs = parseMutationArgs;
   exports.parseMutationFilterArgs = parseMutationFilterArgs;
   exports.parseQueryArgs = parseQueryArgs$1;
+  exports.replaceEqualDeep = replaceEqualDeep;
   exports.useIsFetching = useIsFetching;
   exports.useIsMutating = useIsMutating;
   exports.useQueryClient = useQueryClient;