From c02d5f2077dda5309c75e80d8d1a8fbe0ce6ec8a Mon Sep 17 00:00:00 2001 From: Mathias Gruber Date: Thu, 7 Mar 2024 10:27:17 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Rebased=20on=20trpc11=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/pnpm-lock.yaml | 64 ++++++++++++++++++++++++++++++++++++++ app/src/server/api/root.ts | 11 ++++--- 2 files changed, 70 insertions(+), 5 deletions(-) diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 1a5608ad..2c8b72e1 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -80,6 +80,7 @@ dependencies: "@tinymce/tinymce-react": specifier: 4.3.2 version: 4.3.2(react-dom@18.2.0)(react@18.2.0) +<<<<<<< HEAD "@trpc/client": specifier: tmp version: 11.0.0-alpha-tmp-issues-4129-lazy-routers.302(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.302) @@ -93,6 +94,21 @@ dependencies: specifier: tmp version: 11.0.0-alpha-tmp-issues-4129-lazy-routers.302 "@tweenjs/tween.js": +======= + '@trpc/client': + specifier: tmp + version: 11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304) + '@trpc/next': + specifier: tmp + version: 11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@tanstack/react-query@5.24.8)(@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(@trpc/react-query@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) + '@trpc/react-query': + specifier: tmp + version: 11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@tanstack/react-query@5.24.8)(@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(react-dom@18.2.0)(react@18.2.0) + '@trpc/server': + specifier: tmp + version: 11.0.0-alpha-tmp-issues-4129-lazy-routers.304 + '@tweenjs/tween.js': +>>>>>>> 2d47ab1 (🚧 Rebased on trpc11 main) specifier: 23.1.1 version: 23.1.1 "@uploadthing/react": @@ -2946,6 +2962,7 @@ packages: tinymce: 6.8.3 dev: false +<<<<<<< HEAD /@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.302(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.302): resolution: { @@ -2970,21 +2987,49 @@ packages: next: "*" react: ">=16.8.0" react-dom: ">=16.8.0" +======= + /@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304): + resolution: {integrity: sha512-rKE4sBIOKfmVlc0/fEpVY9ZQrPQOWC6K8V9Tk5c6OtzM6OFVJO05NUE6JhELydAmi4kvQTEryv8kD5CpbiW6NA==} + peerDependencies: + '@trpc/server': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304+f57c65d9e + dependencies: + '@trpc/server': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304 + dev: false + + /@trpc/next@11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@tanstack/react-query@5.24.8)(@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(@trpc/react-query@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-wn7Q6mGdvB3V92j8LtnpZaILwqU9c7gDD7FYR8/0WojB0CQsEqH/OcTJ4At8aeRmMrmBPbFHy7OwgxtEJW4L6Q==} + peerDependencies: + '@tanstack/react-query': ^5.0.0 + '@trpc/client': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304+f57c65d9e + '@trpc/react-query': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304+f57c65d9e + '@trpc/server': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304+f57c65d9e + next: '*' + react: '>=16.8.0' + react-dom: '>=16.8.0' +>>>>>>> 2d47ab1 (🚧 Rebased on trpc11 main) peerDependenciesMeta: "@tanstack/react-query": optional: true "@trpc/react-query": optional: true dependencies: +<<<<<<< HEAD "@tanstack/react-query": 4.28.0(react-dom@18.2.0)(react@18.2.0) "@trpc/client": 11.0.0-alpha-tmp-issues-4129-lazy-routers.302(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.302) "@trpc/react-query": 11.0.0-alpha-tmp-issues-4129-lazy-routers.302(@tanstack/react-query@4.28.0)(@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.302)(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.302)(react-dom@18.2.0)(react@18.2.0) "@trpc/server": 11.0.0-alpha-tmp-issues-4129-lazy-routers.302 +======= + '@tanstack/react-query': 5.24.8(react@18.2.0) + '@trpc/client': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304) + '@trpc/react-query': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@tanstack/react-query@5.24.8)(@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(react-dom@18.2.0)(react@18.2.0) + '@trpc/server': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304 +>>>>>>> 2d47ab1 (🚧 Rebased on trpc11 main) next: 14.1.0(@opentelemetry/api@1.6.0)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false +<<<<<<< HEAD /@trpc/react-query@11.0.0-alpha-tmp-issues-4129-lazy-routers.302(@tanstack/react-query@4.28.0)(@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.302)(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.302)(react-dom@18.2.0)(react@18.2.0): resolution: { @@ -3000,15 +3045,34 @@ packages: "@tanstack/react-query": 4.28.0(react-dom@18.2.0)(react@18.2.0) "@trpc/client": 11.0.0-alpha-tmp-issues-4129-lazy-routers.302(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.302) "@trpc/server": 11.0.0-alpha-tmp-issues-4129-lazy-routers.302 +======= + /@trpc/react-query@11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@tanstack/react-query@5.24.8)(@trpc/client@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-FN8kbSlU14c8UDHOvhNJyrKzhrmcN8+fvbcF02JmuJ1Plbv58VDOucEpDjT5WL47uPoMY3EH6HhmqQzV/yckyg==} + peerDependencies: + '@tanstack/react-query': ^5.0.0 + '@trpc/client': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304+f57c65d9e + '@trpc/server': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304+f57c65d9e + react: '>=18.2.0' + react-dom: '>=18.2.0' + dependencies: + '@tanstack/react-query': 5.24.8(react@18.2.0) + '@trpc/client': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304(@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304) + '@trpc/server': 11.0.0-alpha-tmp-issues-4129-lazy-routers.304 +>>>>>>> 2d47ab1 (🚧 Rebased on trpc11 main) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false +<<<<<<< HEAD /@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.302: resolution: { integrity: sha512-rSmO1u6Tn7zKXqyXiejyUOOHEI7p6gKVI+TonA0NojaQ1YaQr2wkULSlh7inmk1M2tXby+eDnvZznO5d7FSbHQ==, } +======= + /@trpc/server@11.0.0-alpha-tmp-issues-4129-lazy-routers.304: + resolution: {integrity: sha512-vXyxREtbIyzfeFcA5SqW3WHbXvME/xDb9S4k2KsJ1/+m9Wu3tGRHOU3Zv5hn/Z5mEy3MPRx4+7M4WxKFrodJZg==} +>>>>>>> 2d47ab1 (🚧 Rebased on trpc11 main) dev: false /@tweenjs/tween.js@23.1.1: diff --git a/app/src/server/api/root.ts b/app/src/server/api/root.ts index bebd5b96..d607d099 100644 --- a/app/src/server/api/root.ts +++ b/app/src/server/api/root.ts @@ -17,6 +17,7 @@ import { logsRouter } from "./routers/logs"; import { dataRouter } from "./routers/data"; import { simulatorRouter } from "./routers/simulator"; import { miscRouter } from "./routers/misc"; +// import { combatRouter } from "./routers/combat"; import { questsRouter } from "./routers/quests"; import { openaiRouter } from "./routers/openai"; import { conceptartRouter } from "./routers/conceptart"; @@ -46,11 +47,11 @@ export const appRouter = createTRPCRouter({ jutsu: jutsuRouter, home: homeRouter, item: itemRouter, - combat: lazy(() => - import("./routers/combat.ts").then((m) => { - return m.combatRouter; - }), - ), + // combat: combatRouter, + combat: lazy(() => { + const router = import("./routers/combat.ts").then((m) => m.combatRouter); + return router; + }), hospital: hospitalRouter, logs: logsRouter, data: dataRouter,