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.

Move pubsub from sdk to builder (#2280)

Bogdan Chadkin88dd24ff7d40
diff --git a/packages/react-sdk/src/pubsub/create.ts b/apps/builder/app/shared/pubsub/create.ts
similarity index 100%
rename from packages/react-sdk/src/pubsub/create.ts
rename to apps/builder/app/shared/pubsub/create.ts
diff --git a/apps/builder/app/shared/pubsub/index.ts b/apps/builder/app/shared/pubsub/index.ts
index c40756dba4..14096deea7 100644
--- a/apps/builder/app/shared/pubsub/index.ts
+++ b/apps/builder/app/shared/pubsub/index.ts
@@ -1,4 +1,4 @@
-import { createPubsub } from "@webstudio-is/react-sdk";
+import { createPubsub } from "./create";
// this interface is meant to be augmented by the user
// eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/packages/react-sdk/src/pubsub/raf-queue.ts b/apps/builder/app/shared/pubsub/raf-queue.ts
similarity index 100%
rename from packages/react-sdk/src/pubsub/raf-queue.ts
rename to apps/builder/app/shared/pubsub/raf-queue.ts
diff --git a/fixtures/webstudio-remix-vercel/remix.config.js b/fixtures/webstudio-remix-vercel/remix.config.js
index b6adbdb70e..1499566045 100644
--- a/fixtures/webstudio-remix-vercel/remix.config.js
+++ b/fixtures/webstudio-remix-vercel/remix.config.js
@@ -3,11 +3,10 @@ module.exports = {
ignoredRouteFiles: ["**/.*"],
serverModuleFormat: "cjs",
serverDependenciesToBundle: [
- /@webstudio-is\/(?!prisma-client)/,
- "nanoevents",
+ /@webstudio-is\//,
+ "nanoid",
"nanostores",
"@nanostores/react",
- "nanoid",
"@jsep-plugin/assignment",
],
future: {
diff --git a/packages/cli/src/__generated__/templates.ts b/packages/cli/src/__generated__/templates.ts
index 2e37d826bf..bdcf188ce4 100644
--- a/packages/cli/src/__generated__/templates.ts
+++ b/packages/cli/src/__generated__/templates.ts
@@ -21,7 +21,7 @@ export const templates: Record<ProjectTarget, Folder> = {
{
name: "remix.config.js",
content:
- '/** @type {import(\'@remix-run/dev\').AppConfig} */\nmodule.exports = {\n ignoredRouteFiles: ["**/.*"],\n serverModuleFormat: "cjs",\n serverDependenciesToBundle: [\n /@webstudio-is\\/(?!prisma-client)/,\n "nanoevents",\n "nanostores",\n "@nanostores/react",\n "nanoid",\n "@jsep-plugin/assignment",\n ],\n future: {\n v2_errorBoundary: true,\n v2_headers: true,\n v2_meta: true,\n v2_normalizeFormMethod: true,\n v2_routeConvention: true,\n v2_dev: true,\n },\n};\n',
+ '/** @type {import(\'@remix-run/dev\').AppConfig} */\nmodule.exports = {\n ignoredRouteFiles: ["**/.*"],\n serverModuleFormat: "cjs",\n serverDependenciesToBundle: [\n /@webstudio-is\\//,\n "nanoid",\n "nanostores",\n "@nanostores/react",\n "nanoid",\n "@jsep-plugin/assignment",\n ],\n future: {\n v2_errorBoundary: true,\n v2_headers: true,\n v2_meta: true,\n v2_normalizeFormMethod: true,\n v2_routeConvention: true,\n v2_dev: true,\n },\n};\n',
encoding: "utf-8",
merge: false,
},
diff --git a/packages/cli/templates/defaults/remix.config.js b/packages/cli/templates/defaults/remix.config.js
index b6adbdb70e..1499566045 100644
--- a/packages/cli/templates/defaults/remix.config.js
+++ b/packages/cli/templates/defaults/remix.config.js
@@ -3,11 +3,10 @@ module.exports = {
ignoredRouteFiles: ["**/.*"],
serverModuleFormat: "cjs",
serverDependenciesToBundle: [
- /@webstudio-is\/(?!prisma-client)/,
- "nanoevents",
+ /@webstudio-is\//,
+ "nanoid",
"nanostores",
"@nanostores/react",
- "nanoid",
"@jsep-plugin/assignment",
],
future: {
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index 00b73aa2f8..b13670c32b 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -41,7 +41,6 @@
"@webstudio-is/sdk": "workspace:^",
"html-tags": "^3.3.1",
"jsep": "^1.3.8",
- "nanoevents": "^8.0.0",
"nanoid": "^4.0.2",
"nanostores": "^0.9.3",
"no-case": "^3.0.4",
diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.ts
index 9b8eb4c836..5e4d6f57ae 100644
--- a/packages/react-sdk/src/index.ts
+++ b/packages/react-sdk/src/index.ts
@@ -1,6 +1,5 @@
export * from "./css";
export * from "./tree";
-export * from "./pubsub";
export * from "./app";
export * from "./components/components-utils";
export { PropMeta } from "./prop-meta";
diff --git a/packages/react-sdk/src/pubsub/index.ts b/packages/react-sdk/src/pubsub/index.ts
deleted file mode 100644
index c6262006e3..0000000000
--- a/packages/react-sdk/src/pubsub/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./create";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b869162ccd..b38850c8a3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1261,9 +1261,6 @@ importers:
jsep:
specifier: ^1.3.8
version: 1.3.8
- nanoevents:
- specifier: ^8.0.0
- version: 8.0.0
nanoid:
specifier: ^4.0.2
version: 4.0.2