From 43b7d2c89ab7aff9c7d7b02179369290eeda6fb4 Mon Sep 17 00:00:00 2001
From: Piero Nicolli <piero.nicolli@redturtle.it>
Date: Fri, 15 Nov 2024 16:59:13 +0100
Subject: [PATCH] Cleanup deps and more tsconfig

---
 package.json                              |  4 ++--
 packages/volto-blocks/package.json        |  4 ----
 packages/volto-slate-extras/package.json  |  4 ----
 packages/volto-slate-extras/tsconfig.json |  8 ++++++++
 pnpm-lock.yaml                            | 12 ------------
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 7cf50f6..b9a408c 100644
--- a/package.json
+++ b/package.json
@@ -47,11 +47,11 @@
     "mrs-developer": "^2.2.0",
     "typescript": "^5.5.4"
   },
-  "packageManager": "pnpm@9.1.1",
   "pnpm": {
     "overrides": {
       "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
       "react-refresh": "^0.14.2"
     }
-  }
+  },
+  "packageManager": "pnpm@9.1.1"
 }
diff --git a/packages/volto-blocks/package.json b/packages/volto-blocks/package.json
index b173ba7..ef44399 100644
--- a/packages/volto-blocks/package.json
+++ b/packages/volto-blocks/package.json
@@ -34,16 +34,12 @@
     "release-alpha": "release-it --preRelease=alpha"
   },
   "peerDependencies": {
-    "@plone/volto": "17 || 18",
-    "@plone/volto-slate": "17 || 18",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@plone/scripts": "^3.6.1",
     "@plone/types": "workspace:^",
-    "@plone/volto": "workspace:^",
-    "@plone/volto-slate": "workspace:^",
     "@types/classnames": "^2.2.11",
     "@types/loadable__component": "^5.13.9",
     "@types/lodash": "^4.14.201",
diff --git a/packages/volto-slate-extras/package.json b/packages/volto-slate-extras/package.json
index e688158..29c2fb1 100644
--- a/packages/volto-slate-extras/package.json
+++ b/packages/volto-slate-extras/package.json
@@ -33,15 +33,11 @@
     "release-alpha": "release-it --preRelease=alpha"
   },
   "peerDependencies": {
-    "@plone/volto": "17 || 18",
-    "@plone/volto-slate": "17 || 18",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@plone/scripts": "^3.6.1",
-    "@plone/volto": "workspace:^",
-    "@plone/volto-slate": "workspace:^",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "release-it": "^17.1.1"
diff --git a/packages/volto-slate-extras/tsconfig.json b/packages/volto-slate-extras/tsconfig.json
index 0b42bec..51a5e6a 100644
--- a/packages/volto-slate-extras/tsconfig.json
+++ b/packages/volto-slate-extras/tsconfig.json
@@ -13,6 +13,14 @@
     "lib": ["es2022", "dom", "dom.iterable"],
     "jsx": "react-jsx",
     "paths": {
+      "@plone/volto/*": [
+        "../../core/packages/volto/src/*",
+        "../../../../core/packages/volto/src/*"
+      ],
+      "@plone/volto-slate/*": [
+        "../../core/packages/volto-slate/src/*",
+        "../../../../core/packages/volto-slate/src/*"
+      ],
       "@redturtle/volto-slate-extras/*": ["./src/*"]
     }
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 28a91b7..3585d87 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1436,12 +1436,6 @@ importers:
       '@plone/types':
         specifier: workspace:^
         version: link:../../core/packages/types
-      '@plone/volto':
-        specifier: workspace:^
-        version: link:../../core/packages/volto
-      '@plone/volto-slate':
-        specifier: workspace:^
-        version: link:../../core/packages/volto-slate
       '@types/classnames':
         specifier: ^2.2.11
         version: 2.2.11
@@ -1473,12 +1467,6 @@ importers:
       '@plone/scripts':
         specifier: ^3.6.1
         version: 3.6.2
-      '@plone/volto':
-        specifier: workspace:^
-        version: link:../../core/packages/volto
-      '@plone/volto-slate':
-        specifier: workspace:^
-        version: link:../../core/packages/volto-slate
       '@types/react':
         specifier: ^18.3.3
         version: 18.3.3