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.

Remove handleRequest from react-sdk (#1499)

Bogdan Chadkin723d9e2f200e
diff --git a/apps/builder/app/entry.server.tsx b/apps/builder/app/entry.server.tsx
index affab051ad..3b0f585185 100644
--- a/apps/builder/app/entry.server.tsx
+++ b/apps/builder/app/entry.server.tsx
@@ -1,15 +1,34 @@
+import { renderToString } from "react-dom/server";
import type { EntryContext } from "@remix-run/node";
+import { RemixServer } from "@remix-run/react";
import * as Sentry from "@sentry/remix";
-import { initSentry } from "./shared/sentry";
import { prisma } from "@webstudio-is/prisma-client";
+import { initSentry } from "./shared/sentry";
import { handleRequest as handleRequestBuilder } from "./shared/remix";
-import { handleRequest as handleRequestCanvas } from "@webstudio-is/react-sdk";
import { getBuildParams } from "./shared/router-utils";
initSentry({
integrations: [new Sentry.Integrations.Prisma({ client: prisma })],
});
+const handleRequestCanvas = (
+ request: Request,
+ responseStatusCode: number,
+ responseHeaders: Headers,
+ remixContext: EntryContext
+) => {
+ const markup = renderToString(
+ <RemixServer context={remixContext} url={request.url} />
+ );
+
+ responseHeaders.set("Content-Type", "text/html");
+
+ return new Response(`<!DOCTYPE html>${markup}`, {
+ status: responseStatusCode,
+ headers: responseHeaders,
+ });
+};
+
export default function handleRequest(
request: Request,
responseStatusCode: number,
@@ -18,6 +37,8 @@ export default function handleRequest(
) {
let handle = handleRequestBuilder;
+ // @todo canvas can be deployed as separate app
+ // and separate request handler will not be necessary anymore
if (
remixContext.staticHandlerContext.matches.some(
(match) =>
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index b7cbaa7317..891ce94b7c 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -20,11 +20,8 @@
"devDependencies": {
"@babel/core": "^7.21.0",
"@jest/globals": "^29.3.1",
- "@remix-run/node": "1.15.0",
- "@remix-run/react": "1.15.0",
- "@remix-run/server-runtime": "1.15.0",
+ "@remix-run/react": "^1.15.0",
"@storybook/react": "^6.5.16",
- "@types/node": "^18.11.18",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@webstudio-is/jest-config": "workspace:^",
@@ -38,8 +35,7 @@
"zod": "^3.19.1"
},
"peerDependencies": {
- "@remix-run/react": "1.9.0",
- "@remix-run/server-runtime": "1.9.0",
+ "@remix-run/react": "^1.15.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"zod": "^3.19.1"
diff --git a/packages/react-sdk/src/app/handle-request.server.tsx b/packages/react-sdk/src/app/handle-request.server.tsx
deleted file mode 100644
index 66f255cb8a..0000000000
--- a/packages/react-sdk/src/app/handle-request.server.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { renderToString } from "react-dom/server";
-import { RemixServer } from "@remix-run/react";
-import type { EntryContext } from "@remix-run/node";
-
-export const handleRequest = (
- request: Request,
- responseStatusCode: number,
- responseHeaders: Headers,
- remixContext: EntryContext
-) => {
- const markup = renderToString(
- <RemixServer context={remixContext} url={request.url} />
- );
-
- responseHeaders.set("Content-Type", "text/html");
-
- return new Response(`<!DOCTYPE html>${markup}`, {
- status: responseStatusCode,
- headers: responseHeaders,
- });
-};
diff --git a/packages/react-sdk/src/app/index.ts b/packages/react-sdk/src/app/index.ts
index aed4524196..526bdd7f40 100644
--- a/packages/react-sdk/src/app/index.ts
+++ b/packages/react-sdk/src/app/index.ts
@@ -1,3 +1,2 @@
export * from "./root";
-export * from "./handle-request.server";
export * from "./params";
diff --git a/packages/sdk-size-test/app/entry.server.tsx b/packages/sdk-size-test/app/entry.server.tsx
deleted file mode 100644
index ee4b4da171..0000000000
--- a/packages/sdk-size-test/app/entry.server.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { EntryContext } from "@remix-run/node";
-import { handleRequest as handleRequestRemix } from "@webstudio-is/react-sdk";
-
-export default function handleRequest(
- request: Request,
- responseStatusCode: number,
- responseHeaders: Headers,
- remixContext: EntryContext
-) {
- return handleRequestRemix(
- request,
- responseStatusCode,
- responseHeaders,
- remixContext
- );
-}
diff --git a/packages/sdk-size-test/package.json b/packages/sdk-size-test/package.json
index 83ba54013e..42e1b08f6a 100644
--- a/packages/sdk-size-test/package.json
+++ b/packages/sdk-size-test/package.json
@@ -20,16 +20,18 @@
}
],
"dependencies": {
- "@remix-run/cloudflare-pages": "1.15.0",
- "@remix-run/react": "1.15.0",
+ "@remix-run/cloudflare": "^1.15.0",
+ "@remix-run/cloudflare-pages": "^1.15.0",
+ "@remix-run/react": "^1.15.0",
"@webstudio-is/project": "workspace:^",
"@webstudio-is/project-build": "workspace:^",
"@webstudio-is/react-sdk": "workspace:^",
+ "isbot": "^3.6.10",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
- "@remix-run/dev": "1.15.0",
+ "@remix-run/dev": "^1.15.0",
"@size-limit/file": "^8.2.4",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 39a0a208c8..faf6c425cb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1187,21 +1187,12 @@ importers:
'@jest/globals':
specifier: ^29.3.1
version: 29.3.1
- '@remix-run/node':
- specifier: 1.15.0
- version: 1.15.0
'@remix-run/react':
- specifier: 1.15.0
+ specifier: ^1.15.0
- '@remix-run/server-runtime':
- specifier: 1.15.0
- version: 1.15.0
'@storybook/react':
specifier: ^6.5.16
- '@types/node':
- specifier: ^18.11.18
- version: 18.11.18
'@types/react':
specifier: ^18.0.35
version: 18.0.35
@@ -1260,11 +1251,14 @@ importers:
packages/sdk-size-test:
dependencies:
+ '@remix-run/cloudflare':
+ specifier: ^1.15.0
+ version: 1.15.0(@cloudflare/[email protected])
'@remix-run/cloudflare-pages':
- specifier: 1.15.0
+ specifier: ^1.15.0
version: 1.15.0(@cloudflare/[email protected])
'@remix-run/react':
- specifier: 1.15.0
+ specifier: ^1.15.0
'@webstudio-is/project':
specifier: workspace:^
@@ -1275,6 +1269,9 @@ importers:
'@webstudio-is/react-sdk':
specifier: workspace:^
version: link:../react-sdk
+ isbot:
+ specifier: ^3.6.10
+ version: 3.6.10
react:
specifier: 18.2.0
version: 18.2.0
@@ -1283,7 +1280,7 @@ importers:
version: 18.2.0([email protected])
devDependencies:
'@remix-run/dev':
- specifier: 1.15.0
+ specifier: ^1.15.0
version: 1.15.0(@remix-run/[email protected])
'@size-limit/file':
specifier: ^8.2.4
@@ -13779,6 +13776,11 @@ packages:
resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
dev: true
+ resolution: {integrity: sha512-+I+2998oyP4oW9+OTQD8TS1r9P6wv10yejukj+Ksj3+UR5pUhsZN3f8W7ysq0p1qxpOVNbl5mCuv0bCaF8y5iQ==}
+ engines: {node: '>=12'}
+ dev: false
+
resolution: {integrity: sha512-SXNUQaNZlj/+9jdrGnAp6WW0YoHe3MIwwc6oRIYuhhERBUt7/L6I7JkMiA2sX9fcvS7gZ2C7GWgmDZfOOU4I5g==}
engines: {node: '>=12'}
@@ -14614,6 +14616,7 @@ packages:
resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+ hasBin: true
dependencies:
js-tokens: 4.0.0
@@ -15333,10 +15336,12 @@ packages:
resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
engines: {node: '>=4'}
+ hasBin: true
resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
engines: {node: '>=4.0.0'}
+ hasBin: true
resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}