Upgrade volto; add volto-corsproxy

eea · Sep 16, 2020 · 0259da8 · 0259da8
1 parent 6216912
commit 0259da8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 55 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -1,52 +1,23 @@
 {
-    "compilerOptions": {
-        "baseUrl": "src",
-        "paths": {
-            "volto-bise": [
-                "addons/volto-bise/src"
-            ],
-            "volto-datablocks": [
-                "addons/volto-datablocks/src"
-            ],
-            "volto-blocks": [
-                "addons/volto-blocks/src"
-            ],
-            "volto-addons": [
-                "addons/volto-addons/src"
-            ],
-            "volto-ckeditor": [
-                "addons/volto-ckeditor/src"
-            ],
-            "volto-drafteditor": [
-                "addons/volto-drafteditor/src"
-            ],
-            "volto-plotlycharts": [
-                "addons/volto-plotlycharts/src"
-            ],
-            "volto-sidebar": [
-                "addons/volto-sidebar/src"
-            ],
-            "volto-base": [
-                "addons/volto-base/src"
-            ],
-            "volto-embed": [
-                "addons/volto-embed/src"
-            ],
-            "volto-slate": [
-                "addons/volto-slate/src"
-            ],
-            "@eeacms/volto-tabs-block": [
-                "addons/volto-tabsblock/src"
-            ],
-            "@eeacms/volto-grid-block": [
-                "addons/volto-grid-block/src"
-            ],
-            "@eeacms/volto-slate-footnote": [
-                "addons/volto-slate-footnote/src"
-            ],
-            "@eeacms/volto-object-widget": [
-                "addons/volto-object-widget/src"
-            ]
-        }
+  "compilerOptions": {
+    "baseUrl": "src",
+    "paths": {
+      "volto-bise": ["addons/volto-bise/src"],
+      "volto-datablocks": ["addons/volto-datablocks/src"],
+      "volto-blocks": ["addons/volto-blocks/src"],
+      "volto-addons": ["addons/volto-addons/src"],
+      "volto-ckeditor": ["addons/volto-ckeditor/src"],
+      "volto-drafteditor": ["addons/volto-drafteditor/src"],
+      "volto-plotlycharts": ["addons/volto-plotlycharts/src"],
+      "volto-sidebar": ["addons/volto-sidebar/src"],
+      "volto-base": ["addons/volto-base/src"],
+      "volto-embed": ["addons/volto-embed/src"],
+      "volto-slate": ["addons/volto-slate/src"],
+      "@eeacms/volto-tabs-block": ["addons/volto-tabsblock/src"],
+      "@eeacms/volto-grid-block": ["addons/volto-grid-block/src"],
+      "@eeacms/volto-slate-footnote": ["addons/volto-slate-footnote/src"],
+      "@eeacms/volto-object-widget": ["addons/volto-object-widget/src"],
+      "volto-corsproxy": ["addons/volto-corsproxy/src"]
     }
-}
+  }
+}
diff --git a/mrs.developer.json b/mrs.developer.json
@@ -35,6 +35,10 @@
     "url": "https://github.com/eea/volto-base.git",
     "path": "src"
   },
+  "volto-corsproxy": {
+    "url": "https://github.com/eea/volto-corsproxy.git",
+    "path": "src"
+  },
   "volto-embed": {
     "url": "https://github.com/eea/volto-embed.git",
     "path": "src",

diff --git a/package.json b/package.json
@@ -24,7 +24,8 @@
     "volto-datablocks",
     "volto-plotlycharts",
     "@eeacms/volto-slate-footnote",
-    "@eeacms/volto-grid-block"
+    "@eeacms/volto-grid-block",
+    "volto-corsproxy"
   ],
   "scripts": {
     "analyze": "webpack-bundle-analyzer -p $PORT -h 0.0.0.0 ./build/public/stats.json",
@@ -65,7 +66,7 @@
     "upgrade-volto": "yarn upgrade @plone/volto; cp node_modules/@plone/volto/yarn.lock yarn.lock; yarn install"
   },
   "dependencies": {
-    "@plone/volto": "github:eea/volto#7.14.2-beta.2",
+    "@plone/volto": "github:eea/volto#7.15.1-beta.3",
     "react-anchor-link-smooth-scroll": "^1.0.12",
     "react-component-queries": "^2.3.0",
     "react-image-gallery": "^0.9.1",

diff --git a/yarn.lock b/yarn.lock
@@ -2089,9 +2089,9 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@plone/volto@github:eea/volto#7.14.2-beta.2":
-  version "7.14.2"
-  resolved "https://codeload.github.com/eea/volto/tar.gz/5ffd05c210bdab4b80e578e8e9108a8c7cad7282"
+"@plone/volto@github:eea/volto#7.15.1-beta.3":
+  version "7.15.0"
+  resolved "https://codeload.github.com/eea/volto/tar.gz/50c1eb071bd2bcfce9ea9255e03c25eaa2f9fdd8"
   dependencies:
     "@babel/core" "7.9.6"
     "@babel/plugin-proposal-decorators" "7.8.3"