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.

refactor: drop env interop (#3109)

Bogdan Chadkinae79d9f13341
diff --git a/apps/builder/app/env/env.public.server.ts b/apps/builder/app/env/env.public.server.ts
deleted file mode 100644
index 3a195f26be..0000000000
--- a/apps/builder/app/env/env.public.server.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Environment variables we want to send to the UI inlined in the document.
- * Never use a private key here, because it will become public.
- **/
-const env = {
- FEATURES: process.env.FEATURES,
-} as const;
-
-export default env;
-
-export type PublicEnv = typeof env;
diff --git a/apps/builder/app/env/env.server.ts b/apps/builder/app/env/env.server.ts
index 9cac921ee0..71550d2f30 100644
--- a/apps/builder/app/env/env.server.ts
+++ b/apps/builder/app/env/env.server.ts
@@ -95,6 +95,8 @@ const env = {
N8N_WEBHOOK_TOKEN: process.env.N8N_WEBHOOK_TOKEN,
PUBLISHER_HOST: process.env.PUBLISHER_HOST || "wstd.work",
+
+ FEATURES: process.env.FEATURES ?? "",
};
export type ServerEnv = typeof env;
diff --git a/apps/builder/app/root.tsx b/apps/builder/app/root.tsx
index 7fe8ce1b6a..6a670b0017 100644
--- a/apps/builder/app/root.tsx
+++ b/apps/builder/app/root.tsx
@@ -1,18 +1,24 @@
// Our root outlet doesn't contain a layout because we have 2 types of documents: canvas and builder and we need to decide down the line which one to render, thre is no single root document.
-import { Outlet } from "@remix-run/react";
+import { Outlet, json, useLoaderData } from "@remix-run/react";
import { setEnv } from "@webstudio-is/feature-flags";
-import env from "./shared/env";
+import env from "./env/env.server";
import type { ComponentProps } from "react";
import { useSetFeatures } from "./shared/use-set-features";
-setEnv(env.FEATURES as string);
-
type OutletProps = ComponentProps<typeof Outlet>;
-const RootWithErrorBoundary = (props: OutletProps) => {
+export const loader = () => {
+ return json({
+ features: env.FEATURES,
+ });
+};
+
+const Root = (props: OutletProps) => {
+ const { features } = useLoaderData<typeof loader>();
+ setEnv(features);
useSetFeatures();
return <Outlet {...props} />;
};
-export default RootWithErrorBoundary;
+export default Root;
diff --git a/apps/builder/app/routes/builder.tsx b/apps/builder/app/routes/builder.tsx
index 08e337d100..ecf987f8f2 100644
--- a/apps/builder/app/routes/builder.tsx
+++ b/apps/builder/app/routes/builder.tsx
@@ -3,13 +3,11 @@ import type {
ServerRuntimeMetaFunction as MetaFunction,
} from "@remix-run/server-runtime";
import { Root } from "~/shared/remix";
-import env from "~/env/env.public.server";
import { getThemeData } from "~/shared/theme";
import type { ShouldRevalidateFunction } from "@remix-run/react";
export const loader = async ({ request }: LoaderFunctionArgs) => {
return {
- env,
theme: await getThemeData(request),
};
};
diff --git a/apps/builder/app/routes/dashboard.tsx b/apps/builder/app/routes/dashboard.tsx
index 0148b926c8..9d3f9f4a36 100644
--- a/apps/builder/app/routes/dashboard.tsx
+++ b/apps/builder/app/routes/dashboard.tsx
@@ -3,12 +3,10 @@ import type {
ServerRuntimeMetaFunction as MetaFunction,
} from "@remix-run/server-runtime";
import { Root } from "~/shared/remix";
-import env from "~/env/env.public.server";
import { getThemeData } from "~/shared/theme";
export const loader = async ({ request }: LoaderFunctionArgs) => {
return {
- env,
theme: await getThemeData(request),
};
};
diff --git a/apps/builder/app/routes/login.tsx b/apps/builder/app/routes/login.tsx
index 8074a8c8c3..06eebc5610 100644
--- a/apps/builder/app/routes/login.tsx
+++ b/apps/builder/app/routes/login.tsx
@@ -3,12 +3,10 @@ import type {
ServerRuntimeMetaFunction as MetaFunction,
} from "@remix-run/server-runtime";
import { Root } from "~/shared/remix";
-import env from "~/env/env.public.server";
import { getThemeData } from "~/shared/theme";
export const loader = async ({ request }: LoaderFunctionArgs) => {
return {
- env,
theme: await getThemeData(request),
};
};
diff --git a/apps/builder/app/routes/n8n.tsx b/apps/builder/app/routes/n8n.tsx
index 294d6f386a..b503b58a67 100644
--- a/apps/builder/app/routes/n8n.tsx
+++ b/apps/builder/app/routes/n8n.tsx
@@ -3,12 +3,10 @@ import type {
ServerRuntimeMetaFunction as MetaFunction,
} from "@remix-run/server-runtime";
import { Root } from "~/shared/remix";
-import env from "~/env/env.public.server";
import { getThemeData } from "~/shared/theme";
export const loader = async ({ request }: LoaderFunctionArgs) => {
return {
- env,
theme: await getThemeData(request),
};
};
diff --git a/apps/builder/app/shared/env/env-getter.ts b/apps/builder/app/shared/env/env-getter.ts
deleted file mode 100644
index 1a9b95c680..0000000000
--- a/apps/builder/app/shared/env/env-getter.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { namespace } from "./namespace";
-import publicEnv from "~/env/env.public.server";
-import type { PublicEnv } from "~/env/env.public.server";
-
-// @todo remove once remix has a built-in way
-// https://github.com/remix-run/remix/discussions/2769
-// This provides an access to a config over window by accessing a property in an env proxy object
-export default new Proxy(
- {},
- {
- get(_target, prop) {
- if (typeof window === "undefined") {
- return prop in publicEnv
- ? publicEnv[prop as keyof PublicEnv]
- : undefined;
- }
- const env: Partial<PublicEnv> = window[namespace] ?? {};
- return prop in env ? env[prop as keyof PublicEnv] : undefined;
- },
- }
-) as PublicEnv;
diff --git a/apps/builder/app/shared/env/env.tsx b/apps/builder/app/shared/env/env.tsx
deleted file mode 100644
index d00a9be681..0000000000
--- a/apps/builder/app/shared/env/env.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useLoaderData } from "@remix-run/react";
-import { namespace } from "./namespace";
-import type { PublicEnv } from "~/env/env.public.server";
-
-declare global {
- interface Window {
- [namespace]: Partial<PublicEnv> | undefined;
- }
-}
-
-// @todo remove once remix has a built-in way
-// https://github.com/remix-run/remix/discussions/2769
-// This renders env config as a script tag so we can have access to it before any scripts run
-export const Env = () => {
- const data = useLoaderData<{ env: unknown }>();
- return (
- <script
- dangerouslySetInnerHTML={{
- __html: `window["${namespace}"] = ${JSON.stringify(data.env)}`,
- }}
- />
- );
-};
-
-// For stories
-export const setMockEnv = (env: Partial<PublicEnv>) => {
- window[namespace] = env;
-};
diff --git a/apps/builder/app/shared/env/index.ts b/apps/builder/app/shared/env/index.ts
deleted file mode 100644
index 05a06cf9a7..0000000000
--- a/apps/builder/app/shared/env/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./namespace";
-export * from "./env";
-export { default } from "./env-getter";
diff --git a/apps/builder/app/shared/env/namespace.ts b/apps/builder/app/shared/env/namespace.ts
deleted file mode 100644
index 7fe5123858..0000000000
--- a/apps/builder/app/shared/env/namespace.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// Global namespace on window.
-export const namespace = "__webstudioEnv";
diff --git a/apps/builder/app/shared/remix/root.tsx b/apps/builder/app/shared/remix/root.tsx
index 522a06aee3..cd141bf8cc 100644
--- a/apps/builder/app/shared/remix/root.tsx
+++ b/apps/builder/app/shared/remix/root.tsx
@@ -5,7 +5,6 @@ import {
Outlet as RemixOutlet,
Scripts,
} from "@remix-run/react";
-import { Env } from "~/shared/env";
import { createHead } from "remix-island";
export const Head = createHead(() => (
@@ -20,7 +19,6 @@ export const Root = ({ Outlet = RemixOutlet }) => {
<>
<Head />
<Outlet />
- <Env />
<Scripts />
{process.env.NODE_ENV === "development" && <LiveReload />}
</>