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.

Use node-fetch for trpc-interface to fix vercel/remix override (#1897)

Ivan Starkov037489463887
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 59afd96635..24326be536 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -74,6 +74,7 @@
"nanoid": "^3.3.6",
"nanostores": "^0.7.1",
"no-case": "^3.0.4",
+ "node-fetch": "^3.3.1",
"pretty-bytes": "^6.0.0",
"prismjs": "^1.28.0",
"react": "^18.2.0",
diff --git a/apps/builder/remix.config.js b/apps/builder/remix.config.js
index cc217c5991..60514ef6be 100644
--- a/apps/builder/remix.config.js
+++ b/apps/builder/remix.config.js
@@ -26,6 +26,7 @@ module.exports = {
"character-entities",
/mdast-/,
"unist-util-stringify-position",
+ "node-fetch",
],
// appDirectory: "app",
// assetsBuildDirectory: "public/build",
diff --git a/packages/trpc-interface/src/shared/client.ts b/packages/trpc-interface/src/shared/client.ts
index e5cca3b0dd..61adff8ff7 100644
--- a/packages/trpc-interface/src/shared/client.ts
+++ b/packages/trpc-interface/src/shared/client.ts
@@ -5,6 +5,7 @@ import {
type SharedRouter,
} from "./shared-router";
import { callerLink } from "../trpc-caller-link";
+import fetch from "node-fetch";
type SharedClientOptions = {
url: string;
@@ -20,6 +21,7 @@ export const createTrpcProxyServiceClient = (
links: [
httpBatchLink({
url: options.url,
+ fetch: fetch as never,
headers: () => ({
Authorization: options.token,
// We use this header for SaaS preview service discovery proxy
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 39d52a807e..0436f72177 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -222,6 +222,9 @@ importers:
no-case:
specifier: ^3.0.4
version: 3.0.4
+ node-fetch:
+ specifier: ^3.3.1
+ version: 3.3.1
pretty-bytes:
specifier: ^6.0.0
version: 6.0.0
@@ -10027,6 +10030,11 @@ packages:
resolution: {integrity: sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==}
engines: {node: '>= 6'}
+ resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
+ engines: {node: '>= 12'}
+ dev: false
+
resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
engines: {node: '>=0.11'}
@@ -11218,6 +11226,14 @@ packages:
dependencies:
pend: 1.2.0
+ resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
+ engines: {node: ^12.20 || >= 14.13}
+ dependencies:
+ node-domexception: 1.0.0
+ web-streams-polyfill: 3.2.1
+ dev: false
+
resolution: {integrity: sha512-uJQyMrX5IJZkhoEUBQ3EjxkeiZkppBd5jS/fMTJmfZxLSiaQjv2zD0kTvuvkSH89uFvgSlB6ueGpjD3HWN7Bxw==}
@@ -11401,6 +11417,13 @@ packages:
engines: {node: '>=0.4.x'}
dev: true
+ resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
+ engines: {node: '>=12.20.0'}
+ dependencies:
+ fetch-blob: 3.2.0
+ dev: false
+
resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
engines: {node: '>= 0.6'}
@@ -14286,6 +14309,11 @@ packages:
dependencies:
minimatch: 3.1.2
+ resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+ engines: {node: '>=10.5.0'}
+ dev: false
+
resolution: {integrity: sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==}
@@ -14300,6 +14328,15 @@ packages:
dependencies:
whatwg-url: 5.0.0
+ resolution: {integrity: sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==}
+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+ dependencies:
+ data-uri-to-buffer: 4.0.1
+ fetch-blob: 3.2.0
+ formdata-polyfill: 4.0.10
+ dev: false
+
resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
engines: {node: '>= 6.13.0'}