Merge pull request #4475 from withspectrum/2.5.1

2.5.1
withspectrum · Dec 14, 2018 · 34adf7d · 34adf7d
2 parents 056de72 + 40cf23d
commit 34adf7d
Show file tree

Hide file tree

Showing 144 changed files with 1,355 additions and 1,314 deletions.
diff --git a/analytics/package.json b/analytics/package.json
@@ -10,12 +10,13 @@
     "bull": "3.3.10",
     "debug": "^4.1.0",
     "faker": "^4.1.0",
+    "ioredis": "3.2.2",
     "lodash.intersection": "^4.4.0",
     "node-env-file": "^0.1.8",
     "now-env": "^3.1.0",
     "raven": "^2.6.4",
     "redis-tag-cache": "^1.2.1",
-    "rethinkdbdash": "^2.3.29",
+    "rethinkdbdash": "^2.3.31",
     "rethinkhaberdashery": "^2.3.32",
     "sanitize-filename": "^1.6.1",
     "sha1": "^1.1.1",

diff --git a/analytics/queues/identify-analytics.js b/analytics/queues/identify-analytics.js
@@ -22,8 +22,8 @@ export default async (job: Job<IdentifyAnalyticsData>) => {
   try {
     await processJob(job);
   } catch (err) {
-    debug('❌ Error in job:\n');
-    debug(err);
+    console.error('❌ Error in job:\n');
+    console.error(err);
     Raven.captureException(err);
   }
 };
diff --git a/analytics/queues/track-analytics.js b/analytics/queues/track-analytics.js
@@ -25,8 +25,8 @@ export default async (job: Job<TrackAnalyticsData>) => {
   try {
     await processJob(job);
   } catch (err) {
-    debug('❌ Error in job:\n');
-    debug(err);
+    console.error('❌ Error in job:\n');
+    console.error(err);
     Raven.captureException(err);
   }
 };
diff --git a/analytics/utils/identify.js b/analytics/utils/identify.js
@@ -14,7 +14,8 @@ export const identify = (userId: string, userProperties: Object) => {
   };
 
   return Promise.all([amplitudePromise()]).catch(err => {
-    console.error('Error Identifying event: ', err.message);
+    console.error('❌ Error in job:\n');
+    console.error(err);
     Raven.captureException(err);
   });
 };
diff --git a/analytics/utils/track.js b/analytics/utils/track.js
@@ -32,7 +32,8 @@ export const track = (
   };
 
   return Promise.all([amplitudePromise()]).catch(err => {
-    console.error('Error tracking event: ', err.message);
+    console.error('❌ Error in job:\n');
+    console.error(err);
     Raven.captureException(err);
   });
 };
diff --git a/analytics/yarn.lock b/analytics/yarn.lock
@@ -104,9 +104,9 @@ core-util-is@~1.0.0:
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cron-parser@^2.4.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.7.1.tgz#d08c00b1e220db564fd1cecb5019c8dd450f84d1"
-  integrity sha512-gupE4KsGEVtp5X4YbUlQx6NiFt3e+VOhREPI4ZXS9FT5JcOjfw2ey1EUv3J6XWrxHR1aKYrk4uJDmdRjG39bgA==
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.7.3.tgz#12603f89f5375af353a9357be2543d3172eac651"
+  integrity sha512-t9Kc7HWBWPndBzvbdQ1YG9rpPRB37Tb/tTviziUOh1qs3TARGh3b1p+tnkOHNe1K5iI3oheBPgLqwotMM7+lpg==
   dependencies:
     is-nan "^1.2.1"
     moment-timezone "^0.5.23"
@@ -208,7 +208,7 @@ inherits@~2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ioredis@^3.1.4:
+ioredis@3.2.2, ioredis@^3.1.4:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-3.2.2.tgz#b7d5ff3afd77bb9718bb2821329b894b9a44c00b"
   integrity sha512-g+ShTQYLsCcOUkNOK6CCEZbj3aRDVPw3WOwXk+LxlUKvuS9ujEqP2MppBHyRVYrNNFW/vcPaTBUZ2ctGNSiOCA==
@@ -506,7 +506,7 @@ redis-tag-cache@^1.2.1:
   dependencies:
     ioredis "^4.0.0"
 
-rethinkdbdash@^2.3.29:
+rethinkdbdash@^2.3.31:
   version "2.3.31"
   resolved "https://registry.yarnpkg.com/rethinkdbdash/-/rethinkdbdash-2.3.31.tgz#fe2f73d1fa6e6f5d96d8e881292013cf6dca914d"
   integrity sha512-6nXrKFjdg2Ug0YpdmPWSvyD/2EisHnFNt4FWZ74dcXGK48ievSv+cNFTmVv+KjLi6I9CCf6w4CKZ6yCYTfMfdQ==

