@trpc/next 10.0.0-alpha.3 → 10.0.0-alpha.7

package/dist/index.js

@@ -10,7 +10,6 @@ var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var react = require('@trpc/react');
 var React = require('react');
 var reactQuery = require('react-query');
-var hydration = require('react-query/hydration');
 var ssrPrepass = require('react-ssr-prepass');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -84,7 +83,7 @@ function withTRPC(opts) {
         ssrContext: ssrContext
       }, /*#__PURE__*/React__default["default"].createElement(reactQuery.QueryClientProvider, {
         client: queryClient
-      }, /*#__PURE__*/React__default["default"].createElement(hydration.Hydrate, {
+      }, /*#__PURE__*/React__default["default"].createElement(reactQuery.Hydrate, {
         state: hydratedState
       }, /*#__PURE__*/React__default["default"].createElement(AppOrPage, props))));
     };
@@ -92,7 +91,7 @@ function withTRPC(opts) {
     if (AppOrPage.getInitialProps || opts.ssr) {
       WithTRPC.getInitialProps = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(appOrPageCtx) {
-          var _opts$responseMeta, _opts$responseMeta2;
+          var _opts$responseMeta;
 
           var AppTree, isApp, ctx, pageProps, _originalProps$pagePr, originalProps, originalPageProps, getAppTreeProps, config, trpcClient, queryClient, trpcProp, prepassProps, dehydratedCache, dehydratedCacheWithErrors, appTreeProps, meta, _i, _Object$entries, _Object$entries$_i, key, value, _ctx$res;
 
@@ -182,7 +181,7 @@ function withTRPC(opts) {
                   break;
 
                 case 27:
-                  dehydratedCache = hydration.dehydrate(queryClient, {
+                  dehydratedCache = reactQuery.dehydrate(queryClient, {
                     shouldDehydrateQuery: function shouldDehydrateQuery() {
                       // makes sure errors are also dehydrated
                       return true;
@@ -196,16 +195,16 @@ function withTRPC(opts) {
 
                   pageProps.trpcState = opts.transformer ? opts.transformer.serialize(dehydratedCacheWithErrors) : dehydratedCacheWithErrors;
                   appTreeProps = getAppTreeProps(pageProps);
-                  meta = (_opts$responseMeta = (_opts$responseMeta2 = opts.responseMeta) === null || _opts$responseMeta2 === void 0 ? void 0 : _opts$responseMeta2.call(opts, {
+                  meta = ((_opts$responseMeta = opts.responseMeta) === null || _opts$responseMeta === void 0 ? void 0 : _opts$responseMeta.call(opts, {
                     ctx: ctx,
                     clientErrors: [].concat(_toConsumableArray__default["default"](dehydratedCache.queries), _toConsumableArray__default["default"](dehydratedCache.mutations)).map(function (v) {
                       return v.state.error;
                     }).flatMap(function (err) {
                       return err instanceof Error && err.name === 'TRPCClientError' ? [err] : [];
                     })
-                  })) !== null && _opts$responseMeta !== void 0 ? _opts$responseMeta : {};
+                  })) || {};
 
-                  for (_i = 0, _Object$entries = Object.entries(meta); _i < _Object$entries.length; _i++) {
+                  for (_i = 0, _Object$entries = Object.entries(meta.headers || {}); _i < _Object$entries.length; _i++) {
                     _Object$entries$_i = _slicedToArray__default["default"](_Object$entries[_i], 2), key = _Object$entries$_i[0], value = _Object$entries$_i[1];
 
                     if (typeof value === 'string') {

package/dist/index.mjs

@@ -5,8 +5,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import { createReactQueryHooks, createTRPCClient } from '@trpc/react';
 import React, { useState, createElement } from 'react';
-import { QueryClient, QueryClientProvider } from 'react-query';
-import { Hydrate, dehydrate } from 'react-query/hydration';
+import { QueryClient, QueryClientProvider, Hydrate, dehydrate } from 'react-query';
 import ssrPrepass from 'react-ssr-prepass';
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -78,7 +77,7 @@ function withTRPC(opts) {
     if (AppOrPage.getInitialProps || opts.ssr) {
       WithTRPC.getInitialProps = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appOrPageCtx) {
-          var _opts$responseMeta, _opts$responseMeta2;
+          var _opts$responseMeta;
 
           var AppTree, isApp, ctx, pageProps, _originalProps$pagePr, originalProps, originalPageProps, getAppTreeProps, config, trpcClient, queryClient, trpcProp, prepassProps, dehydratedCache, dehydratedCacheWithErrors, appTreeProps, meta, _i, _Object$entries, _Object$entries$_i, key, value, _ctx$res;
 
@@ -182,16 +181,16 @@ function withTRPC(opts) {
 
                   pageProps.trpcState = opts.transformer ? opts.transformer.serialize(dehydratedCacheWithErrors) : dehydratedCacheWithErrors;
                   appTreeProps = getAppTreeProps(pageProps);
-                  meta = (_opts$responseMeta = (_opts$responseMeta2 = opts.responseMeta) === null || _opts$responseMeta2 === void 0 ? void 0 : _opts$responseMeta2.call(opts, {
+                  meta = ((_opts$responseMeta = opts.responseMeta) === null || _opts$responseMeta === void 0 ? void 0 : _opts$responseMeta.call(opts, {
                     ctx: ctx,
                     clientErrors: [].concat(_toConsumableArray(dehydratedCache.queries), _toConsumableArray(dehydratedCache.mutations)).map(function (v) {
                       return v.state.error;
                     }).flatMap(function (err) {
                       return err instanceof Error && err.name === 'TRPCClientError' ? [err] : [];
                     })
-                  })) !== null && _opts$responseMeta !== void 0 ? _opts$responseMeta : {};
+                  })) || {};
 
-                  for (_i = 0, _Object$entries = Object.entries(meta); _i < _Object$entries.length; _i++) {
+                  for (_i = 0, _Object$entries = Object.entries(meta.headers || {}); _i < _Object$entries.length; _i++) {
                     _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2), key = _Object$entries$_i[0], value = _Object$entries$_i[1];
 
                     if (typeof value === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/next",
-  "version": "10.0.0-alpha.3",
+  "version": "10.0.0-alpha.7",
   "description": "tRPC Next lib",
   "author": "KATT",
   "license": "MIT",
@@ -34,9 +34,9 @@
     }
   },
   "peerDependencies": {
-    "@trpc/client": "10.0.0-alpha.3",
-    "@trpc/react": "10.0.0-alpha.3",
-    "@trpc/server": "10.0.0-alpha.3",
+    "@trpc/client": "10.0.0-alpha.7",
+    "@trpc/react": "10.0.0-alpha.7",
+    "@trpc/server": "10.0.0-alpha.7",
     "next": "*",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
@@ -47,9 +47,9 @@
     "react-ssr-prepass": "^1.5.0"
   },
   "devDependencies": {
-    "@trpc/client": "10.0.0-alpha.3",
-    "@trpc/react": "10.0.0-alpha.3",
-    "@trpc/server": "10.0.0-alpha.3",
+    "@trpc/client": "10.0.0-alpha.7",
+    "@trpc/react": "10.0.0-alpha.7",
+    "@trpc/server": "10.0.0-alpha.7",
     "@types/express": "^4.17.12",
     "express": "^4.17.1",
     "next": "^12.0.1",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cd71a2fe5d42efc838ae3d4cebe7a9e1a36d9110"
+  "gitHead": "9ce78e41fc0e506172fc78a28f05d4c0b2047ef0"
 }

package/src/withTRPC.tsx

@@ -21,7 +21,7 @@ import {
 import type { CreateTRPCClientOptions } from '@trpc/client/src/internals/TRPCClient';
 import React, { createElement, useState } from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { dehydrate, DehydratedState, Hydrate } from 'react-query/hydration';
+import { dehydrate, DehydratedState, Hydrate } from 'react-query';
 import ssrPrepass from 'react-ssr-prepass';
 
 type QueryClientConfig = ConstructorParameters<typeof QueryClient>[0];
@@ -230,9 +230,9 @@ export function withTRPC<TRouter extends AnyRouter>(
                   ? [err as TRPCClientError<TRouter>]
                   : [],
               ),
-          }) ?? {};
+          }) || {};
 
-        for (const [key, value] of Object.entries(meta)) {
+        for (const [key, value] of Object.entries(meta.headers || {})) {
           if (typeof value === 'string') {
             ctx.res?.setHeader(key, value);
           }