Merge pull request #4974 from withspectrum/3.1.0

3.1.0

api/migrations/20190327134509-delete-bot-messages.js

@@ -0,0 +1,11 @@
+exports.up = function(r, conn) {
+  return r
+    .table('messages')
+    .filter({ bot: true })
+    .delete()
+    .run(conn);
+};
+
+exports.down = function(r, conn) {
+  return Promise.resolve();
+};

api/mutations/thread/publishThread.js

@@ -348,26 +348,6 @@ export default requireAuth(
       ),
     ]);
 
-    // Post a new message with a link to the new thread to the watercooler thread if one exists
-    if (community.watercoolerId && !channel.isPrivate) {
-      await addMessage(
-        {
-          content: {
-            body: `${
-              user.name
-            } just posted a new thread 📝 https://spectrum.chat/${
-              community.slug
-            }/${channel.slug}/${slugg(dbThread.content.title)}~${dbThread.id}`,
-          },
-          messageType: 'text',
-          threadId: community.watercoolerId,
-          threadType: 'story',
-          bot: true,
-        },
-        user.id
-      );
-    }
-
     if (!thread.filesToUpload || thread.filesToUpload.length === 0) {
       return dbThread;
     }

api/package.json

@@ -109,7 +109,7 @@
     "react-router": "^4.0.0-beta.7",
     "react-router-dom": "^4.0.0-beta.7",
     "react-textarea-autosize": "^4.0.5",
-    "react-transition-group": "^2.7.0",
+    "react-transition-group": "^2.7.1",
     "react-trend": "^1.2.4",
     "recompose": "^0.23.1",
     "redis-tag-cache": "^1.2.1",

api/yarn.lock

@@ -8072,10 +8072,10 @@ react-textarea-autosize@^4.0.5:
   dependencies:
     prop-types "^15.5.8"
 
-react-transition-group@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.7.0.tgz#60ca3bb2bf83fe71c50816a936e985ce7b8134dc"
-  integrity sha512-CzF22K0x6arjQO4AxkasMaiYcFG/QH0MhPNs45FmNsfWsQmsO9jv52sIZJAalnlryD5RgrrbLtV5CMJSokrrMA==
+react-transition-group@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.7.1.tgz#1fe6d54e811e8f9dfd329aa836b39d9cd16587cb"
+  integrity sha512-b0VJTzNRnXxRpCuxng6QJbAzmmrhBn1BZJfPPnHbH2PIo8msdkajqwtfdyGm/OypPXZNfAHKEqeN15wjMXrRJQ==
   dependencies:
     dom-helpers "^3.3.1"
     loose-envify "^1.4.0"

config-overrides.js

@@ -18,6 +18,7 @@ const { ReactLoadablePlugin } = require('react-loadable/webpack');
 const OfflinePlugin = require('offline-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const BundleBuddyWebpackPlugin = require('bundle-buddy-webpack-plugin');
+const CircularDependencyPlugin = require('circular-dependency-plugin');
 
 // Recursively walk a folder and get all file paths
 function walkFolder(currentDirPath, callback) {
@@ -164,5 +165,12 @@ module.exports = function override(config, env) {
       })
     );
   }
+
+  config.plugins.push(
+    new CircularDependencyPlugin({
+      cwd: process.cwd(),
+      failOnError: true,
+    })
+  );
   return rewireStyledComponents(config, env, { ssr: true });
 };