chore: Merge branch 'dev'

Author: mydearxym

package-docker.json

@@ -20,6 +20,7 @@
     "next-progressbar": "^1.0.0",
     "@next/bundle-analyzer": "^8.1.0",
     "accepts": "^1.3.4",
+    "acorn": "^6.1.1",
     "antd": "3.8.4",
     "apollo-cache-inmemory": "1.5.1",
     "apollo-client": "2.5.1",

package.json

@@ -47,6 +47,7 @@
     "@zeit/next-css": "^1.0.1",
     "@zeit/next-source-maps": "0.0.4-canary.1",
     "accepts": "^1.3.4",
+    "acorn": "^6.1.1",
     "antd": "3.8.4",
     "apollo-cache-inmemory": "1.5.1",
     "apollo-client": "2.5.1",

yarn.lock

@@ -1454,7 +1454,7 @@ acorn@^5.5.3, acorn@^5.7.3:
   version "5.7.3"
   resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
 
-acorn@^6.0.1, acorn@^6.0.5, acorn@^6.0.7:
+acorn@^6.0.1, acorn@^6.0.5, acorn@^6.0.7, acorn@^6.1.1:
   version "6.1.1"
   resolved "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"