Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Switch on single router (#3006)
Ivan Starkovb85cfa7950aa
diff --git a/apps/builder/app/services/trcp-router.server.ts b/apps/builder/app/services/trcp-router.server.tsnew file mode 100644index 0000000000..e69de29bb2diff --git a/apps/builder/app/shared/marketplace/router.ts b/apps/builder/app/shared/marketplace/router.tsindex 18f8844b3f..4f165a2028 100644--- a/apps/builder/app/shared/marketplace/router.ts+++ b/apps/builder/app/shared/marketplace/router.ts@@ -1,5 +1,5 @@import { z } from "zod";-import { procedure, router } from "../trpc";+import { procedure, router } from "@webstudio-is/trpc-interface/index.server";import { getItems, getBuildProdData } from "./db.server";export const marketplaceRouter = router({diff --git a/packages/authorization-token/src/trpc/authorization-tokens-router.ts b/packages/authorization-token/src/trpc/authorization-tokens-router.tsindex 2f3c845b8e..7f6a24cf51 100644--- a/packages/authorization-token/src/trpc/authorization-tokens-router.ts+++ b/packages/authorization-token/src/trpc/authorization-tokens-router.ts@@ -1,10 +1,7 @@import { z } from "zod";-import { initTRPC } from "@trpc/server";-import type { AppContext } from "@webstudio-is/trpc-interface/index.server";+import { router, procedure } from "@webstudio-is/trpc-interface/index.server";import { db } from "../db";-const { router, procedure } = initTRPC.context<AppContext>().create();-const TokenProjectRelation = z.enum(["viewers","editors",diff --git a/packages/dashboard/src/trpc/project-router.ts b/packages/dashboard/src/trpc/project-router.tsindex 8d07d4421e..853acf97c4 100644--- a/packages/dashboard/src/trpc/project-router.ts+++ b/packages/dashboard/src/trpc/project-router.ts@@ -1,10 +1,11 @@import { z } from "zod";import {- mergeRouters,router,procedure,- projectRouter as baseProjectRouter,-} from "@webstudio-is/project/index.server";+ mergeRouters,+} from "@webstudio-is/trpc-interface/index.server";+import { projectRouter as baseProjectRouter } from "@webstudio-is/project/index.server";+import { db } from "../db";const projectRouter = router({diff --git a/packages/domain/src/trpc/domain.ts b/packages/domain/src/trpc/domain.tsindex 4739604147..3bc647a002 100644--- a/packages/domain/src/trpc/domain.ts+++ b/packages/domain/src/trpc/domain.ts@@ -1,11 +1,9 @@import { z } from "zod";-import { initTRPC } from "@trpc/server";-import type { AppContext } from "@webstudio-is/trpc-interface/index.server";+import { db as projectDb } from "@webstudio-is/project/index.server";import { db } from "../db";import { createProductionBuild } from "@webstudio-is/project-build/index.server";--const { router, procedure } = initTRPC.context<AppContext>().create();+import { router, procedure } from "@webstudio-is/trpc-interface/index.server";export const domainRouter = router({getEntriToken: procedure.query(async ({ ctx }) => {diff --git a/packages/project/src/trpc/index.ts b/packages/project/src/trpc/index.tsindex a65f00d0b7..1f54bc1362 100644--- a/packages/project/src/trpc/index.ts+++ b/packages/project/src/trpc/index.ts@@ -1,2 +1 @@export * from "./project-router";-export { mergeRouters, router, procedure } from "./trpc";diff --git a/packages/project/src/trpc/project-router.ts b/packages/project/src/trpc/project-router.tsindex 5d5706204b..c5f11773f6 100644--- a/packages/project/src/trpc/project-router.ts+++ b/packages/project/src/trpc/project-router.ts@@ -1,6 +1,6 @@import * as db from "../db";import { z } from "zod";-import { router, procedure } from "./trpc";+import { router, procedure } from "@webstudio-is/trpc-interface/index.server";import { MarketplaceApprovalStatus, Title } from "../shared/schema";export const projectRouter = router({diff --git a/packages/project/src/trpc/trpc.ts b/packages/project/src/trpc/trpc.tsdeleted file mode 100644index 570d5022d9..0000000000--- a/packages/project/src/trpc/trpc.ts+++ /dev/null@@ -1,6 +0,0 @@-import { initTRPC } from "@trpc/server";-import type { AppContext } from "@webstudio-is/trpc-interface/index.server";--export const { router, procedure, middleware, mergeRouters } = initTRPC- .context<AppContext>()- .create();diff --git a/apps/builder/app/shared/trpc.ts b/packages/trpc-interface/src/context/router.server.tssimilarity index 66%rename from apps/builder/app/shared/trpc.tsrename to packages/trpc-interface/src/context/router.server.tsindex 570d5022d9..e4f91ca51b 100644--- a/apps/builder/app/shared/trpc.ts+++ b/packages/trpc-interface/src/context/router.server.ts@@ -1,5 +1,5 @@import { initTRPC } from "@trpc/server";-import type { AppContext } from "@webstudio-is/trpc-interface/index.server";+import type { AppContext } from "./context.server";export const { router, procedure, middleware, mergeRouters } = initTRPC.context<AppContext>()diff --git a/packages/trpc-interface/src/index.server.ts b/packages/trpc-interface/src/index.server.tsindex 12170aa04e..61091dae2c 100644--- a/packages/trpc-interface/src/index.server.ts+++ b/packages/trpc-interface/src/index.server.ts@@ -2,7 +2,14 @@ export type { SharedRouter } from "./shared/shared-router";export { createTrpcProxyServiceClient } from "./shared/client";export type { AppContext } from "./context/context.server";+export { AuthorizationError } from "./context/errors.server";export * as authorizeProject from "./authorize/project.server";export * as authorizeAuthorizationToken from "./authorize/authorization-token.server";export type { AuthPermit } from "./shared/authorization-router";+export {+ router,+ procedure,+ middleware,+ mergeRouters,+} from "./context/router.server";diff --git a/packages/trpc-interface/src/shared/trpc.ts b/packages/trpc-interface/src/shared/trpc.tsindex 1f528e1bc0..fc38189f96 100644--- a/packages/trpc-interface/src/shared/trpc.ts+++ b/packages/trpc-interface/src/shared/trpc.ts@@ -8,6 +8,8 @@ export const createContext = async () => {export type Context = inferAsyncReturnType<typeof createContext>;+// Here is different router and trpc types not the same as in ../context/router.server.ts+// And used only for saas shared routersexport const { router, procedure, middleware } = initTRPC.context<Context>().create();