Merge remote-tracking branch 'origin/development' into development

independent/webiny-cli/src/init/template/packages/api/package.json

@@ -15,18 +15,13 @@
     "@babel/register": "^7.0.0",
     "@babel/runtime": "^7.0.0",
     "babel-loader": "^8.0.0",
-    "bufferutil": "^4.0.1",
     "date-fns": "^1.29.0",
     "fs-extra": "^7.0.0",
     "mime-types": "^2.1.20",
-    "mongodb": "3.1.10",
-    "require_optional": "^1.0.1",
+    "mongodb": "^3.1.13",
     "sanitize-filename": "^1.6.1",
-    "serverless-apigw-binary": "^0.4.4",
-    "serverless-apigwy-binary": "^0.1.0",
     "sharp": "^0.21.0",
     "uniqid": "^5.0.3",
-    "utf-8-validate": "^5.0.2",
     "webiny-api": "^1",
     "webiny-api-cms": "^1",
     "webiny-api-security": "^1",
@@ -47,10 +42,14 @@
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
     "babel-eslint": "^9.0.0",
+    "bufferutil": "^4.0.1",
     "cross-env": "^5.1.5",
     "serverless": "^1.27.2",
-    "serverless-offline": "^3.20.3",
+    "serverless-apigw-binary": "^0.4.4",
+    "serverless-apigwy-binary": "^0.1.0",
+    "serverless-offline": "^4.7.0",
     "serverless-webpack": "^5.2.0",
+    "utf-8-validate": "^5.0.2",
     "webpack": "^4.27.1",
     "webpack-cli": "^3.1.0",
     "webpack-node-externals": "^1.7.2"

packages/demo-theme/src/components/DefaultMenu.js

@@ -2,6 +2,10 @@
 import React from "react";
 
 const DefaultMenu = ({ data }: Object) => {
+    if (!data) {
+        return null;
+    }
+
     return (
         <ul>
             {data.items.map(item => {

packages/webiny-app-cms/src/admin/plugins/pageDetails/header/publishRevision/PublishRevision.js

@@ -38,6 +38,10 @@ const PublishRevision = ({
     publishableRevisions,
     publishSuggestion
 }: Props) => {
+    if (!publishableRevisions.length) {
+        return null;
+    }
+
     return (
         <React.Fragment>
             <Tooltip content={"Publish"} placement={"top"}>