chore: next merge 2023 03 05 (trpc#3926)

.eslintrc.js

@@ -87,8 +87,7 @@ const config = {
     {
       files: ['examples/**/*'],
       rules: {
-        // Todo: enable these for even stronger linting! 💪
-        '@typescript-eslint/no-floating-promises': 'off',
+        '@typescript-eslint/no-floating-promises': 'error',
         '@typescript-eslint/no-unused-vars': 'off',
       },
     },

.prettierignore

@@ -3,9 +3,10 @@ __generated__/
 .test/
 **/.next/
 **/www/build/
+**/www/typedoc/
 dist/
 examples/next-big-router/src/server/routers/*.ts
 packages/server/test/__packages.ts
 packages/tests/server/___packages.ts
 packages/coverage/
-pnpm-lock.yaml
+pnpm-lock.yaml

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) <year> <author>
+Copyright (c) 2023 Alex Johansson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -92,6 +92,7 @@ npx create-next-app --example https://github.com/trpc/trpc --example-path exampl
 
 <table>
   <tbody>
+    <tr>
       <td align="center"><a href="https://twitter.com/s4chinraja"><img src="https://avatars.githubusercontent.com/u/58836760?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sachin Raja</b></sub></a></td>
       <td align="center"><a href="https://twitter.com/alexdotjs"><img src="https://avatars.githubusercontent.com/u/459267?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alex / KATT</b></sub></a></td>
     </tr>

examples/.test/big-router-declaration/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/big-router-declaration",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -10,10 +10,10 @@
   },
   "dependencies": {
     "@tanstack/react-query": "^4.3.8",
-    "@trpc/client": "^10.13.0",
-    "@trpc/next": "^10.13.0",
-    "@trpc/react-query": "^10.13.0",
-    "@trpc/server": "^10.13.0",
+    "@trpc/client": "^10.14.0",
+    "@trpc/next": "^10.14.0",
+    "@trpc/react-query": "^10.14.0",
+    "@trpc/server": "^10.14.0",
     "next": "^13.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/.test/internal-types-export/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/internal-types-export",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -12,7 +12,7 @@
     "typescript": "^4.8.3"
   },
   "dependencies": {
-    "@trpc/client": "^10.13.0",
-    "@trpc/server": "^10.13.0"
+    "@trpc/client": "^10.14.0",
+    "@trpc/server": "^10.14.0"
   }
 }

examples/.test/internal-types-export/src/server.ts

@@ -13,10 +13,18 @@ export function genericRouter<S extends (value: any) => unknown>(schema: S) {
   });
 }
 
+const routerA = t.router({
+  a: t.procedure.query(() => 'a'),
+});
+const routerB = t.router({
+  b: t.procedure.query(() => 'b'),
+});
+
 const appRouter = t.router({
   foo: t.procedure.query(() => 'bar'),
   hello: t.procedure.use(someMiddleware).query(() => 'hello'),
   generic: genericRouter((value: string) => value.toUpperCase()),
-})
+  merged: t.mergeRouters(routerA, routerB),
+});
 
 export type AppRouter = typeof appRouter;

examples/.test/ssg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/test-ssg",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -13,10 +13,10 @@
   },
   "dependencies": {
     "@tanstack/react-query": "^4.3.8",
-    "@trpc/client": "^10.13.0",
-    "@trpc/next": "^10.13.0",
-    "@trpc/react-query": "^10.13.0",
-    "@trpc/server": "^10.13.0",
+    "@trpc/client": "^10.14.0",
+    "@trpc/next": "^10.14.0",
+    "@trpc/react-query": "^10.14.0",
+    "@trpc/server": "^10.14.0",
     "next": "^13.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/cloudflare-workers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/cloudflare-workers",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -9,8 +9,8 @@
     "test-dev": "start-server-and-test 'wrangler dev --local' http://127.0.0.1:8787 'tsx src/client.ts'"
   },
   "dependencies": {
-    "@trpc/client": "^10.13.0",
-    "@trpc/server": "^10.13.0",
+    "@trpc/client": "^10.14.0",
+    "@trpc/server": "^10.14.0",
     "zod": "^3.0.0"
   },
   "devDependencies": {

examples/cloudflare-workers/src/client.ts

@@ -33,4 +33,4 @@ async function main() {
   console.log('👌 should be a clean exit if everything is working right');
 }
 
-main();
+main().catch(console.error);

examples/express-minimal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/express-minimal",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -15,9 +15,9 @@
     "test-start": "start-server-and-test 'node dist/server' 3000 'node dist/client'"
   },
   "dependencies": {
-    "@trpc/client": "^10.13.0",
-    "@trpc/react-query": "^10.13.0",
-    "@trpc/server": "^10.13.0",
+    "@trpc/client": "^10.14.0",
+    "@trpc/react-query": "^10.14.0",
+    "@trpc/server": "^10.14.0",
     "express": "^4.17.1",
     "zod": "^3.0.0"
   },

examples/express-minimal/src/client.ts

@@ -17,4 +17,4 @@ async function main() {
   console.log(withInputQuery);
 }
 
-main();
+void main();

examples/express-minimal/src/server.ts

@@ -19,4 +19,4 @@ async function main() {
   app.listen(3000);
 }
 
-main();
+void main();

examples/express-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/express-server",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -15,9 +15,9 @@
     "test-start": "start-server-and-test 'node dist/server' 2021 'node dist/client'"
   },
   "dependencies": {
-    "@trpc/client": "^10.13.0",
-    "@trpc/react-query": "^10.13.0",
-    "@trpc/server": "^10.13.0",
+    "@trpc/client": "^10.14.0",
+    "@trpc/react-query": "^10.14.0",
+    "@trpc/server": "^10.14.0",
     "express": "^4.17.1",
     "zod": "^3.0.0"
   },

examples/express-server/src/client.ts

@@ -71,4 +71,4 @@ async function main() {
   console.log('👌 should be a clean exit if everything is working right');
 }
 
-main();
+void main();

examples/express-server/src/server.ts

@@ -130,4 +130,4 @@ async function main() {
   });
 }
 
-main();
+void main();

examples/fastify-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/fastify-server",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "@fastify/websocket": "^7.1.2",
-    "@trpc/client": "^10.13.0",
-    "@trpc/server": "^10.13.0",
+    "@trpc/client": "^10.14.0",
+    "@trpc/server": "^10.14.0",
     "fastify": "^4.13.0",
     "superjson": "^1.7.4",
     "tslib": "^2.1.0",

examples/fastify-server/src/client/index.ts

@@ -64,4 +64,4 @@ async function start() {
   wsClient.close();
 }
 
-start();
+void start();

examples/fastify-server/src/server/index.ts

@@ -3,4 +3,4 @@ import { createServer } from './server';
 
 const server = createServer(serverConfig);
 
-server.start();
+void server.start();

examples/fastify-server/src/server/server.ts

@@ -16,8 +16,8 @@ export function createServer(opts: ServerOptions) {
   const prefix = opts.prefix ?? '/trpc';
   const server = fastify({ logger: dev });
 
-  server.register(ws);
-  server.register(fastifyTRPCPlugin, {
+  void server.register(ws);
+  void server.register(fastifyTRPCPlugin, {
     prefix,
     useWSS: true,
     trpcOptions: { router: appRouter, createContext },

examples/lambda-api-gateway/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@examples/lambda-api-gateway",
   "private": true,
-  "version": "10.13.0",
+  "version": "10.14.0",
   "type": "module",
   "main": "index.js",
   "license": "MIT",
@@ -13,8 +13,8 @@
     "http-rest-client": "tsx src/payloadFormatVersionClient.ts"
   },
   "dependencies": {
-    "@trpc/client": "^10.13.0",
-    "@trpc/server": "^10.13.0",
+    "@trpc/client": "^10.14.0",
+    "@trpc/server": "^10.14.0",
     "tsx": "^3.12.3",
     "zod": "^3.0.0"
   },

examples/lambda-api-gateway/src/client.ts

@@ -5,7 +5,7 @@ const client = createTRPCProxyClient<AppRouter>({
   links: [httpBatchLink({ url: 'http://localhost:4050' })],
 });
 
-(async () => {
+void (async () => {
   try {
     const q = await client.greet.query({ name: 'Erik' });
     console.log(q);

examples/lambda-api-gateway/src/payloadFormatVersionClient.ts

@@ -8,7 +8,7 @@ const restApiProxy = createTRPCProxyClient<AppRouter>({
   links: [httpBatchLink({ url: 'http://localhost:4050/dev' })],
 });
 
-(async () => {
+void (async () => {
   try {
     // A Very simple client to test showcase both APIGW v1(Rest API) and v2(HTTP API) support with serverless-offline
     const queryForVersion2 = await httpApiProxy.greet.query({

examples/minimal-react/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@examples/minimal-react-client",
   "private": true,
-  "version": "10.13.0",
+  "version": "10.14.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@tanstack/react-query": "^4.3.8",
-    "@trpc/client": "^10.13.0",
-    "@trpc/react-query": "^10.13.0",
-    "@trpc/server": "^10.13.0",
+    "@trpc/client": "^10.14.0",
+    "@trpc/react-query": "^10.14.0",
+    "@trpc/server": "^10.14.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/minimal-react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@examples/minimal-react",
   "private": true,
-  "version": "10.13.0",
+  "version": "10.14.0",
   "workspaces": [
     "client",
     "server"

examples/minimal-react/server/index.ts

@@ -3,8 +3,8 @@
  * On a bigger app, you will probably want to split this file up into multiple files.
  */
 import { initTRPC } from '@trpc/server';
-import { createHTTPHandler } from '@trpc/server/adapters/standalone';
-import http from 'http';
+import { createHTTPServer } from '@trpc/server/adapters/standalone';
+import cors from 'cors';
 import { z } from 'zod';
 
 const t = initTRPC.create();
@@ -36,25 +36,12 @@ const appRouter = router({
 // None of the actual implementation is exposed to the client
 export type AppRouter = typeof appRouter;
 
-// create handler
-const handler = createHTTPHandler({
+// create server
+createHTTPServer({
+  middleware: cors(),
   router: appRouter,
   createContext() {
     console.log('context 3');
     return {};
   },
-});
-
-const server = http.createServer((req, res) => {
-  res.setHeader('Access-Control-Allow-Origin', '*');
-  res.setHeader('Access-Control-Request-Method', '*');
-  res.setHeader('Access-Control-Allow-Methods', 'OPTIONS, GET');
-  res.setHeader('Access-Control-Allow-Headers', '*');
-  if (req.method === 'OPTIONS') {
-    res.writeHead(200);
-    return res.end();
-  }
-  handler(req, res);
-});
-
-server.listen(2022);
+}).listen(2022);

examples/minimal-react/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/minimal-react-server",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "private": true,
   "scripts": {
     "build": "tsc",
@@ -9,10 +9,12 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@trpc/server": "^10.13.0",
+    "@trpc/server": "^10.14.0",
+    "cors": "^2.8.5",
     "zod": "^3.0.0"
   },
   "devDependencies": {
+    "@types/cors": "^2.8.13",
     "@types/node": "^18.7.20",
     "eslint": "^8.30.0",
     "tsx": "^3.12.3",