Skip to content

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.

Enforce server constraints for packages (#1507)

Bogdan Chadkine1fa2075a535
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index f319c79213..0e2d6d375d 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -3,7 +3,7 @@ import { type Publish, usePublish } from "~/shared/pubsub";
import type { Build } from "@webstudio-is/project-build";
import type { Project } from "@webstudio-is/project";
import { theme, Box, type CSS, Flex, Grid } from "@webstudio-is/design-system";
-import type { AuthPermit } from "@webstudio-is/trpc-interface/server";
+import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
import { registerContainers, useBuilderStore } from "~/shared/sync";
import { useSyncServer } from "./shared/sync/sync-server";
// eslint-disable-next-line import/no-internal-modules
diff --git a/apps/builder/app/builder/shared/sync/sync-server.ts b/apps/builder/app/builder/shared/sync/sync-server.ts
index 761abad9c2..924ebe1be5 100644
--- a/apps/builder/app/builder/shared/sync/sync-server.ts
+++ b/apps/builder/app/builder/shared/sync/sync-server.ts
@@ -1,11 +1,11 @@
+import { useEffect } from "react";
+import { useBeforeUnload } from "react-use";
import { sync } from "immerhin";
import type { Project } from "@webstudio-is/project";
import type { Build } from "@webstudio-is/project-build";
+import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
import { restPatchPath } from "~/shared/router-utils";
-import { useEffect } from "react";
import { enqueue, dequeue, queueStatus } from "./queue";
-import { useBeforeUnload } from "react-use";
-import type { AuthPermit } from "@webstudio-is/trpc-interface/server";
// Periodic check for new entries to group them into one job/call in sync queue.
const NEW_ENTRIES_INTERVAL = 1000;
diff --git a/apps/builder/app/routes/builder.$projectId.tsx b/apps/builder/app/routes/builder.$projectId.tsx
index 642ddb8b7f..24f847abdc 100644
--- a/apps/builder/app/routes/builder.$projectId.tsx
+++ b/apps/builder/app/routes/builder.$projectId.tsx
@@ -1,10 +1,10 @@
import { useLoaderData, useRouteError } from "@remix-run/react";
import type { ShouldRevalidateFunction } from "@remix-run/react";
import type { LoaderArgs } from "@remix-run/node";
-import { loadBuildByProjectId } from "@webstudio-is/project-build/server";
-import { db } from "@webstudio-is/project/server";
-import { authorizeProject } from "@webstudio-is/trpc-interface/server";
-import { loadByProject } from "@webstudio-is/asset-uploader/server";
+import { loadBuildByProjectId } from "@webstudio-is/project-build/index.server";
+import { db } from "@webstudio-is/project/index.server";
+import { authorizeProject } from "@webstudio-is/trpc-interface/index.server";
+import { loadByProject } from "@webstudio-is/asset-uploader/index.server";
import { createContext } from "~/shared/context.server";
import { ErrorMessage } from "~/shared/error";
import { sentryException } from "~/shared/sentry";
diff --git a/apps/builder/app/routes/dashboard._index.tsx b/apps/builder/app/routes/dashboard._index.tsx
index b47e4eb487..609e96c6e6 100644
--- a/apps/builder/app/routes/dashboard._index.tsx
+++ b/apps/builder/app/routes/dashboard._index.tsx
@@ -2,7 +2,7 @@ import type { ComponentProps } from "react";
import { useLoaderData, useRouteError } from "@remix-run/react";
import type { LoaderArgs } from "@remix-run/node";
import { redirect } from "@remix-run/node";
-import { dashboardProjectRouter } from "@webstudio-is/dashboard/server";
+import { dashboardProjectRouter } from "@webstudio-is/dashboard/index.server";
import { Dashboard } from "~/dashboard";
import { findAuthenticatedUser } from "~/services/auth.server";
import { loginPath } from "~/shared/router-utils";
diff --git a/apps/builder/app/routes/dashboard.projects.$method.ts b/apps/builder/app/routes/dashboard.projects.$method.ts
index 3258e2fe65..419b8ea4de 100644
--- a/apps/builder/app/routes/dashboard.projects.$method.ts
+++ b/apps/builder/app/routes/dashboard.projects.$method.ts
@@ -1,5 +1,5 @@
import type { ActionArgs } from "@remix-run/node";
-import { dashboardProjectRouter } from "@webstudio-is/dashboard/server";
+import { dashboardProjectRouter } from "@webstudio-is/dashboard/index.server";
import { findAuthenticatedUser } from "~/services/auth.server";
import { createContext } from "~/shared/context.server";
import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";
diff --git a/apps/builder/app/routes/rest.assets.$projectId.tsx b/apps/builder/app/routes/rest.assets.$projectId.tsx
index 1d56621a94..ec5d133615 100644
--- a/apps/builder/app/routes/rest.assets.$projectId.tsx
+++ b/apps/builder/app/routes/rest.assets.$projectId.tsx
@@ -5,7 +5,7 @@ import { MaxAssets, type Asset } from "@webstudio-is/asset-uploader";
import {
uploadAssets,
loadByProject,
-} from "@webstudio-is/asset-uploader/server";
+} from "@webstudio-is/asset-uploader/index.server";
import { toast } from "@webstudio-is/design-system";
import type { ActionData } from "~/builder/shared/assets";
import { sentryException } from "~/shared/sentry";
diff --git a/apps/builder/app/routes/rest.authorization-token.$method.ts b/apps/builder/app/routes/rest.authorization-token.$method.ts
index 007f7b6093..d9112c35c2 100644
--- a/apps/builder/app/routes/rest.authorization-token.$method.ts
+++ b/apps/builder/app/routes/rest.authorization-token.$method.ts
@@ -1,5 +1,5 @@
import type { ActionArgs } from "@remix-run/node";
-import { authorizationTokenRouter } from "@webstudio-is/authorization-token/server";
+import { authorizationTokenRouter } from "@webstudio-is/authorization-token/index.server";
import { findAuthenticatedUser } from "~/services/auth.server";
import { createContext } from "~/shared/context.server";
import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";
diff --git a/apps/builder/app/routes/rest.patch.ts b/apps/builder/app/routes/rest.patch.ts
index bcec92722e..c1728169c8 100644
--- a/apps/builder/app/routes/rest.patch.ts
+++ b/apps/builder/app/routes/rest.patch.ts
@@ -9,8 +9,8 @@ import {
patchStyleSourceSelections,
patchInstances,
patchPages,
-} from "@webstudio-is/project-build/server";
-import { patchAssets } from "@webstudio-is/asset-uploader/server";
+} from "@webstudio-is/project-build/index.server";
+import { patchAssets } from "@webstudio-is/asset-uploader/index.server";
import type { Project } from "@webstudio-is/project";
import { createContext } from "~/shared/context.server";
import { createAssetClient } from "~/shared/asset-client";
diff --git a/apps/builder/app/routes/rest.project.clone.$domain.ts b/apps/builder/app/routes/rest.project.clone.$domain.ts
index 5c6b50e1df..853c743172 100644
--- a/apps/builder/app/routes/rest.project.clone.$domain.ts
+++ b/apps/builder/app/routes/rest.project.clone.$domain.ts
@@ -1,7 +1,7 @@
import { redirect, type LoaderArgs } from "@remix-run/node";
-import { db as projectDb } from "@webstudio-is/project/server";
+import { db as projectDb } from "@webstudio-is/project/index.server";
import type { Project } from "@webstudio-is/project";
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import { findAuthenticatedUser } from "~/services/auth.server";
import { builderPath, loginPath } from "~/shared/router-utils";
import { createContext } from "~/shared/context.server";
diff --git a/apps/builder/app/routes/s.css.ts b/apps/builder/app/routes/s.css.ts
index 7e267c5927..d88448e000 100644
--- a/apps/builder/app/routes/s.css.ts
+++ b/apps/builder/app/routes/s.css.ts
@@ -1,6 +1,6 @@
import { type ActionArgs, json } from "@remix-run/node";
import { generateCssText } from "@webstudio-is/react-sdk";
-import { db } from "@webstudio-is/project/server";
+import { db } from "@webstudio-is/project/index.server";
import { createCssEngine } from "@webstudio-is/css-engine";
import env from "~/env/env.public.server";
import { getBuildParams } from "~/shared/router-utils";
diff --git a/apps/builder/app/services/trpc.server.ts b/apps/builder/app/services/trpc.server.ts
index 05d03db523..e0a2ae3fc4 100644
--- a/apps/builder/app/services/trpc.server.ts
+++ b/apps/builder/app/services/trpc.server.ts
@@ -1,4 +1,4 @@
-import { createTrpcProxyServiceClient } from "@webstudio-is/trpc-interface/server";
+import { createTrpcProxyServiceClient } from "@webstudio-is/trpc-interface/index.server";
import env from "~/env/env.server";
const TRPC_SERVER_URL = env.TRPC_SERVER_URL ?? "";
diff --git a/apps/builder/app/shared/asset-client.ts b/apps/builder/app/shared/asset-client.ts
index b55f4ea3f6..6db29f6810 100644
--- a/apps/builder/app/shared/asset-client.ts
+++ b/apps/builder/app/shared/asset-client.ts
@@ -3,7 +3,7 @@ import { MaxSize } from "@webstudio-is/asset-uploader";
import {
createFsClient,
createS3Client,
-} from "@webstudio-is/asset-uploader/server";
+} from "@webstudio-is/asset-uploader/index.server";
import env from "~/env/env.server";
export const createAssetClient = () => {
diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.ts
index 5f3125b661..9439bf1ef6 100644
--- a/apps/builder/app/shared/context.server.ts
+++ b/apps/builder/app/shared/context.server.ts
@@ -1,4 +1,4 @@
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import { authenticator } from "~/services/auth.server";
import { trpcClient } from "~/services/trpc.server";
diff --git a/apps/builder/app/shared/db/canvas.server.ts b/apps/builder/app/shared/db/canvas.server.ts
index 35c84894fa..f96cc9d5e2 100644
--- a/apps/builder/app/shared/db/canvas.server.ts
+++ b/apps/builder/app/shared/db/canvas.server.ts
@@ -1,9 +1,9 @@
import type { Project } from "@webstudio-is/project";
import type { Data } from "@webstudio-is/react-sdk";
-import { loadBuildByProjectId } from "@webstudio-is/project-build/server";
-import { db as projectDb } from "@webstudio-is/project/server";
-import { loadByProject } from "@webstudio-is/asset-uploader/server";
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import { loadBuildByProjectId } from "@webstudio-is/project-build/index.server";
+import { db as projectDb } from "@webstudio-is/project/index.server";
+import { loadByProject } from "@webstudio-is/asset-uploader/index.server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import { findPageByIdOrPath } from "@webstudio-is/project-build";
export const loadProductionCanvasData = async (
diff --git a/apps/builder/app/shared/db/misc.server.ts b/apps/builder/app/shared/db/misc.server.ts
index 9d4e6a6d17..f03733dd51 100644
--- a/apps/builder/app/shared/db/misc.server.ts
+++ b/apps/builder/app/shared/db/misc.server.ts
@@ -1,10 +1,10 @@
-import { db } from "@webstudio-is/project/server";
+import { db } from "@webstudio-is/project/index.server";
import { prisma } from "@webstudio-is/prisma-client";
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import {
createBuild,
loadBuildByProjectId,
-} from "@webstudio-is/project-build/server";
+} from "@webstudio-is/project-build/index.server";
/**
* Conceptually publishing is cloning all data that affects user site
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index cce3dd01b3..301371ff2b 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -2,7 +2,7 @@ import { useCallback, useMemo } from "react";
import { atom, computed, type WritableAtom } from "nanostores";
import { useStore } from "@nanostores/react";
import { nanoid } from "nanoid";
-import type { AuthPermit } from "@webstudio-is/trpc-interface/server";
+import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
import type { Asset, Assets } from "@webstudio-is/asset-uploader";
import type { ItemDropTarget, Placement } from "@webstudio-is/design-system";
import type {
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index e0f3027d14..08663efa0e 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -43,9 +43,9 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": {
+ "./index.server": {
"source": "./src/index.server.ts",
- "default": "./server.js"
+ "import": "./lib/index.server.js"
}
},
"types": "lib/types/index.d.ts",
diff --git a/packages/asset-uploader/server.d.ts b/packages/asset-uploader/server.d.ts
deleted file mode 100644
index e83d502945..0000000000
--- a/packages/asset-uploader/server.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/types/index.server";
diff --git a/packages/asset-uploader/server.js b/packages/asset-uploader/server.js
deleted file mode 100644
index a6fbe7c12c..0000000000
--- a/packages/asset-uploader/server.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/index.server";
diff --git a/packages/asset-uploader/src/db/clone.ts b/packages/asset-uploader/src/db/clone.ts
index 1505c92811..4e0321ec49 100644
--- a/packages/asset-uploader/src/db/clone.ts
+++ b/packages/asset-uploader/src/db/clone.ts
@@ -2,7 +2,7 @@ import { prisma, type Prisma, type Project } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
export const cloneAssets = async (
{
diff --git a/packages/asset-uploader/src/db/create.ts b/packages/asset-uploader/src/db/create.ts
index 3a2fd2df14..420781717d 100644
--- a/packages/asset-uploader/src/db/create.ts
+++ b/packages/asset-uploader/src/db/create.ts
@@ -5,12 +5,12 @@ import {
type Project,
type Asset,
} from "@webstudio-is/prisma-client";
-import type { ImageMeta } from "../schema";
-import { formatAsset } from "../utils/format-asset";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
+import type { ImageMeta } from "../schema";
+import { formatAsset } from "../utils/format-asset";
type BaseOptions = {
id: string;
diff --git a/packages/asset-uploader/src/db/delete.ts b/packages/asset-uploader/src/db/delete.ts
index 082a344500..fbe92ae1d2 100644
--- a/packages/asset-uploader/src/db/delete.ts
+++ b/packages/asset-uploader/src/db/delete.ts
@@ -1,9 +1,9 @@
import { prisma, type Project } from "@webstudio-is/prisma-client";
-import type { Asset } from "../schema";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
+import type { Asset } from "../schema";
export const deleteFromDb = async (
props: {
diff --git a/packages/asset-uploader/src/db/load.ts b/packages/asset-uploader/src/db/load.ts
index 670c3a26cf..0053a514b0 100644
--- a/packages/asset-uploader/src/db/load.ts
+++ b/packages/asset-uploader/src/db/load.ts
@@ -1,10 +1,10 @@
import { prisma, type Project } from "@webstudio-is/prisma-client";
-import type { Asset } from "../schema";
-import { formatAsset } from "../utils/format-asset";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
+import type { Asset } from "../schema";
+import { formatAsset } from "../utils/format-asset";
export const loadByProject = async (
projectId: Project["id"],
diff --git a/packages/asset-uploader/src/delete.ts b/packages/asset-uploader/src/delete.ts
index afb9eea8dc..65efb8a423 100644
--- a/packages/asset-uploader/src/delete.ts
+++ b/packages/asset-uploader/src/delete.ts
@@ -2,7 +2,7 @@ import { prisma, type Project } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import type { AssetClient } from "./client";
import { deleteFromDb } from "./db";
import type { Asset } from "./schema";
diff --git a/packages/asset-uploader/src/patch.ts b/packages/asset-uploader/src/patch.ts
index 856c163f2b..8b8375e23f 100644
--- a/packages/asset-uploader/src/patch.ts
+++ b/packages/asset-uploader/src/patch.ts
@@ -3,7 +3,7 @@ import type { Project } from "@webstudio-is/prisma-client";
import {
type AppContext,
authorizeProject,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import { type Asset, Assets } from "./schema";
import { deleteAssets } from "./delete";
import { loadByProject } from "./db/load";
diff --git a/packages/asset-uploader/src/upload.ts b/packages/asset-uploader/src/upload.ts
index 494675a582..f164dfcc42 100644
--- a/packages/asset-uploader/src/upload.ts
+++ b/packages/asset-uploader/src/upload.ts
@@ -1,4 +1,4 @@
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import type { AssetClient } from "./client";
import { createAssetWithLimit } from "./db/create";
diff --git a/packages/asset-uploader/src/utils/get-asset-data.ts b/packages/asset-uploader/src/utils/get-asset-data.ts
index 9b277e3479..df19e1c0f9 100644
--- a/packages/asset-uploader/src/utils/get-asset-data.ts
+++ b/packages/asset-uploader/src/utils/get-asset-data.ts
@@ -1,9 +1,8 @@
import { z } from "zod";
-
import sharp from "sharp";
-import { Location, ImageMeta } from "../schema";
import { FontMeta } from "@webstudio-is/fonts";
-import { getFontData } from "@webstudio-is/fonts/server";
+import { getFontData } from "@webstudio-is/fonts/index.server";
+import { Location, ImageMeta } from "../schema";
const BaseData = z.object({
id: z.string(),
diff --git a/packages/authorization-token/package.json b/packages/authorization-token/package.json
index a5a4d5f7de..02432a320e 100644
--- a/packages/authorization-token/package.json
+++ b/packages/authorization-token/package.json
@@ -33,9 +33,9 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": {
+ "./index.server": {
"source": "./src/index.server.ts",
- "default": "./server.js"
+ "import": "./lib/index.server.js"
}
},
"types": "lib/types/index.d.ts",
diff --git a/packages/authorization-token/server.d.ts b/packages/authorization-token/server.d.ts
deleted file mode 100644
index e83d502945..0000000000
--- a/packages/authorization-token/server.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/types/index.server";
diff --git a/packages/authorization-token/server.js b/packages/authorization-token/server.js
deleted file mode 100644
index a6fbe7c12c..0000000000
--- a/packages/authorization-token/server.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/index.server";
diff --git a/packages/authorization-token/src/db/authorization-token.ts b/packages/authorization-token/src/db/authorization-token.ts
index f90cbabfab..fa2759e1c6 100644
--- a/packages/authorization-token/src/db/authorization-token.ts
+++ b/packages/authorization-token/src/db/authorization-token.ts
@@ -1,3 +1,4 @@
+import { v4 as uuid } from "uuid";
import {
prisma,
type AuthorizationToken,
@@ -7,8 +8,7 @@ import {
authorizeProject,
authorizeAuthorizationToken,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
-import { v4 as uuid } from "uuid";
+} from "@webstudio-is/trpc-interface/index.server";
export const findMany = async (
props: { projectId: Project["id"] },
diff --git a/packages/authorization-token/src/trpc/authorization-tokens-router.ts b/packages/authorization-token/src/trpc/authorization-tokens-router.ts
index 76d9163019..35a67b7fe7 100644
--- a/packages/authorization-token/src/trpc/authorization-tokens-router.ts
+++ b/packages/authorization-token/src/trpc/authorization-tokens-router.ts
@@ -1,7 +1,7 @@
+import { z } from "zod";
import { initTRPC } from "@trpc/server";
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import { db } from "../db";
-import { z } from "zod";
const { router, procedure } = initTRPC.context<AppContext>().create();
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 3978fcf2f7..49d8629dff 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -33,9 +33,9 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": {
+ "./index.server": {
"source": "./src/index.server.ts",
- "default": "./server.js"
+ "import": "./lib/index.server.js"
}
},
"types": "lib/types/index.d.ts",
diff --git a/packages/dashboard/server.d.ts b/packages/dashboard/server.d.ts
deleted file mode 100644
index e83d502945..0000000000
--- a/packages/dashboard/server.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/types/index.server";
diff --git a/packages/dashboard/server.js b/packages/dashboard/server.js
deleted file mode 100644
index a6fbe7c12c..0000000000
--- a/packages/dashboard/server.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/index.server";
diff --git a/packages/dashboard/src/db/projects.ts b/packages/dashboard/src/db/projects.ts
index 6337c5ec6c..5a38795fe0 100644
--- a/packages/dashboard/src/db/projects.ts
+++ b/packages/dashboard/src/db/projects.ts
@@ -1,5 +1,5 @@
import { prisma } from "@webstudio-is/prisma-client";
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import { DashboardProjects } from "./schema";
export const findMany = async (userId: string, context: AppContext) => {
diff --git a/packages/dashboard/src/trpc/project-router.ts b/packages/dashboard/src/trpc/project-router.ts
index bcf62acaed..a26b702cfc 100644
--- a/packages/dashboard/src/trpc/project-router.ts
+++ b/packages/dashboard/src/trpc/project-router.ts
@@ -1,11 +1,11 @@
+import { z } from "zod";
import {
mergeRouters,
router,
procedure,
projectRouter as baseProjectRouter,
-} from "@webstudio-is/project/server";
+} from "@webstudio-is/project/index.server";
import { db } from "../db";
-import { z } from "zod";
const projectRouter = router({
findMany: procedure
diff --git a/packages/fonts/package.json b/packages/fonts/package.json
index 27963b791a..1181976aad 100644
--- a/packages/fonts/package.json
+++ b/packages/fonts/package.json
@@ -38,9 +38,9 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": {
+ "./index.server": {
"source": "./src/index.server.ts",
- "default": "./server.js"
+ "import": "./lib/index.server.js"
}
},
"types": "lib/types/index.d.ts",
diff --git a/packages/fonts/server.d.ts b/packages/fonts/server.d.ts
deleted file mode 100644
index e83d502945..0000000000
--- a/packages/fonts/server.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/types/index.server";
diff --git a/packages/fonts/server.js b/packages/fonts/server.js
deleted file mode 100644
index a6fbe7c12c..0000000000
--- a/packages/fonts/server.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/index.server";
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index 7720eb77ca..b56e50fd0d 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -12,9 +12,9 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": {
+ "./index.server": {
"source": "./src/index.server.ts",
- "default": "./server.js"
+ "import": "./lib/index.server.js"
}
},
"types": "lib/types/index.d.ts",
diff --git a/packages/project-build/server.d.ts b/packages/project-build/server.d.ts
deleted file mode 100644
index e83d502945..0000000000
--- a/packages/project-build/server.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/types/index.server";
diff --git a/packages/project-build/server.js b/packages/project-build/server.js
deleted file mode 100644
index a6fbe7c12c..0000000000
--- a/packages/project-build/server.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/index.server";
diff --git a/packages/project-build/src/db/breakpoints.ts b/packages/project-build/src/db/breakpoints.ts
index 62723e1668..492028b182 100644
--- a/packages/project-build/src/db/breakpoints.ts
+++ b/packages/project-build/src/db/breakpoints.ts
@@ -1,6 +1,10 @@
import { nanoid } from "nanoid";
import { applyPatches, type Patch } from "immer";
import { type Project, prisma } from "@webstudio-is/prisma-client";
+import {
+ authorizeProject,
+ type AppContext,
+} from "@webstudio-is/trpc-interface/index.server";
import type { Build } from "../types";
import {
type Breakpoint,
@@ -8,10 +12,6 @@ import {
BreakpointsList,
initialBreakpoints,
} from "../schema/breakpoints";
-import {
- authorizeProject,
- type AppContext,
-} from "@webstudio-is/trpc-interface/server";
export const parseBreakpoints = (
breakpointsString: string,
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index 14608f381a..91509158d4 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -6,7 +6,7 @@ import {
prisma,
Prisma,
} from "@webstudio-is/prisma-client";
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import type { Build } from "../types";
import { Pages } from "../schema/pages";
import {
diff --git a/packages/project-build/src/db/instances.ts b/packages/project-build/src/db/instances.ts
index ed00d28a11..b7076917a6 100644
--- a/packages/project-build/src/db/instances.ts
+++ b/packages/project-build/src/db/instances.ts
@@ -3,7 +3,7 @@ import { type Project, type Build, prisma } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import { Instances, InstancesList } from "../schema/instances";
export const parseInstances = (
diff --git a/packages/project-build/src/db/pages.ts b/packages/project-build/src/db/pages.ts
index 8446ed1e52..418ca0f0da 100644
--- a/packages/project-build/src/db/pages.ts
+++ b/packages/project-build/src/db/pages.ts
@@ -3,7 +3,7 @@ import { type Project, type Build, prisma } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import { Pages } from "../schema/pages";
export const patchPages = async (
diff --git a/packages/project-build/src/db/props.ts b/packages/project-build/src/db/props.ts
index f7046f7e04..5d2ec5fb19 100644
--- a/packages/project-build/src/db/props.ts
+++ b/packages/project-build/src/db/props.ts
@@ -3,7 +3,7 @@ import { type Project, type Build, prisma } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import { Props, PropsList } from "../schema/props";
export const parseProps = (
diff --git a/packages/project-build/src/db/style-source-selections.ts b/packages/project-build/src/db/style-source-selections.ts
index bdf865eb1d..eb8cf648fe 100644
--- a/packages/project-build/src/db/style-source-selections.ts
+++ b/packages/project-build/src/db/style-source-selections.ts
@@ -3,7 +3,7 @@ import { type Project, type Build, prisma } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import {
StyleSourceSelectionsList,
StyleSourceSelections,
diff --git a/packages/project-build/src/db/style-sources.ts b/packages/project-build/src/db/style-sources.ts
index fa192e06a6..92143c8abf 100644
--- a/packages/project-build/src/db/style-sources.ts
+++ b/packages/project-build/src/db/style-sources.ts
@@ -3,7 +3,7 @@ import { type Project, prisma } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import type { Build } from "../types";
import { StyleSourcesList, StyleSources } from "../schema/style-sources";
diff --git a/packages/project-build/src/db/styles.ts b/packages/project-build/src/db/styles.ts
index d2aeb3036a..d95fe85021 100644
--- a/packages/project-build/src/db/styles.ts
+++ b/packages/project-build/src/db/styles.ts
@@ -3,7 +3,7 @@ import { type Project, prisma } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import type { Build } from "../types";
import { Styles, StylesList, getStyleDeclKey } from "../schema/styles";
diff --git a/packages/project/package.json b/packages/project/package.json
index 5bce14746f..a5c4abea08 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -36,9 +36,9 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": {
+ "./index.server": {
"source": "./src/index.server.ts",
- "default": "./server.js"
+ "import": "./lib/index.server.js"
}
},
"types": "lib/types/index.d.ts",
diff --git a/packages/project/server.d.ts b/packages/project/server.d.ts
deleted file mode 100644
index e83d502945..0000000000
--- a/packages/project/server.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/types/index.server";
diff --git a/packages/project/server.js b/packages/project/server.js
deleted file mode 100644
index a6fbe7c12c..0000000000
--- a/packages/project/server.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/index.server";
diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.ts
index fd09ee8aa0..0c51e47088 100644
--- a/packages/project/src/db/project.ts
+++ b/packages/project/src/db/project.ts
@@ -2,15 +2,15 @@ import slugify from "slugify";
import { customAlphabet } from "nanoid";
import { v4 as uuid } from "uuid";
import { prisma, Prisma } from "@webstudio-is/prisma-client";
-import { cloneAssets } from "@webstudio-is/asset-uploader/server";
+import { cloneAssets } from "@webstudio-is/asset-uploader/index.server";
import {
authorizeProject,
type AppContext,
-} from "@webstudio-is/trpc-interface/server";
+} from "@webstudio-is/trpc-interface/index.server";
import {
createBuild,
loadBuildByProjectId,
-} from "@webstudio-is/project-build/server";
+} from "@webstudio-is/project-build/index.server";
import { Project, Title } from "../shared/schema";
const nanoid = customAlphabet("1234567890abcdefghijklmnopqrstuvwxyz");
diff --git a/packages/project/src/trpc/trpc.ts b/packages/project/src/trpc/trpc.ts
index 17004a4dc5..570d5022d9 100644
--- a/packages/project/src/trpc/trpc.ts
+++ b/packages/project/src/trpc/trpc.ts
@@ -1,5 +1,5 @@
import { initTRPC } from "@trpc/server";
-import type { AppContext } from "@webstudio-is/trpc-interface/server";
+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
export const { router, procedure, middleware, mergeRouters } = initTRPC
.context<AppContext>()
diff --git a/packages/trpc-interface/package.json b/packages/trpc-interface/package.json
index a0ae511fba..e03fbd8c00 100644
--- a/packages/trpc-interface/package.json
+++ b/packages/trpc-interface/package.json
@@ -30,9 +30,9 @@
"typescript": "5.0.3"
},
"exports": {
- "./server": {
+ "./index.server": {
"source": "./src/index.server.ts",
- "default": "./server.js"
+ "import": "./lib/index.server.js"
}
},
"files": [
diff --git a/packages/trpc-interface/server.d.ts b/packages/trpc-interface/server.d.ts
deleted file mode 100644
index e83d502945..0000000000
--- a/packages/trpc-interface/server.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/types/index.server";
diff --git a/packages/trpc-interface/server.js b/packages/trpc-interface/server.js
deleted file mode 100644
index a6fbe7c12c..0000000000
--- a/packages/trpc-interface/server.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./lib/index.server";