specta-rs · oscartbeaumont · Oct 31, 2023 · Oct 31, 2023 · Oct 31, 2023 · Oct 31, 2023
diff --git a/examples/astro/package.json b/examples/astro/package.json
@@ -25,9 +25,9 @@
     "@rspc/solid-query": "workspace:*",
     "@rspc/svelte-query": "workspace:*",
     "@rspc/tauri": "workspace:^",
-    "@tanstack/react-query": "^4.36.1",
-    "@tanstack/solid-query": "^4.36.1",
-    "@tanstack/svelte-query": "^4.36.1",
+    "@tanstack/react-query": "^5.4.3",
+    "@tanstack/solid-query": "^5.4.3",
+    "@tanstack/svelte-query": "^5.4.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "solid-js": "^1.8.3",

diff --git a/examples/astro/src/components/react/index.tsx b/examples/astro/src/components/react/index.tsx
@@ -97,7 +97,7 @@ function Example({ name }: { name: string }) {
       </button>
       <button
         onClick={() => sendMsg.mutate("Hello!")}
-        disabled={sendMsg.isLoading}
+        disabled={sendMsg.isPending}
       >
         Send Msg!
       </button>

diff --git a/examples/astro/src/components/solid/index.tsx b/examples/astro/src/components/solid/index.tsx
@@ -100,7 +100,7 @@ function Example({ name }: { name: string }) {
       </button>
       <button
         onClick={() => sendMsg.mutate("Hello!")}
-        disabled={sendMsg.isLoading}
+        disabled={sendMsg.isPending}
       >
         Send Msg!
       </button>

diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@rspc/client": "workspace:*",
     "@rspc/react-query": "workspace:*",
-    "@tanstack/react-query": "^4.36.1",
+    "@tanstack/react-query": "^5.4.3",
     "next": "^13.5.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

diff --git a/examples/nextjs/pages/using-use-mutation.tsx b/examples/nextjs/pages/using-use-mutation.tsx
@@ -4,7 +4,7 @@ import { rspc } from "../src/rspc";
 import styles from "../styles/Home.module.css";
 
 const UsingUseMutation: NextPage = () => {
-  const { mutate, data, isLoading, error } = rspc.useMutation("sendMsg");
+  const { mutate, data, isPending, error } = rspc.useMutation("sendMsg");
 
   const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();
@@ -33,7 +33,7 @@ const UsingUseMutation: NextPage = () => {
         </form>
 
         <p className={styles.description}>
-          {isLoading && "Loading data ..."}
+          {isPending && "Loading data ..."}
           {data && `Server received message: ${data}`}
           {error && JSON.stringify(error)}
         </p>

diff --git a/examples/nextjs/tsconfig.json b/examples/nextjs/tsconfig.json
@@ -1,15 +1,16 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "ESNext",
+    "module": "ESNext",
+    // Enable node-style module resolution, for things like npm package imports.
+    "moduleResolution": "Bundler",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",

diff --git a/examples/vercel/package.json b/examples/vercel/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@rspc/client": "workspace:*",
     "@rspc/react-query": "workspace:*",
-    "@tanstack/react-query": "^4.36.1",
+    "@tanstack/react-query": "^5.4.3",
     "next": "^13.5.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

diff --git a/examples/vercel/pages/using-use-mutation.tsx b/examples/vercel/pages/using-use-mutation.tsx
@@ -4,7 +4,7 @@ import { rspc } from "../src/rspc";
 import styles from "../styles/Home.module.css";
 
 const UsingUseMutation: NextPage = () => {
-  const { mutate, data, isLoading, error } = rspc.useMutation("sendMsg");
+  const { mutate, data, isPending, error } = rspc.useMutation("sendMsg");
 
   return (
     <div className={styles.container}>
@@ -33,7 +33,7 @@ const UsingUseMutation: NextPage = () => {
         </form>
 
         <p className={styles.description}>
-          {isLoading && "Loading data ..."}
+          {isPending && "Loading data ..."}
           {data && `Server received message: ${data}`}
           {error && JSON.stringify(error)}
         </p>

diff --git a/packages/query-core/package.json b/packages/query-core/package.json
@@ -3,6 +3,7 @@
   "version": "1.0.0-rc.3",
   "description": "A blazingly fast and easy to use tRPC-like server for Rust.",
   "keywords": [],
+  "module": true,
   "author": "Oscar Beaumont",
   "license": "MIT",
   "main": "dist/index.js",
@@ -25,7 +26,7 @@
   },
   "devDependencies": {
     "@rspc/client": "workspace:*",
-    "@tanstack/query-core": "^4.36.1",
+    "@tanstack/query-core": "^5.4.3",
     "tslib": "^2.6.2",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",

diff --git a/packages/react-query/package.json b/packages/react-query/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@rspc/client": "workspace:*",
-    "@tanstack/react-query": "^4.36.1",
+    "@tanstack/react-query": "^5.4.3",
     "@types/react": "^18.2.31",
     "react": "^18.2.0",
     "tslib": "^2.6.2",

diff --git a/packages/react-query/src/index.tsx b/packages/react-query/src/index.tsx
@@ -89,7 +89,7 @@ export function createReactQueryHooks<P extends rspc.ProceduresDef>() {
           keyAndInput,
           opts: rawOpts,
         }),
-      [tanstack.hashQueryKey(keyAndInput), opts.enabled ?? true]
+      [tanstack.hashKey(keyAndInput), opts.enabled ?? true]
     );
   }
 

diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@rspc/client": "workspace:*",
-    "@tanstack/solid-query": "^4.36.1",
+    "@tanstack/solid-query": "^5.4.3",
     "rollup": "^4.1.4",
     "rollup-preset-solid": "^2.0.1",
     "solid-js": "^1.8.3",

diff --git a/packages/solid-query/src/index.tsx b/packages/solid-query/src/index.tsx
@@ -13,11 +13,11 @@ export function createSolidQueryHooks<P extends rspc.ProceduresDef>() {
     rspc.HookOptions<
       P,
       rspc.QueryOptionsOmit<
-        tanstack.CreateQueryOptions<
+        tanstack.SolidQueryOptions<
           rspc.inferQueryResult<P, K>,
           rspc.inferQueryError<P, K>,
           rspc.inferQueryResult<P, K>,
-          () => [K, rspc.inferQueryInput<P, K>]
+          [K, rspc.inferQueryInput<P, K>]
         >
       >
     >;
@@ -29,12 +29,7 @@ export function createSolidQueryHooks<P extends rspc.ProceduresDef>() {
     ],
     opts?: CreateQueryOptions<K>
   ) {
-    return tanstack.createQuery<
-      rspc.inferQueryResult<P, K>,
-      rspc.inferQueryError<P, K>,
-      rspc.inferQueryResult<P, K>,
-      () => [K, rspc.inferQueryInput<P, K>]
-    >(helpers.useQueryArgs(keyAndInput, opts));
+    return tanstack.createQuery(() => helpers.useQueryArgs(keyAndInput, opts));
   }
 
   type CreateMutationOptions<
@@ -56,7 +51,7 @@ export function createSolidQueryHooks<P extends rspc.ProceduresDef>() {
     K extends rspc.inferMutations<P>["key"] & string,
     TContext = unknown
   >(key: K | [K], opts?: CreateMutationOptions<K, TContext>) {
-    return tanstack.createMutation(helpers.useMutationArgs(key, opts));
+    return tanstack.createMutation(() => helpers.useMutationArgs(key, opts));
   }
 
   function createSubscription<

diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@rspc/client": "workspace:*",
     "@sveltejs/package": "^2.2.2",
-    "@tanstack/svelte-query": "^4.36.1",
+    "@tanstack/svelte-query": "^5.4.3",
     "tslib": "^2.6.2",
     "typescript": "^5.2.2",
     "vitest": "^0.34.6"

diff --git a/packages/tsconfig.json b/packages/tsconfig.json
@@ -1,6 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es2020",
+    "target": "ESNext",
+    "module": "ESNext",
+    // Enable node-style module resolution, for things like npm package imports.
+    "moduleResolution": "Bundler",
     "strict": true,
     // "noUnusedLocals": true,  // TODO: enable this
     // "noUnusedParameters": true, // TODO: enable this
@@ -9,7 +12,6 @@
     "noFallthroughCasesInSwitch": true,
     "noUncheckedIndexedAccess": true,
     "strictNullChecks": true,
-    "moduleResolution": "node",
     "esModuleInterop": true,
     "importHelpers": true,
     "skipLibCheck": true,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml