@trpc/next 10.0.0-alpha.18 → 10.0.0-alpha.20
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/dist/index.js +4 -4
- package/dist/index.mjs +4 -4
- package/dist/setupNext.d.ts +1 -1
- package/dist/withTRPC.d.ts +2 -2
- package/dist/withTRPC.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/withTRPC.tsx +10 -11
package/dist/index.js
CHANGED
|
@@ -64,7 +64,7 @@ function withTRPC(opts) {
|
|
|
64
64
|
return {
|
|
65
65
|
queryClient: queryClient,
|
|
66
66
|
trpcClient: trpcClient,
|
|
67
|
-
|
|
67
|
+
ssrState: opts.ssr ? 'mounting' : false,
|
|
68
68
|
ssrContext: null
|
|
69
69
|
};
|
|
70
70
|
}),
|
|
@@ -72,14 +72,14 @@ function withTRPC(opts) {
|
|
|
72
72
|
_useState2$ = _useState2[0],
|
|
73
73
|
queryClient = _useState2$.queryClient,
|
|
74
74
|
trpcClient = _useState2$.trpcClient,
|
|
75
|
-
|
|
75
|
+
ssrState = _useState2$.ssrState,
|
|
76
76
|
ssrContext = _useState2$.ssrContext;
|
|
77
77
|
|
|
78
78
|
var hydratedState = trpc.useDehydratedState((_props$pageProps = props.pageProps) === null || _props$pageProps === void 0 ? void 0 : _props$pageProps.trpcState);
|
|
79
79
|
return /*#__PURE__*/React__default["default"].createElement(trpc.Provider, {
|
|
80
80
|
client: trpcClient,
|
|
81
81
|
queryClient: queryClient,
|
|
82
|
-
|
|
82
|
+
ssrState: ssrState,
|
|
83
83
|
ssrContext: ssrContext
|
|
84
84
|
}, /*#__PURE__*/React__default["default"].createElement(reactQuery.QueryClientProvider, {
|
|
85
85
|
client: queryClient
|
|
@@ -143,7 +143,7 @@ function withTRPC(opts) {
|
|
|
143
143
|
config: config,
|
|
144
144
|
trpcClient: trpcClient,
|
|
145
145
|
queryClient: queryClient,
|
|
146
|
-
|
|
146
|
+
ssrState: 'prepass',
|
|
147
147
|
ssrContext: ctx
|
|
148
148
|
};
|
|
149
149
|
prepassProps = {
|
package/dist/index.mjs
CHANGED
|
@@ -50,7 +50,7 @@ function withTRPC(opts) {
|
|
|
50
50
|
return {
|
|
51
51
|
queryClient: queryClient,
|
|
52
52
|
trpcClient: trpcClient,
|
|
53
|
-
|
|
53
|
+
ssrState: opts.ssr ? 'mounting' : false,
|
|
54
54
|
ssrContext: null
|
|
55
55
|
};
|
|
56
56
|
}),
|
|
@@ -58,14 +58,14 @@ function withTRPC(opts) {
|
|
|
58
58
|
_useState2$ = _useState2[0],
|
|
59
59
|
queryClient = _useState2$.queryClient,
|
|
60
60
|
trpcClient = _useState2$.trpcClient,
|
|
61
|
-
|
|
61
|
+
ssrState = _useState2$.ssrState,
|
|
62
62
|
ssrContext = _useState2$.ssrContext;
|
|
63
63
|
|
|
64
64
|
var hydratedState = trpc.useDehydratedState((_props$pageProps = props.pageProps) === null || _props$pageProps === void 0 ? void 0 : _props$pageProps.trpcState);
|
|
65
65
|
return /*#__PURE__*/React.createElement(trpc.Provider, {
|
|
66
66
|
client: trpcClient,
|
|
67
67
|
queryClient: queryClient,
|
|
68
|
-
|
|
68
|
+
ssrState: ssrState,
|
|
69
69
|
ssrContext: ssrContext
|
|
70
70
|
}, /*#__PURE__*/React.createElement(QueryClientProvider, {
|
|
71
71
|
client: queryClient
|
|
@@ -129,7 +129,7 @@ function withTRPC(opts) {
|
|
|
129
129
|
config: config,
|
|
130
130
|
trpcClient: trpcClient,
|
|
131
131
|
queryClient: queryClient,
|
|
132
|
-
|
|
132
|
+
ssrState: 'prepass',
|
|
133
133
|
ssrContext: ctx
|
|
134
134
|
};
|
|
135
135
|
prepassProps = {
|
package/dist/setupNext.d.ts
CHANGED
|
@@ -45,6 +45,6 @@ export declare function setupTRPC<TRouter extends AnyRouter>(opts: WithTRPCNoSSR
|
|
|
45
45
|
error?: ((err: import("@trpc/react").TRPCClientErrorLike<TRouter>) => void) | undefined;
|
|
46
46
|
next: (data: TOutput) => void;
|
|
47
47
|
}) => void;
|
|
48
|
-
withTRPC: (AppOrPage: import("next").NextComponentType<any, any, any>) => import("next").NextComponentType<import("next").NextPageContext, {}, {}>;
|
|
48
|
+
withTRPC: (AppOrPage: import("next/types").NextComponentType<any, any, any>) => import("next/types").NextComponentType<import("next/types").NextPageContext, {}, {}>;
|
|
49
49
|
};
|
|
50
50
|
//# sourceMappingURL=setupNext.d.ts.map
|
package/dist/withTRPC.d.ts
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
* Heavily based on urql's ssr
|
|
3
3
|
* https://github.com/FormidableLabs/urql/blob/main/packages/next-urql/src/with-urql-client.ts
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import type { CreateTRPCClientOptions } from '@trpc/client/src/internals/TRPCClient';
|
|
6
|
+
import { CreateReactQueryHooksOptions, TRPCClientError } from '@trpc/react';
|
|
6
7
|
import type { AnyRouter, ResponseMeta } from '@trpc/server';
|
|
7
8
|
import { NextComponentType, NextPageContext } from 'next/dist/shared/lib/utils';
|
|
8
|
-
import type { CreateTRPCClientOptions } from '@trpc/client/src/internals/TRPCClient';
|
|
9
9
|
import { QueryClient } from 'react-query';
|
|
10
10
|
declare type QueryClientConfig = ConstructorParameters<typeof QueryClient>[0];
|
|
11
11
|
export declare type WithTRPCConfig<TRouter extends AnyRouter> = CreateTRPCClientOptions<TRouter> & {
|
package/dist/withTRPC.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withTRPC.d.ts","sourceRoot":"","sources":["../src/withTRPC.tsx"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"withTRPC.d.ts","sourceRoot":"","sources":["../src/withTRPC.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EACL,4BAA4B,EAE5B,eAAe,EAIhB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,SAAS,EAAe,YAAY,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAGL,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAuB,MAAM,aAAa,CAAC;AAI/D,aAAK,iBAAiB,GAAG,qBAAqB,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AAwBtE,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAClD,uBAAuB,CAAC,OAAO,CAAC,GAAG;IACjC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC,CAAC;AAEJ,UAAU,eAAe,CAAC,OAAO,SAAS,SAAS,CACjD,SAAQ,4BAA4B;IACpC,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,CAAC,OAAO,SAAS,SAAS,EAChD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,eAW9C,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,KAAG,iBAAiB,CAsKxE"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/next",
|
|
3
|
-
"version": "10.0.0-alpha.
|
|
3
|
+
"version": "10.0.0-alpha.20",
|
|
4
4
|
"description": "tRPC Next lib",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -34,9 +34,9 @@
|
|
|
34
34
|
}
|
|
35
35
|
},
|
|
36
36
|
"peerDependencies": {
|
|
37
|
-
"@trpc/client": "10.0.0-alpha.
|
|
38
|
-
"@trpc/react": "10.0.0-alpha.
|
|
39
|
-
"@trpc/server": "10.0.0-alpha.
|
|
37
|
+
"@trpc/client": "10.0.0-alpha.20",
|
|
38
|
+
"@trpc/react": "10.0.0-alpha.20",
|
|
39
|
+
"@trpc/server": "10.0.0-alpha.20",
|
|
40
40
|
"next": "*",
|
|
41
41
|
"react": ">=16.8.0",
|
|
42
42
|
"react-dom": ">=16.8.0",
|
|
@@ -47,9 +47,9 @@
|
|
|
47
47
|
"react-ssr-prepass": "^1.5.0"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@trpc/client": "10.0.0-alpha.
|
|
51
|
-
"@trpc/react": "10.0.0-alpha.
|
|
52
|
-
"@trpc/server": "10.0.0-alpha.
|
|
50
|
+
"@trpc/client": "10.0.0-alpha.20",
|
|
51
|
+
"@trpc/react": "10.0.0-alpha.20",
|
|
52
|
+
"@trpc/server": "10.0.0-alpha.20",
|
|
53
53
|
"@types/express": "^4.17.12",
|
|
54
54
|
"express": "^4.17.1",
|
|
55
55
|
"next": "^12.0.1",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"publishConfig": {
|
|
62
62
|
"access": "public"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "b1d41d19a79b71045bf92dd6a5b8370a9f4f017c"
|
|
65
65
|
}
|
package/src/withTRPC.tsx
CHANGED
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
* Heavily based on urql's ssr
|
|
3
3
|
* https://github.com/FormidableLabs/urql/blob/main/packages/next-urql/src/with-urql-client.ts
|
|
4
4
|
*/
|
|
5
|
-
|
|
5
|
+
import type { CreateTRPCClientOptions } from '@trpc/client/src/internals/TRPCClient';
|
|
6
6
|
import {
|
|
7
|
-
|
|
8
|
-
createTRPCClient,
|
|
7
|
+
CreateReactQueryHooksOptions,
|
|
9
8
|
TRPCClient,
|
|
10
9
|
TRPCClientError,
|
|
11
10
|
TRPCClientErrorLike,
|
|
12
|
-
|
|
11
|
+
createReactQueryHooks,
|
|
12
|
+
createTRPCClient,
|
|
13
13
|
} from '@trpc/react';
|
|
14
14
|
import type { AnyRouter, Dict, Maybe, ResponseMeta } from '@trpc/server';
|
|
15
15
|
import {
|
|
@@ -18,10 +18,9 @@ import {
|
|
|
18
18
|
NextComponentType,
|
|
19
19
|
NextPageContext,
|
|
20
20
|
} from 'next/dist/shared/lib/utils';
|
|
21
|
-
import type { CreateTRPCClientOptions } from '@trpc/client/src/internals/TRPCClient';
|
|
22
21
|
import React, { createElement, useState } from 'react';
|
|
23
22
|
import { QueryClient, QueryClientProvider } from 'react-query';
|
|
24
|
-
import {
|
|
23
|
+
import { DehydratedState, Hydrate, dehydrate } from 'react-query';
|
|
25
24
|
import ssrPrepass from 'react-ssr-prepass';
|
|
26
25
|
|
|
27
26
|
type QueryClientConfig = ConstructorParameters<typeof QueryClient>[0];
|
|
@@ -80,7 +79,7 @@ export function withTRPC<TRouter extends AnyRouter>(
|
|
|
80
79
|
config: WithTRPCConfig<TRouter>;
|
|
81
80
|
queryClient: QueryClient;
|
|
82
81
|
trpcClient: TRPCClient<TRouter>;
|
|
83
|
-
|
|
82
|
+
ssrState: 'prepass';
|
|
84
83
|
ssrContext: NextPageContext;
|
|
85
84
|
};
|
|
86
85
|
return (AppOrPage: NextComponentType<any, any, any>): NextComponentType => {
|
|
@@ -91,7 +90,7 @@ export function withTRPC<TRouter extends AnyRouter>(
|
|
|
91
90
|
trpc?: TRPCPrepassProps;
|
|
92
91
|
},
|
|
93
92
|
) => {
|
|
94
|
-
const [{ queryClient, trpcClient,
|
|
93
|
+
const [{ queryClient, trpcClient, ssrState, ssrContext }] = useState(
|
|
95
94
|
() => {
|
|
96
95
|
if (props.trpc) {
|
|
97
96
|
return props.trpc;
|
|
@@ -102,7 +101,7 @@ export function withTRPC<TRouter extends AnyRouter>(
|
|
|
102
101
|
return {
|
|
103
102
|
queryClient,
|
|
104
103
|
trpcClient,
|
|
105
|
-
|
|
104
|
+
ssrState: opts.ssr ? ('mounting' as const) : (false as const),
|
|
106
105
|
ssrContext: null,
|
|
107
106
|
};
|
|
108
107
|
},
|
|
@@ -114,7 +113,7 @@ export function withTRPC<TRouter extends AnyRouter>(
|
|
|
114
113
|
<trpc.Provider
|
|
115
114
|
client={trpcClient}
|
|
116
115
|
queryClient={queryClient}
|
|
117
|
-
|
|
116
|
+
ssrState={ssrState}
|
|
118
117
|
ssrContext={ssrContext}
|
|
119
118
|
>
|
|
120
119
|
<QueryClientProvider client={queryClient}>
|
|
@@ -166,7 +165,7 @@ export function withTRPC<TRouter extends AnyRouter>(
|
|
|
166
165
|
config,
|
|
167
166
|
trpcClient,
|
|
168
167
|
queryClient,
|
|
169
|
-
|
|
168
|
+
ssrState: 'prepass',
|
|
170
169
|
ssrContext: ctx,
|
|
171
170
|
};
|
|
172
171
|
const prepassProps = {
|