Make sub-addons peer dependencies (#186)

pretagov · Dec 13, 2023 · 3614d2b · 3614d2b
1 parent 52dfc03
commit 3614d2b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 31 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "src/addons/volto-form-block"]
-	path = src/addons/volto-form-block
-	url = [email protected]:pretagov/volto-form-block.git
-[submodule "src/addons/volto-slots-editor"]
-	path = src/addons/volto-slots-editor
-	url = [email protected]:pretagov/volto-slots-editor.git

diff --git a/jsconfig.json b/jsconfig.json
@@ -3,12 +3,6 @@
         "paths": {
             "nsw-design-system-plone6": [
                 "addons/nsw-design-system-plone6/src"
-            ],
-            "@plone-collective/volto-slots-editor": [
-                "addons/volto-slots-editor/src"
-            ],
-            "volto-form-block": [
-                "addons/volto-form-block/src"
             ]
         },
         "baseUrl": "src"

diff --git a/mrs.developer.json b/mrs.developer.json
@@ -1,15 +1 @@
-{
-  "volto-form-block": {
-    "url": "https://github.com/pretagov/volto-form-block.git",
-    "package": "volto-form-block",
-    "path": "src",
-    "branch": "deploy",
-    "develop": true
-  },
-  "volto-slots-editor": {
-    "url": "https://github.com/pretagov/volto-slots-editor.git",
-    "package": "@plone-collective/volto-slots-editor",
-    "path": "src",
-    "develop": true
-  }
-}
+{}
diff --git a/package.json b/package.json
@@ -35,16 +35,17 @@
     "material-icons": "1.13.6",
     "nsw-design-system": "3.11.2",
     "react-color": "2.19.3",
-    "volto-form-block": "file:./src/addons/volto-form-block",
     "volto-google-analytics": "2.0.0",
     "volto-siteinfo": "1.1.0",
     "volto-subblocks": "2.0.0",
     "volto-subfooter": "2.0.0"
   },
   "peerDependencies": {
+    "@plone-collective/volto-slots-editor": "*",
     "@plone/volto": ">= 16.20.1 < 17.0.0",
     "react": ">= 16.8.0",
-    "react-dom": ">= 16.8.0"
+    "react-dom": ">= 16.8.0",
+    "volto-form-block": ">=3.0.0"
   },
   "devDependencies": {
     "@plone/scripts": ">= 2.2.2",

diff --git a/src/addons/volto-form-block b/src/addons/volto-form-block
diff --git a/src/addons/volto-slots-editor b/src/addons/volto-slots-editor