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: Unreveal remix, use fully default setup (#4035)

Ivan Starkov678825c92f59
diff --git a/apps/builder/app/entry.client.tsx b/apps/builder/app/entry.client.tsx
deleted file mode 100644
index 3059a4dfb6..0000000000
--- a/apps/builder/app/entry.client.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { RemixBrowser } from "@remix-run/react";
-import { startTransition, StrictMode } from "react";
-import { createRoot } from "react-dom/client";
-
-startTransition(() => {
- // Do not hydrate canvas, to avoid hydration Errors in case of 3rd party plugins.
- // Just render it from scratch. (We don't have data on the Canvas at the server so no FOUC is possible)
- const root = createRoot(document as never);
- root.render(
- <StrictMode>
- <RemixBrowser />
- </StrictMode>
- );
-});
diff --git a/apps/builder/app/entry.server.tsx b/apps/builder/app/entry.server.tsx
deleted file mode 100644
index f77af6be63..0000000000
--- a/apps/builder/app/entry.server.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * By default, Remix will handle generating the HTTP Response for you.
- * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
- * For more information, see https://remix.run/file-conventions/entry.server
- */
-
-import {
- createReadableStreamFromReadable,
- type AppLoadContext,
- type EntryContext,
-} from "@remix-run/node";
-import { RemixServer } from "@remix-run/react";
-import { PassThrough } from "node:stream";
-import { renderToPipeableStream } from "react-dom/server";
-
-const ABORT_DELAY = 5_000;
-
-export default function handleRequest(
- request: Request,
- responseStatusCode: number,
- responseHeaders: Headers,
- remixContext: EntryContext,
- // This is ignored so we can keep it in the template for visibility. Feel
- // free to delete this parameter in your app if you're not using it!
- _loadContext: AppLoadContext
-) {
- return handleBrowserRequest(
- request,
- responseStatusCode,
- responseHeaders,
- remixContext
- );
-}
-
-// eslint-disable-next-line func-style
-function handleBrowserRequest(
- request: Request,
- responseStatusCode: number,
- responseHeaders: Headers,
- remixContext: EntryContext
-) {
- return new Promise((resolve, reject) => {
- let shellRendered = false;
- const { pipe, abort } = renderToPipeableStream(
- <RemixServer
- context={remixContext}
- url={request.url}
- abortDelay={ABORT_DELAY}
- />,
- {
- onShellReady() {
- shellRendered = true;
- const body = new PassThrough();
- const stream = createReadableStreamFromReadable(body);
-
- responseHeaders.set("Content-Type", "text/html");
-
- resolve(
- new Response(stream, {
- headers: responseHeaders,
- status: responseStatusCode,
- })
- );
-
- pipe(body);
- },
- onShellError(error: unknown) {
- reject(error);
- },
- onError(error: unknown) {
- responseStatusCode = 500;
- // Log streaming rendering errors from inside the shell. Don't log
- // errors encountered during initial shell rendering since they'll
- // reject and get logged in handleDocumentRequest.
- if (shellRendered) {
- console.error(error);
- }
- },
- }
- );
-
- setTimeout(abort, ABORT_DELAY);
- });
-}
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 9f2f5fb897..3be29966ac 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -42,7 +42,6 @@
"@radix-ui/react-tooltip": "^1.1.2",
"@react-aria/interactions": "^3.19.0",
"@react-aria/utils": "^3.21.0",
- "@remix-run/cloudflare": "^2.11.0",
"@remix-run/node": "^2.11.0",
"@remix-run/react": "^2.11.0",
"@remix-run/serve": "^2.11.0",
@@ -88,6 +87,7 @@
"fast-deep-equal": "^3.1.3",
"immer": "^10.0.3",
"immerhin": "^0.9.0",
+ "isbot": "^5.1.17",
"lexical": "^0.16.0",
"match-sorter": "^6.3.4",
"mdast-util-from-markdown": "^2.0.1",
diff --git a/fixtures/webstudio-cloudflare-template/package.json b/fixtures/webstudio-cloudflare-template/package.json
index b8cf6eab3d..b5601ff5f6 100644
--- a/fixtures/webstudio-cloudflare-template/package.json
+++ b/fixtures/webstudio-cloudflare-template/package.json
@@ -38,7 +38,7 @@
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
- "isbot": "^5.1.13",
+ "isbot": "^5.1.17",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"webstudio": "workspace:*",
diff --git a/fixtures/webstudio-custom-template/package.json b/fixtures/webstudio-custom-template/package.json
index 813e6a443f..85e22fa15d 100644
--- a/fixtures/webstudio-custom-template/package.json
+++ b/fixtures/webstudio-custom-template/package.json
@@ -21,7 +21,7 @@
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
- "isbot": "^5.1.13",
+ "isbot": "^5.1.17",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"web-vitals": "^3.5.2"
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/package.json b/fixtures/webstudio-remix-netlify-edge-functions/package.json
index d80c8b36d8..e1d7e30a1f 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/package.json
+++ b/fixtures/webstudio-remix-netlify-edge-functions/package.json
@@ -22,7 +22,7 @@
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
- "isbot": "^5.1.13",
+ "isbot": "^5.1.17",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
diff --git a/fixtures/webstudio-remix-netlify-functions/package.json b/fixtures/webstudio-remix-netlify-functions/package.json
index 3562bbf6ca..63f3cc8b0a 100644
--- a/fixtures/webstudio-remix-netlify-functions/package.json
+++ b/fixtures/webstudio-remix-netlify-functions/package.json
@@ -21,7 +21,7 @@
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
- "isbot": "^5.1.13",
+ "isbot": "^5.1.17",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
diff --git a/fixtures/webstudio-remix-vercel/package.json b/fixtures/webstudio-remix-vercel/package.json
index 87ab1da2aa..c15bf7a68e 100644
--- a/fixtures/webstudio-remix-vercel/package.json
+++ b/fixtures/webstudio-remix-vercel/package.json
@@ -21,7 +21,7 @@
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
- "isbot": "^5.1.13",
+ "isbot": "^5.1.17",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
diff --git a/packages/cli/templates/defaults/package.json b/packages/cli/templates/defaults/package.json
index 92d61448a4..b34e07941e 100644
--- a/packages/cli/templates/defaults/package.json
+++ b/packages/cli/templates/defaults/package.json
@@ -17,7 +17,7 @@
"@webstudio-is/sdk-components-react": "0.174.0",
"@webstudio-is/image": "0.174.0",
"@webstudio-is/sdk": "0.174.0",
- "isbot": "^5.1.13",
+ "isbot": "^5.1.17",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c3197231c6..86cf1049a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -199,9 +199,6 @@ importers:
'@react-aria/utils':
specifier: ^3.21.0
version: 3.21.0([email protected])
- '@remix-run/cloudflare':
- specifier: ^2.11.0
- version: 2.11.0(@cloudflare/[email protected])([email protected])
'@remix-run/node':
specifier: ^2.11.0
version: 2.11.0([email protected])
@@ -337,6 +334,9 @@ importers:
immerhin:
specifier: ^0.9.0
version: 0.9.0
+ isbot:
+ specifier: ^5.1.17
+ version: 5.1.17
lexical:
specifier: ^0.16.0
version: 0.16.0
@@ -574,8 +574,8 @@ importers:
specifier: workspace:*
version: link:../../packages/sdk-components-react-remix
isbot:
- specifier: ^5.1.13
- version: 5.1.13
+ specifier: ^5.1.17
+ version: 5.1.17
react:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318
@@ -644,8 +644,8 @@ importers:
specifier: workspace:*
version: link:../../packages/sdk-components-react-remix
isbot:
- specifier: ^5.1.13
- version: 5.1.13
+ specifier: ^5.1.17
+ version: 5.1.17
react:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318
@@ -711,8 +711,8 @@ importers:
specifier: workspace:*
version: link:../../packages/sdk-components-react-remix
isbot:
- specifier: ^5.1.13
- version: 5.1.13
+ specifier: ^5.1.17
+ version: 5.1.17
react:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318
@@ -775,8 +775,8 @@ importers:
specifier: workspace:*
version: link:../../packages/sdk-components-react-remix
isbot:
- specifier: ^5.1.13
- version: 5.1.13
+ specifier: ^5.1.17
+ version: 5.1.17
react:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318
@@ -833,8 +833,8 @@ importers:
specifier: workspace:*
version: link:../../packages/sdk-components-react-remix
isbot:
- specifier: ^5.1.13
- version: 5.1.13
+ specifier: ^5.1.17
+ version: 5.1.17
react:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318
@@ -7194,8 +7194,8 @@ packages:
resolution: {integrity: sha512-uoP4uK5Dc2CrabmK+Gue1jTL+scHiCc1c9rblRpJwG8CPxjLIv8jmGyyGRGkbPOweayhkskdZsEQXG6p+QCQrg==}
engines: {node: '>=12'}
- resolution: {integrity: sha512-RXtBib4m9zChSb+187EpNQML7Z3u2i34zDdqcRFZnqSJs0xdh91xzJytc5apYVg+9Y4NGnUQ0AIeJvX9FAnCUw==}
+ resolution: {integrity: sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==}
engines: {node: '>=18'}
@@ -11963,7 +11963,7 @@ snapshots:
dependencies:
'@netlify/functions': 2.8.1
'@remix-run/node': 2.11.0([email protected])
- isbot: 5.1.13
+ isbot: 5.1.17
optionalDependencies:
vite: 5.4.0(@types/[email protected])
transitivePeerDependencies:
@@ -11972,7 +11972,7 @@ snapshots:
dependencies:
'@netlify/remix-runtime': 2.3.0(@remix-run/[email protected]([email protected]))
- isbot: 5.1.13
+ isbot: 5.1.17
optionalDependencies:
vite: 5.4.0(@types/[email protected])
transitivePeerDependencies:
@@ -15690,7 +15690,7 @@ snapshots: