Merge pull request #4867 from withspectrum/alpha

v2.8.5

Author: brianlovin

analytics/package.json

@@ -22,7 +22,7 @@
     "rethinkhaberdashery": "^2.3.32",
     "sanitize-filename": "^1.6.1",
     "sha1": "^1.1.1",
-    "source-map-support": "^0.5.10",
+    "source-map-support": "^0.5.11",
     "toobusy-js": "^0.5.1"
   }
 }

analytics/yarn.lock

@@ -627,10 +627,10 @@ sha1@^1.1.1:
     charenc ">= 0.0.1"
     crypt ">= 0.0.1"
 
-source-map-support@^0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
+source-map-support@^0.5.11:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
+  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"

api/migrations/seed/default/messages.js

@@ -191,13 +191,7 @@ module.exports = [
     threadId: 'thread-6',
     threadType: 'story',
     content: {
-      body: JSON.stringify(
-        toJSON(
-          fromPlainText(
-            'http://localhost:3000/spectrum/general/yet-another-thread~thread-9'
-          )
-        )
-      ),
+      body: `{"blocks":[{"key":"7d3uf","text":"http://localhost:3000/spectrum/general/yet-another-thread~thread-9","type":"unstyled","depth":0,"inlineStyleRanges":[],"entityRanges":[],"data":{}},{"type":"atomic","data":{},"text":" ","depth":0,"entityRanges":[{"offset":0,"length":1,"key":0}],"inlineStyleRanges":[],"key":"7jad1"},{"type":"unstyled","data":{},"text":" ","depth":0,"entityRanges":[],"inlineStyleRanges":[],"key":"7a0pk"}],"entityMap":{"0":{"data":{"type":"internal","id":"thread-9","entity":"thread"},"mutability":"MUTABLE","type":"embed"}}}`,
     },
     messageType: 'draftjs',
     senderId: BRIAN_ID,

api/package.json

@@ -63,8 +63,8 @@
     "host-validation": "^1.2.0",
     "hot-shots": "^5.9.2",
     "hpp": "^0.2.2",
-    "hsts": "^2.1.0",
-    "imgix-core-js": "^1.2.0",
+    "hsts": "^2.2.0",
+    "imgix-core-js": "^1.2.1",
     "immutability-helper": "^2.9.1",
     "ioredis": "3.2.2",
     "isomorphic-fetch": "^2.2.1",
@@ -122,14 +122,14 @@
     "sanitize-filename": "^1.6.1",
     "serialize-javascript": "^1.6.1",
     "session-rethinkdb": "^2.0.0",
-    "slate": "^0.44.11",
+    "slate": "^0.44.12",
     "slate-markdown": "0.1.0",
     "slugg": "^1.1.0",
     "string-replace-to-array": "^1.0.3",
     "string-similarity": "^1.2.2",
     "striptags": "2.x",
     "styled-components": "3.1.x",
-    "subscriptions-transport-ws": "^0.9.15",
+    "subscriptions-transport-ws": "^0.9.16",
     "sw-precache-webpack-plugin": "^0.11.5",
     "then-queue": "^1.3.0",
     "toobusy-js": "^0.5.1",

api/yarn.lock

@@ -4957,11 +4957,18 @@ hpp@^0.2.2:
     lodash "^4.7.0"
     type-is "^1.6.12"
 
-[email protected], hsts@^2.1.0:
+[email protected]:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/hsts/-/hsts-2.1.0.tgz#cbd6c918a2385fee1dd5680bfb2b3a194c0121cc"
   integrity sha512-zXhh/DqgrTXJ7erTN6Fh5k/xjMhDGXCqdYN3wvxUvGUQvnxcFfUd8E+6vLg/nk3ss1TYMb+DhRl25fYABioTvA==
 
+hsts@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/hsts/-/hsts-2.2.0.tgz#09119d42f7a8587035d027dda4522366fe75d964"
+  integrity sha512-ToaTnQ2TbJkochoVcdXYm4HOCliNozlviNsg+X2XQLQvZNI/kCHR9rZxVYpJB3UPcHz80PgxRyWQ7PdU1r+VBQ==
+  dependencies:
+    depd "2.0.0"
+
 html-encoding-sniffer@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
@@ -5068,10 +5075,10 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-imgix-core-js@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/imgix-core-js/-/imgix-core-js-1.2.0.tgz#72163ebd312b25cdae077340d13cf94dc09327f2"
-  integrity sha512-Eq8IabyhZwwP1m+E26L4AJLCznqckFuL2nvOFmtYESmyFEv4IXa/UU58DHegnmMYoPqHunmG9ttL6NDdB0ddbg==
+imgix-core-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/imgix-core-js/-/imgix-core-js-1.2.1.tgz#069244b6cb53d70ffcba7560fd883b72cfeb3862"
+  integrity sha512-5lQTZGQislkRl0zdOQfZsKxlkn/d8YJJXhnmbLUvGX5XJX1iEVGWPlWxsj2iJDqMWzMmxarBtxMtnD4PJvM1ww==
   dependencies:
     crc "^3.5.0"
     js-base64 "^2.1.9"
@@ -8726,10 +8733,10 @@ [email protected]:
     react "^0.14.0 || ^15.0.0"
     styled-components "^2.0.0"
 
-slate@^0.44.11:
-  version "0.44.11"
-  resolved "https://registry.yarnpkg.com/slate/-/slate-0.44.11.tgz#0cdf454726a6d45a6dbf3174ea3f6261ad1a0428"
-  integrity sha512-ZtNCxHtGMuWXwUb6vmbrLR73MbHeEQ1LRJNIIyEpj1Kixk0Sd0T+zSKI+cBWCXlOOITqFEfBcJOWaSppiID+1A==
+slate@^0.44.12:
+  version "0.44.12"
+  resolved "https://registry.yarnpkg.com/slate/-/slate-0.44.12.tgz#06dbf98a7583d1a3b56636e762f494e4b0a13ffa"
+  integrity sha512-j8S2tt9nanhq6+N0yk/mSjswuHx2yhPfmCVtpSRx4xcUQNGKZZ3JN/0zJ/WNz7/qk0GHWPzdNfeuPpHk8BsXrg==
   dependencies:
     debug "^3.1.0"
     direction "^0.1.5"
@@ -9127,7 +9134,7 @@ stylis@^3.4.0:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
   integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
 
-subscriptions-transport-ws@^0.9.11, subscriptions-transport-ws@^0.9.15:
+subscriptions-transport-ws@^0.9.11:
   version "0.9.15"
   resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz#68a8b7ba0037d8c489fb2f5a102d1494db297d0d"
   integrity sha512-f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==
@@ -9138,6 +9145,17 @@ subscriptions-transport-ws@^0.9.11, subscriptions-transport-ws@^0.9.15:
     symbol-observable "^1.0.4"
     ws "^5.2.0"
 
+subscriptions-transport-ws@^0.9.16:
+  version "0.9.16"
+  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz#90a422f0771d9c32069294c08608af2d47f596ec"
+  integrity sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==
+  dependencies:
+    backo2 "^1.0.2"
+    eventemitter3 "^3.1.0"
+    iterall "^1.2.1"
+    symbol-observable "^1.0.4"
+    ws "^5.2.0"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"

athena/package.json

@@ -12,6 +12,7 @@
     "debug": "^4.1.1",
     "decode-uri-component": "^0.2.0",
     "draft-js": "^0.10.5",
+    "draft-js-import-markdown": "^1.3.3",
     "emoji-regex": "^6.5.1",
     "escape-html": "^1.0.3",
     "faker": "^4.1.0",
@@ -22,6 +23,8 @@
     "now-env": "^3.1.0",
     "performance-now": "^2.1.0",
     "raven": "^2.6.4",
+    "react": "^16.8.4",
+    "react-dom": "^16.8.4",
     "redis-tag-cache": "^1.2.1",
     "rethinkdb-inspector": "^0.3.3",
     "rethinkdbdash": "^2.3.31",