@trpc/next 10.0.0-proxy-beta.20 → 10.0.0-proxy-beta.22

package/README.md

@@ -22,13 +22,13 @@ Full documentation for `@trpc/next` can be found [here](https://trpc.io/docs/nex
 
 ```bash
 # npm
-npm install @trpc/next@next @trpc/react@next @tanstack/react-query
+npm install @trpc/next@next @trpc/react-query@next @tanstack/react-query
 
 # Yarn
-yarn add @trpc/next@next @trpc/react@next @tanstack-react-query
+yarn add @trpc/next@next @trpc/react-query@next @tanstack-react-query
 
 # pnpm
-pnpm add @trpc/next@next @trpc/react@next @tanstack/react-query
+pnpm add @trpc/next@next @trpc/react-query@next @tanstack/react-query
 ```
 
 ## Basic Example

package/dist/createTRPCNext.d.ts

@@ -1,4 +1,4 @@
-import { CreateReactUtilsProxy, DecoratedProcedureRecord } from '@trpc/react/shared';
+import { CreateReactUtilsProxy, DecoratedProcedureRecord } from '@trpc/react-query/shared';
 import { AnyRouter } from '@trpc/server';
 import { NextPageContext } from 'next/types';
 import { WithTRPCNoSSROptions, WithTRPCSSROptions } from './withTRPC';

package/dist/createTRPCNext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTRPCNext.d.ts","sourceRoot":"","sources":["../src/createTRPCNext.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EAIzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAY,MAAM,YAAY,CAAC;AAEhF,wBAAgB,cAAc,CAC5B,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC;kBAOjD,sBAAsB,OAAO,EAAE,WAAW,CAAC;;4DAqB5D"}
+{"version":3,"file":"createTRPCNext.d.ts","sourceRoot":"","sources":["../src/createTRPCNext.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EAIzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAY,MAAM,YAAY,CAAC;AAEhF,wBAAgB,cAAc,CAC5B,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC;kBAUjD,sBAAsB,OAAO,EAAE,WAAW,CAAC;;4DAqB5D"}

package/dist/index.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var reactQuery = require('@tanstack/react-query');
-var react = require('@trpc/react');
-var shared = require('@trpc/react/shared');
+var reactQuery$1 = require('@tanstack/react-query');
+var reactQuery = require('@trpc/react-query');
+var shared = require('@trpc/react-query/shared');
 var React = require('react');
 var ssrPrepass = require('react-ssr-prepass');
 var shared$1 = require('@trpc/server/shared');
@@ -35,7 +35,9 @@ function transformQueryOrMutationCacheErrors(result) {
 function withTRPC(opts) {
     const { config: getClientConfig  } = opts;
     return (AppOrPage)=>{
-        const trpc = react.createReactQueryHooks();
+        const trpc = reactQuery.createReactQueryHooks({
+            unstable_overrides: opts.config({}).unstable_overrides
+        });
         const WithTRPC = (props)=>{
             const [prepassProps] = React.useState(()=>{
                 if (props.trpc) {
@@ -61,9 +63,9 @@ function withTRPC(opts) {
                 queryClient: queryClient,
                 ssrState: ssrState,
                 ssrContext: ssrContext
-            }, /*#__PURE__*/ React__default["default"].createElement(reactQuery.QueryClientProvider, {
+            }, /*#__PURE__*/ React__default["default"].createElement(reactQuery$1.QueryClientProvider, {
                 client: queryClient
-            }, /*#__PURE__*/ React__default["default"].createElement(reactQuery.Hydrate, {
+            }, /*#__PURE__*/ React__default["default"].createElement(reactQuery$1.Hydrate, {
                 state: hydratedState
             }, /*#__PURE__*/ React__default["default"].createElement(AppOrPage, Object.assign({}, props)))));
         };
@@ -92,7 +94,7 @@ function withTRPC(opts) {
                 const config = getClientConfig({
                     ctx
                 });
-                const trpcClient = react.createTRPCClient(config);
+                const trpcClient = reactQuery.createTRPCClient(config);
                 const queryClient = shared.getQueryClient(config);
                 const trpcProp = {
                     config,
@@ -123,7 +125,7 @@ function withTRPC(opts) {
                         });
                     });
                 }
-                const dehydratedCache = reactQuery.dehydrate(queryClient, {
+                const dehydratedCache = reactQuery$1.dehydrate(queryClient, {
                     shouldDehydrateQuery () {
                         // makes sure errors are also dehydrated
                         return true;
@@ -165,7 +167,10 @@ function withTRPC(opts) {
 }
 
 function createTRPCNext(opts) {
-    const hooks = shared.createHooksInternal();
+    const unstable_overrides = opts.config({}).unstable_overrides;
+    const hooks = shared.createHooksInternal({
+        unstable_overrides
+    });
     // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
     const _withTRPC = withTRPC(opts);
     return shared$1.createFlatProxy((key)=>{

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { dehydrate, QueryClientProvider, Hydrate } from '@tanstack/react-query';
-import { createReactQueryHooks, createTRPCClient } from '@trpc/react';
-import { getQueryClient, createHooksInternal, createReactQueryUtilsProxy, createReactProxyDecoration } from '@trpc/react/shared';
+import { createReactQueryHooks, createTRPCClient } from '@trpc/react-query';
+import { getQueryClient, createHooksInternal, createReactQueryUtilsProxy, createReactProxyDecoration } from '@trpc/react-query/shared';
 import React, { createElement, useState, useMemo } from 'react';
 import ssrPrepass from 'react-ssr-prepass';
 import { createFlatProxy } from '@trpc/server/shared';
@@ -26,7 +26,9 @@ function transformQueryOrMutationCacheErrors(result) {
 function withTRPC(opts) {
     const { config: getClientConfig  } = opts;
     return (AppOrPage)=>{
-        const trpc = createReactQueryHooks();
+        const trpc = createReactQueryHooks({
+            unstable_overrides: opts.config({}).unstable_overrides
+        });
         const WithTRPC = (props)=>{
             const [prepassProps] = useState(()=>{
                 if (props.trpc) {
@@ -156,7 +158,10 @@ function withTRPC(opts) {
 }
 
 function createTRPCNext(opts) {
-    const hooks = createHooksInternal();
+    const unstable_overrides = opts.config({}).unstable_overrides;
+    const hooks = createHooksInternal({
+        unstable_overrides
+    });
     // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
     const _withTRPC = withTRPC(opts);
     return createFlatProxy((key)=>{

package/dist/withTRPC.d.ts

@@ -1,11 +1,11 @@
 import type { CreateTRPCClientOptions } from '@trpc/client';
-import { TRPCClientError } from '@trpc/react';
-import { CreateTRPCReactQueryClientConfig } from '@trpc/react/shared';
+import { TRPCClientError } from '@trpc/react-query';
+import { CreateTRPCReactOptions, CreateTRPCReactQueryClientConfig } from '@trpc/react-query/shared';
 import type { AnyRouter, ResponseMeta } from '@trpc/server';
 import { NextComponentType, NextPageContext } from 'next/dist/shared/lib/utils';
 export declare type WithTRPCConfig<TRouter extends AnyRouter> = CreateTRPCClientOptions<TRouter> & {
     abortOnUnmount?: boolean;
-} & CreateTRPCReactQueryClientConfig;
+} & CreateTRPCReactQueryClientConfig & CreateTRPCReactOptions<TRouter>;
 interface WithTRPCOptions<TRouter extends AnyRouter> {
     config: (info: {
         ctx?: NextPageContext;

package/dist/withTRPC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withTRPC.d.ts","sourceRoot":"","sources":["../src/withTRPC.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAEL,eAAe,EAIhB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,gCAAgC,EAEjC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAe,YAAY,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAGL,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AA2BpC,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAClD,uBAAuB,CAAC,OAAO,CAAC,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,gCAAgC,CAAC;AAEvC,UAAU,eAAe,CAAC,OAAO,SAAS,SAAS;IACjD,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,EAAE,eAAe,CAAA;KAAE,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QACpB,GAAG,EAAE,eAAe,CAAC;QACrB,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KAC1C,KAAK,YAAY,CAAC;CACpB;AACD,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,SAAS,CAC7D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,CAAC,EAAE,KAAK,CAAC;CACb;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,eAU9C,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KAAG,iBAAiB,CA6KxE"}
+{"version":3,"file":"withTRPC.d.ts","sourceRoot":"","sources":["../src/withTRPC.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAEL,eAAe,EAIhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sBAAsB,EACtB,gCAAgC,EAEjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAe,YAAY,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAGL,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AA2BpC,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAClD,uBAAuB,CAAC,OAAO,CAAC,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,gCAAgC,GAClC,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAEpC,UAAU,eAAe,CAAC,OAAO,SAAS,SAAS;IACjD,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,EAAE,eAAe,CAAA;KAAE,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QACpB,GAAG,EAAE,eAAe,CAAC;QACrB,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KAC1C,KAAK,YAAY,CAAC;CACpB;AACD,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,SAAS,CAC7D,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,GAAG,CAAC,EAAE,KAAK,CAAC;CACb;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,eAU9C,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KAAG,iBAAiB,CA+KxE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/next",
-  "version": "10.0.0-proxy-beta.20",
+  "version": "10.0.0-proxy-beta.22",
   "description": "tRPC Next lib",
   "author": "KATT",
   "license": "MIT",
@@ -36,9 +36,9 @@
   },
   "peerDependencies": {
     "@tanstack/react-query": "^4.3.8",
-    "@trpc/client": "10.0.0-proxy-beta.20",
-    "@trpc/react": "10.0.0-proxy-beta.20",
-    "@trpc/server": "10.0.0-proxy-beta.20",
+    "@trpc/client": "10.0.0-proxy-beta.22",
+    "@trpc/react-query": "^10.0.0-proxy-beta.21",
+    "@trpc/server": "10.0.0-proxy-beta.22",
     "next": "*",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
@@ -48,9 +48,9 @@
   },
   "devDependencies": {
     "@tanstack/react-query": "^4.3.8",
-    "@trpc/client": "10.0.0-proxy-beta.20",
-    "@trpc/react": "10.0.0-proxy-beta.20",
-    "@trpc/server": "10.0.0-proxy-beta.20",
+    "@trpc/client": "10.0.0-proxy-beta.22",
+    "@trpc/react-query": "^10.0.0-proxy-beta.22",
+    "@trpc/server": "10.0.0-proxy-beta.22",
     "@types/express": "^4.17.12",
     "@types/node": "^18.7.20",
     "express": "^4.17.1",
@@ -62,5 +62,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "df14f1d7a120ac61872394411e9622139b823dff"
+  "gitHead": "e67c30a49fd057ca0f5c048352efe803b59b104a"
 }

package/src/createTRPCNext.tsx

@@ -4,7 +4,7 @@ import {
   createHooksInternal,
   createReactProxyDecoration,
   createReactQueryUtilsProxy,
-} from '@trpc/react/shared';
+} from '@trpc/react-query/shared';
 import { AnyRouter } from '@trpc/server';
 import { createFlatProxy } from '@trpc/server/shared';
 import { NextPageContext } from 'next/types';
@@ -15,7 +15,10 @@ export function createTRPCNext<
   TRouter extends AnyRouter,
   TSSRContext extends NextPageContext = NextPageContext,
 >(opts: WithTRPCNoSSROptions<TRouter> | WithTRPCSSROptions<TRouter>) {
-  const hooks = createHooksInternal<TRouter, TSSRContext>();
+  const unstable_overrides = opts.config({}).unstable_overrides;
+  const hooks = createHooksInternal<TRouter, TSSRContext>({
+    unstable_overrides,
+  });
 
   // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
   const _withTRPC = withTRPC<TRouter, TSSRContext>(opts);

package/src/withTRPC.tsx

@@ -16,11 +16,12 @@ import {
   TRPCClientErrorLike,
   createReactQueryHooks,
   createTRPCClient,
-} from '@trpc/react';
+} from '@trpc/react-query';
 import {
+  CreateTRPCReactOptions,
   CreateTRPCReactQueryClientConfig,
   getQueryClient,
-} from '@trpc/react/shared';
+} from '@trpc/react-query/shared';
 import type { AnyRouter, Dict, Maybe, ResponseMeta } from '@trpc/server';
 import {
   AppContextType,
@@ -57,7 +58,8 @@ function transformQueryOrMutationCacheErrors<
 export type WithTRPCConfig<TRouter extends AnyRouter> =
   CreateTRPCClientOptions<TRouter> & {
     abortOnUnmount?: boolean;
-  } & CreateTRPCReactQueryClientConfig;
+  } & CreateTRPCReactQueryClientConfig &
+    CreateTRPCReactOptions<TRouter>;
 
 interface WithTRPCOptions<TRouter extends AnyRouter> {
   config: (info: { ctx?: NextPageContext }) => WithTRPCConfig<TRouter>;
@@ -90,7 +92,9 @@ export function withTRPC<
     ssrContext: TSSRContext;
   };
   return (AppOrPage: NextComponentType<any, any, any>): NextComponentType => {
-    const trpc = createReactQueryHooks<TRouter, TSSRContext>();
+    const trpc = createReactQueryHooks<TRouter, TSSRContext>({
+      unstable_overrides: opts.config({}).unstable_overrides,
+    });
 
     const WithTRPC = (
       props: AppPropsType<NextRouter, any> & {