diff --git a/api/index.js b/api/index.js
@@ -9,7 +9,6 @@ debug('logging with debug enabled!');
 import { createServer } from 'http';
 import express from 'express';
 import Raven from 'shared/raven';
-import { ApolloEngine } from 'apollo-engine';
 import toobusy from 'shared/middlewares/toobusy';
 import addSecurityMiddleware from 'shared/middlewares/security';
 import csrf from 'shared/middlewares/csrf';

diff --git a/api/migrations/seed/index.js b/api/migrations/seed/index.js
@@ -235,5 +235,6 @@ Promise.all([
     debug(
       'Encountered error while inserting data (see below), please run yarn run db:drop and yarn run db:migrate to restore tables to original condition, then run this script again.'
     );
-    debug(err);
+    console.error('❌ Error in job:\n');
+    console.error(err);
   });
diff --git a/api/package.json b/api/package.json
@@ -4,21 +4,20 @@
   },
   "dependencies": {
     "algoliasearch": "^3.31.0",
-    "apollo-engine": "^1.1.2",
-    "apollo-local-query": "^0.3.0",
+    "apollo-local-query": "^0.3.1",
     "apollo-server-express": "^2.2.6",
-    "apollo-upload-client": "^8.1.0",
+    "apollo-upload-client": "^9.1.0",
     "aws-sdk": "2.200.0",
     "axios": "^0.16.2",
     "b2a": "^1.0.10",
     "babel-plugin-replace-dynamic-import-runtime": "^1.0.2",
-    "babel-plugin-styled-components": "^1.9.2",
+    "babel-plugin-styled-components": "^1.9.4",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-preset-env": "^1.7.0",
     "backpack-core": "^0.8.3",
     "body-parser": "^1.18.3",
-    "bull": "3.3.10",
+    "bull": "^3.5.2",
     "casual": "^1.5.12",
     "compression": "^1.7.3",
     "cookie-parser": "^1.4.3",
@@ -48,11 +47,11 @@
     "find-with-regex": "^1.1.3",
     "flow-typed": "^2.5.1",
     "graphql": "0.13.x",
-    "graphql-cost-analysis": "^0.1.2",
+    "graphql-cost-analysis": "^1.0.2",
     "graphql-date": "^1.0.3",
     "graphql-depth-limit": "^1.1.0",
-    "graphql-log": "0.1.2",
-    "graphql-tools": "3.0.0",
+    "graphql-log": "^0.1.3",
+    "graphql-tools": "^4.0.3",
     "helmet": "^3.15.0",
     "highlight.js": "^9.13.1",
     "history": "^4.6.1",
@@ -61,8 +60,8 @@
     "hpp": "^0.2.2",
     "hsts": "^2.1.0",
     "imgix-core-js": "^1.2.0",
-    "immutability-helper": "^2.8.1",
-    "ioredis": "^4.2.0",
+    "immutability-helper": "^2.9.0",
+    "ioredis": "3.2.2",
     "isomorphic-fetch": "^2.2.1",
     "iterall": "^1.2.2",
     "jest": "^21.2.1",
@@ -96,7 +95,7 @@
     "react-helmet": "5.x",
     "react-infinite-scroller-with-scroll-element": "^1.0.4",
     "react-loadable": "5.2.2",
-    "react-modal": "^1.6.5",
+    "react-modal": "^3.7.1",
     "react-redux": "^5.1.1",
     "react-remarkable": "^1.1.1",
     "react-router": "^4.0.0-beta.7",
@@ -116,14 +115,14 @@
     "sanitize-filename": "^1.6.1",
     "serialize-javascript": "^1.5.0",
     "session-rethinkdb": "^2.0.0",
-    "slate": "^0.44.8",
+    "slate": "^0.44.9",
     "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.14",
+    "subscriptions-transport-ws": "^0.9.15",
     "sw-precache-webpack-plugin": "^0.11.5",
     "then-queue": "^1.3.0",
     "toobusy-js": "^0.5.1",
@@ -134,4 +133,4 @@
   "scripts": {
     "start": "NODE_ENV=production node main.js"
   }
-}
+}
diff --git a/api/queries/thread/messageConnection.js b/api/queries/thread/messageConnection.js
@@ -47,7 +47,8 @@ export default (
     cursor = decode(cursor);
     if (cursor) cursor = parseInt(cursor, 10);
   } catch (err) {
-    debug(err);
+    console.error('❌ Error in job:\n');
+    console.error(err);
     return new UserError('Invalid cursor passed to thread.messageConnection.');
   }
   if (cursor) debug(`cursor: ${cursor}`);