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.

chore: rename postrest package to postgrest and enable publishing (#5592)

Oleg Isonen0d5efb6e0f7e
diff --git a/apps/builder/app/routes/rest.patch.ts b/apps/builder/app/routes/rest.patch.ts
index ba4765a4c3..08d77cc5a7 100644
--- a/apps/builder/app/routes/rest.patch.ts
+++ b/apps/builder/app/routes/rest.patch.ts
@@ -44,7 +44,7 @@ import {
} from "@webstudio-is/trpc-interface/index.server";
import { createContext } from "~/shared/context.server";
import * as projectApi from "@webstudio-is/project/index.server";
-import type { Database } from "@webstudio-is/postrest/index.server";
+import type { Database } from "@webstudio-is/postgrest/index.server";
import { publicStaticEnv } from "~/env/env.static";
import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";
import { checkCsrf } from "~/services/csrf-session.server";
diff --git a/apps/builder/app/services/builder-access.server.ts b/apps/builder/app/services/builder-access.server.ts
index 62252f3552..ddc9eece04 100644
--- a/apps/builder/app/services/builder-access.server.ts
+++ b/apps/builder/app/services/builder-access.server.ts
@@ -1,5 +1,5 @@
import { authorizeProject } from "@webstudio-is/trpc-interface/index.server";
-import { createPostrestContext } from "~/shared/context.server";
+import { createPostgrestContext } from "~/shared/context.server";
/**
* Check if a user is authorized to access a project during the Builder authentication process.
@@ -8,7 +8,7 @@ export const isUserAuthorizedForProject = async (
userId: string,
projectId: string
) => {
- const postgrestContext = createPostrestContext();
+ const postgrestContext = createPostgrestContext();
// Only the project owner can access the Builder URL with authentication credentials (session).
const isProjectOwner = await authorizeProject.checkProjectPermit(
diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.ts
index a63669a629..3b47ba3048 100644
--- a/apps/builder/app/shared/context.server.ts
+++ b/apps/builder/app/shared/context.server.ts
@@ -6,7 +6,7 @@ import { entryApi } from "./entri/entri-api.server";
import { getUserPlanFeatures } from "./db/user-plan-features.server";
import { staticEnv } from "~/env/env.static.server";
-import { createClient } from "@webstudio-is/postrest/index.server";
+import { createClient } from "@webstudio-is/postgrest/index.server";
import { builderAuthenticator } from "~/services/builder-auth.server";
import { readLoginSessionBloomFilter } from "~/services/session.server";
import type { BloomFilter } from "~/services/bloom-filter.server";
@@ -184,7 +184,7 @@ const createTrpcCache = () => {
};
};
-export const createPostrestContext = () => {
+export const createPostgrestContext = () => {
return { client: createClient(env.POSTGREST_URL, env.POSTGREST_API_KEY) };
};
@@ -192,7 +192,7 @@ export const createPostrestContext = () => {
* argument buildEnv==="prod" only if we are loading project with production build
*/
export const createContext = async (request: Request): Promise<AppContext> => {
- const postgrest = createPostrestContext();
+ const postgrest = createPostgrestContext();
const authorization = await createAuthorizationContext(request, postgrest);
const domain = createDomainContext();
diff --git a/apps/builder/app/shared/db/user.server.ts b/apps/builder/app/shared/db/user.server.ts
index e25cc79ede..20befc4f24 100644
--- a/apps/builder/app/shared/db/user.server.ts
+++ b/apps/builder/app/shared/db/user.server.ts
@@ -1,4 +1,4 @@
-import type { Database } from "@webstudio-is/postrest/index.server";
+import type { Database } from "@webstudio-is/postgrest/index.server";
import {
AuthorizationError,
type AppContext,
diff --git a/apps/builder/package.json b/apps/builder/package.json
index c40993add5..eb9c29d64b 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -73,7 +73,7 @@
"@webstudio-is/http-client": "workspace:*",
"@webstudio-is/icons": "workspace:*",
"@webstudio-is/image": "workspace:*",
- "@webstudio-is/postrest": "workspace:*",
+ "@webstudio-is/postgrest": "workspace:*",
"@webstudio-is/project": "workspace:*",
"@webstudio-is/project-build": "workspace:*",
"@webstudio-is/react-sdk": "workspace:*",
diff --git a/packages/authorization-token/package.json b/packages/authorization-token/package.json
index 50752f0066..b3928fba6b 100644
--- a/packages/authorization-token/package.json
+++ b/packages/authorization-token/package.json
@@ -9,7 +9,7 @@
"typecheck": "tsgo --noEmit"
},
"dependencies": {
- "@webstudio-is/postrest": "workspace:*",
+ "@webstudio-is/postgrest": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
"zod": "^3.24.2"
},
diff --git a/packages/authorization-token/src/db/authorization-token.ts b/packages/authorization-token/src/db/authorization-token.ts
index 54336782e6..cd560c7b58 100644
--- a/packages/authorization-token/src/db/authorization-token.ts
+++ b/packages/authorization-token/src/db/authorization-token.ts
@@ -1,4 +1,4 @@
-import type { Database } from "@webstudio-is/postrest/index.server";
+import type { Database } from "@webstudio-is/postgrest/index.server";
import {
type AppContext,
authorizeProject,
diff --git a/packages/authorization-token/src/trpc/authorization-tokens-router.ts b/packages/authorization-token/src/trpc/authorization-tokens-router.ts
index 80b6e197e6..21a85904e1 100644
--- a/packages/authorization-token/src/trpc/authorization-tokens-router.ts
+++ b/packages/authorization-token/src/trpc/authorization-tokens-router.ts
@@ -2,7 +2,7 @@ import { z } from "zod";
import { router, procedure } from "@webstudio-is/trpc-interface/index.server";
import { db } from "../db";
import type { IsEqual } from "type-fest";
-import type { Database } from "@webstudio-is/postrest/index.server";
+import type { Database } from "@webstudio-is/postgrest/index.server";
type Relation =
Database["public"]["Tables"]["AuthorizationToken"]["Row"]["relation"];
diff --git a/packages/domain/package.json b/packages/domain/package.json
index a84807bd69..3ef76f7c69 100644
--- a/packages/domain/package.json
+++ b/packages/domain/package.json
@@ -9,7 +9,7 @@
"typecheck": "tsgo --noEmit"
},
"dependencies": {
- "@webstudio-is/postrest": "workspace:*",
+ "@webstudio-is/postgrest": "workspace:*",
"@webstudio-is/project": "workspace:*",
"@webstudio-is/project-build": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
diff --git a/packages/domain/src/db/domain.ts b/packages/domain/src/db/domain.ts
index dffe74f899..5ae62c0977 100644
--- a/packages/domain/src/db/domain.ts
+++ b/packages/domain/src/db/domain.ts
@@ -8,7 +8,7 @@ import * as projectApi from "@webstudio-is/project/index.server";
import { validateDomain } from "./validate";
import { cnameFromUserId } from "./cname-from-user-id";
import type { Project } from "@webstudio-is/project";
-import type { Database } from "@webstudio-is/postrest/index.server";
+import type { Database } from "@webstudio-is/postgrest/index.server";
type Result = { success: false; error: string } | { success: true };
diff --git a/packages/postgrest/package.json b/packages/postgrest/package.json
index a2ec5aedc2..bed139cbab 100644
--- a/packages/postgrest/package.json
+++ b/packages/postgrest/package.json
@@ -1,11 +1,11 @@
{
- "name": "@webstudio-is/postrest",
- "version": "0.0.0",
+ "name": "@webstudio-is/postgrest",
+ "version": "0.0.0-webstudio-version",
"description": "Webstudio Project Build",
"author": "Webstudio <[email protected]>",
"homepage": "https://webstudio.is",
"license": "AGPL-3.0-or-later",
- "private": true,
+ "private": false,
"type": "module",
"exports": {
"./index.server": {
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index a34ddb66ee..b604ea8766 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -22,7 +22,7 @@
},
"dependencies": {
"@webstudio-is/authorization-token": "workspace:*",
- "@webstudio-is/postrest": "workspace:*",
+ "@webstudio-is/postgrest": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
"@webstudio-is/template": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index 306a471f82..d70428790f 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -1,6 +1,6 @@
/* eslint no-console: ["error", { allow: ["time", "timeEnd"] }] */
-import type { Database } from "@webstudio-is/postrest/index.server";
+import type { Database } from "@webstudio-is/postgrest/index.server";
import {
AuthorizationError,
authorizeProject,
diff --git a/packages/trpc-interface/package.json b/packages/trpc-interface/package.json
index 0f02e9e34e..5f6908b545 100644
--- a/packages/trpc-interface/package.json
+++ b/packages/trpc-interface/package.json
@@ -17,7 +17,7 @@
"zod": "^3.24.2"
},
"devDependencies": {
- "@webstudio-is/postrest": "workspace:*",
+ "@webstudio-is/postgrest": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
"vitest": "^3.1.2"
},
diff --git a/packages/trpc-interface/src/authorize/project.server.ts b/packages/trpc-interface/src/authorize/project.server.ts
index 8af24faa14..0f75f436e9 100644
--- a/packages/trpc-interface/src/authorize/project.server.ts
+++ b/packages/trpc-interface/src/authorize/project.server.ts
@@ -1,5 +1,5 @@
import type { AppContext } from "../context/context.server";
-import type { Database } from "@webstudio-is/postrest/index.server";
+import type { Database } from "@webstudio-is/postgrest/index.server";
import memoize from "memoize";
type Relation =
diff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.ts
index 6cfbc16f7e..9e4457787c 100644
--- a/packages/trpc-interface/src/context/context.server.ts
+++ b/packages/trpc-interface/src/context/context.server.ts
@@ -1,5 +1,5 @@
import type { TrpcInterfaceClient } from "../shared/shared-router";
-import type { Client } from "@webstudio-is/postrest/index.server";
+import type { Client } from "@webstudio-is/postgrest/index.server";
/**
* All necessary parameters for Authorization
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9367158f95..ffa55da188 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -274,7 +274,7 @@ importers:
'@webstudio-is/image':
specifier: workspace:*
version: link:../../packages/image
- '@webstudio-is/postrest':
+ '@webstudio-is/postgrest':
specifier: workspace:*
version: link:../../packages/postgrest
'@webstudio-is/project':
@@ -1046,7 +1046,7 @@ importers:
packages/authorization-token:
dependencies:
- '@webstudio-is/postrest':
+ '@webstudio-is/postgrest':
specifier: workspace:*
version: link:../postgrest
'@webstudio-is/trpc-interface':
@@ -1490,7 +1490,7 @@ importers:
packages/domain:
dependencies:
- '@webstudio-is/postrest':
+ '@webstudio-is/postgrest':
specifier: workspace:*
version: link:../postgrest
'@webstudio-is/project':
@@ -1731,7 +1731,7 @@ importers:
'@webstudio-is/authorization-token':
specifier: workspace:*
version: link:../authorization-token
- '@webstudio-is/postrest':
+ '@webstudio-is/postgrest':
specifier: workspace:*
version: link:../postgrest
'@webstudio-is/sdk':
@@ -2222,7 +2222,7 @@ importers:
specifier: ^3.24.2
version: 3.24.2
devDependencies:
- '@webstudio-is/postrest':
+ '@webstudio-is/postgrest':
specifier: workspace:*
version: link:../postgrest
'@webstudio-is/tsconfig':