From a908c1c1f8ccaab37643bf8a043a6cec8f82f243 Mon Sep 17 00:00:00 2001
From: Sam Tolmay <sam@lowdefy.com>
Date: Mon, 29 Nov 2021 14:32:41 +0200
Subject: [PATCH] fix: Fix blocks-echarts yarn berry packageExtensions.

---
 .pnp.cjs                                        |  6 ++----
 .yarnrc.yml                                     |  3 +++
 .../build/src/scripts/generateDefaultTypes.js   |  2 +-
 packages/server/package.json                    |  3 ---
 yarn.lock                                       | 17 +++++++----------
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.pnp.cjs b/.pnp.cjs
index bb14d9a5f..c099f8385 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -5613,10 +5613,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@lowdefy/server", "workspace:packages/server"],
             ["@lowdefy/api", "workspace:packages/api"],
             ["@lowdefy/block-utils", "workspace:packages/utils/block-utils"],
-            ["@lowdefy/blocks-antd", "workspace:packages/plugins/blocks/blocks-antd"],
-            ["@lowdefy/blocks-basic", "workspace:packages/plugins/blocks/blocks-basic"],
             ["@lowdefy/build", "workspace:packages/build"],
-            ["@lowdefy/connection-axios-http", "workspace:packages/plugins/connections/connection-axios-http"],
             ["@lowdefy/engine", "workspace:packages/engine"],
             ["@lowdefy/helpers", "workspace:packages/utils/helpers"],
             ["@lowdefy/layout", "workspace:packages/layout"],
@@ -10517,7 +10514,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["echarts", "npm:5.2.1"],
             ["fast-deep-equal", "npm:3.1.3"],
             ["react", "npm:18.0.0-alpha-327d5c484-20211106"],
-            ["size-sensor", "npm:1.0.1"]
+            ["size-sensor", "npm:1.0.1"],
+            ["tslib", "npm:2.3.1"]
           ],
           "packagePeers": [
             "@types/echarts",
diff --git a/.yarnrc.yml b/.yarnrc.yml
index 3bb7b05d7..2b89c6074 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,4 +1,7 @@
 packageExtensions:
+  echarts-for-react@*:
+    dependencies:
+      tslib: "*"
   rc-animate@*:
     dependencies:
       react: "*"
diff --git a/packages/build/src/scripts/generateDefaultTypes.js b/packages/build/src/scripts/generateDefaultTypes.js
index fdbb77df6..e5d5f14ee 100644
--- a/packages/build/src/scripts/generateDefaultTypes.js
+++ b/packages/build/src/scripts/generateDefaultTypes.js
@@ -23,7 +23,7 @@ const defaultPackages = [
   '@lowdefy/blocks-antd',
   '@lowdefy/blocks-basic',
   // '@lowdefy/blocks-color-selectors',
-  // '@lowdefy/blocks-echarts',
+  '@lowdefy/blocks-echarts',
   '@lowdefy/blocks-loaders',
   // '@lowdefy/blocks-markdown',
   '@lowdefy/connection-axios-http',
diff --git a/packages/server/package.json b/packages/server/package.json
index e950ed0af..324a69d60 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -41,9 +41,6 @@
   "dependencies": {
     "@lowdefy/api": "4.0.0-alpha.5",
     "@lowdefy/block-utils": "4.0.0-alpha.5",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.5",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.5",
-    "@lowdefy/connection-axios-http": "4.0.0-alpha.5",
     "@lowdefy/engine": "4.0.0-alpha.5",
     "@lowdefy/helpers": "4.0.0-alpha.5",
     "@lowdefy/layout": "4.0.0-alpha.5",
diff --git a/yarn.lock b/yarn.lock
index b813d2e90..b28295979 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3868,10 +3868,7 @@ __metadata:
   dependencies:
     "@lowdefy/api": 4.0.0-alpha.5
     "@lowdefy/block-utils": 4.0.0-alpha.5
-    "@lowdefy/blocks-antd": 4.0.0-alpha.5
-    "@lowdefy/blocks-basic": 4.0.0-alpha.5
     "@lowdefy/build": 4.0.0-alpha.5
-    "@lowdefy/connection-axios-http": 4.0.0-alpha.5
     "@lowdefy/engine": 4.0.0-alpha.5
     "@lowdefy/helpers": 4.0.0-alpha.5
     "@lowdefy/layout": 4.0.0-alpha.5
@@ -17446,6 +17443,13 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
+"tslib@npm:*, tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "tslib@npm:2.3.1"
+  checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9
+  languageName: node
+  linkType: hard
+
 "tslib@npm:2.3.0":
   version: 2.3.0
   resolution: "tslib@npm:2.3.0"
@@ -17460,13 +17464,6 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "tslib@npm:2.3.1"
-  checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9
-  languageName: node
-  linkType: hard
-
 "tty-browserify@npm:0.0.1":
   version: 0.0.1
   resolution: "tty-browserify@npm:0.0.1"