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.

fix: Page Setting URL Misformatted (#2567)

Ivan Starkovefb0425e9a33
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index d0a30ddf1b..c20fd3402b 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -36,6 +36,7 @@ import {
styleSourceSelectionsStore,
styleSourcesStore,
stylesStore,
+ $domains,
} from "~/shared/nano-states";
import { type Settings, useClientSettings } from "./shared/client-settings";
import { getBuildUrl } from "~/shared/router-utils";
@@ -219,6 +220,7 @@ const NavigatorPanel = ({
export type BuilderProps = {
project: Project;
+ domains: string[];
build: Build;
assets: [Asset["id"], Asset][];
buildOrigin: string;
@@ -228,6 +230,7 @@ export type BuilderProps = {
export const Builder = ({
project,
+ domains,
build,
assets,
buildOrigin,
@@ -237,6 +240,7 @@ export const Builder = ({
useMount(() => {
// additional data stores
projectStore.set(project);
+ $domains.set(domains);
$authPermit.set(authPermit);
$authToken.set(authToken);
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx
index c20a62f031..2c62321892 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx
@@ -65,7 +65,7 @@ projectStore.set({
createdAt: `${new Date()}`,
isDeleted: false,
userId: "userId",
- domain: "new-2x9tcd.wstd.io",
+ domain: "new-2x9tcd",
});
export const PageSettingsEdit = () => {
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
index 1f7daca74c..056c7c2680 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
@@ -46,6 +46,7 @@ import { Header, HeaderSuffixSpacer } from "../../header";
import { deleteInstance } from "~/shared/instance-utils";
import {
assetsStore,
+ $domains,
instancesStore,
pagesStore,
projectStore,
@@ -61,6 +62,7 @@ import { ImageInfo } from "./image-info";
import { SocialPreview } from "./social-preview";
import { useEffectEvent } from "~/builder/features/ai/hooks/effect-event";
import { CustomMetadata } from "./custom-metadata";
+import env from "~/shared/env";
const fieldDefaultValues = {
name: "Untitled",
@@ -244,7 +246,13 @@ const FormFields = ({
const faviconUrl = faviconAsset?.type === "image" ? faviconAsset.name : "";
const project = projectStore.get();
- const publishedUrl = new URL(`https://${project?.domain}`);
+ const customDomain: string | undefined = $domains.get()[0];
+ const projectDomain = `${project?.domain}.${
+ env.PUBLISHER_HOST ?? "wstd.work"
+ }`;
+ const domain = customDomain ?? projectDomain;
+
+ const publishedUrl = new URL(`https://${domain}`);
const pageDomainAndPath = [publishedUrl.host, values?.path]
.filter(Boolean)
diff --git a/apps/builder/app/env/env.public.server.ts b/apps/builder/app/env/env.public.server.ts
index 2739acf1be..fbe8d92265 100644
--- a/apps/builder/app/env/env.public.server.ts
+++ b/apps/builder/app/env/env.public.server.ts
@@ -13,7 +13,6 @@ const env = {
DEBUG: process.env.DEBUG,
FEATURES: process.env.FEATURES,
BUILDER_HOST: process.env.BUILDER_HOST,
- PUBLISHER_ENDPOINT: process.env.PUBLISHER_ENDPOINT || null,
PUBLISHER_HOST: process.env.PUBLISHER_HOST || null,
BUILD_REQUIRE_SUBDOMAIN: process.env.BUILD_REQUIRE_SUBDOMAIN === "true",
diff --git a/apps/builder/app/env/env.server.ts b/apps/builder/app/env/env.server.ts
index 2b6037e99d..c285358a90 100644
--- a/apps/builder/app/env/env.server.ts
+++ b/apps/builder/app/env/env.server.ts
@@ -10,10 +10,6 @@ const env = {
// Secret session key, context encode
AUTH_SECRET: process.env.AUTH_SECRET,
- // Publishing
- PUBLISHER_ENDPOINT: process.env.PUBLISHER_ENDPOINT,
- PUBLISHER_TOKEN: process.env.PUBLISHER_TOKEN,
-
// DEPLOYMENT_ENVIRONMENT development | preview | production
DEPLOYMENT_ENVIRONMENT: process.env.DEPLOYMENT_ENVIRONMENT,
DEPLOYMENT_URL: process.env.DEPLOYMENT_URL,
diff --git a/apps/builder/app/routes/builder.$projectId.tsx b/apps/builder/app/routes/builder.$projectId.tsx
index 8963246050..653502e983 100644
--- a/apps/builder/app/routes/builder.$projectId.tsx
+++ b/apps/builder/app/routes/builder.$projectId.tsx
@@ -6,6 +6,7 @@ import {
import type { ShouldRevalidateFunction } from "@remix-run/react";
import { redirect, type LoaderArgs, json } from "@remix-run/node";
import { loadBuildByProjectId } from "@webstudio-is/project-build/index.server";
+import { db as domainDb } from "@webstudio-is/domain/index.server";
import { db } from "@webstudio-is/project/index.server";
import {
AuthorizationError,
@@ -52,8 +53,21 @@ export const loader = async ({
}
const devBuild = await loadBuildByProjectId(project.id);
+
const assets = await loadAssetsByProject(project.id, context);
+ const currentProjectDomainsResult = await domainDb.findMany(
+ { projectId: project.id },
+ context
+ );
+
+ const domains = currentProjectDomainsResult.success
+ ? currentProjectDomainsResult.data
+ .filter((projectDomain) => projectDomain.verified)
+ .filter((projectDomain) => projectDomain.domain.status === "ACTIVE")
+ .map((projectDomain) => projectDomain.domain.domain)
+ : [];
+
const end = Date.now();
const diff = end - start;
@@ -66,6 +80,7 @@ export const loader = async ({
return {
project,
+ domains,
build: devBuild,
assets: assets.map((asset) => [asset.id, asset]),
buildOrigin: getBuildOrigin(request),
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index 4d8094eb0b..7547c8b874 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -31,6 +31,8 @@ import type { Project } from "@webstudio-is/project";
export const projectStore = atom<Project | undefined>();
+export const $domains = atom<string[]>([]);
+
export const rootInstanceStore = computed(
[instancesStore, selectedPageStore],
(instances, selectedPage) => {
diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.ts
index 4576b28463..4e8e082acb 100644
--- a/apps/builder/app/shared/router-utils/path-utils.ts
+++ b/apps/builder/app/shared/router-utils/path-utils.ts
@@ -152,8 +152,7 @@ export const getBuildUrl = ({
export const getPublishedUrl = (domain: string) => {
const protocol = typeof location === "object" ? location.protocol : "https:";
- const publisherHost =
- env.PUBLISHER_ENDPOINT && env.PUBLISHER_HOST ? env.PUBLISHER_HOST : "";
+ const publisherHost = env.PUBLISHER_HOST ?? "";
// We use location.host to get the hostname and port in development mode and to not break local testing.
const localhost = typeof location === "object" ? location.host : "";
diff --git a/packages/domain/src/db/index.ts b/packages/domain/src/db/index.ts
index 40dfe1ac71..4d43cd0aa9 100644
--- a/packages/domain/src/db/index.ts
+++ b/packages/domain/src/db/index.ts
@@ -1 +1,2 @@
export * as db from "./domain";
+export type { ProjectDomain } from "./domain";