Merge pull request #3249 from withspectrum/2.4.5

2.4.5

Author: brianlovin

config-overrides.js

@@ -85,13 +85,6 @@ module.exports = function override(config, env) {
   }
   config = injectBabelPlugin('react-loadable/babel', config);
   config = transpileShared(config);
-  config.plugins.push(
-    new webpack.optimize.CommonsChunkPlugin({
-      names: ['bootstrap'],
-      filename: 'static/js/[name].js',
-      minChunks: Infinity,
-    })
-  );
   // Filter the default serviceworker plugin, add offline plugin instead
   config.plugins = config.plugins.filter(
     plugin => !isServiceWorkerPlugin(plugin)
@@ -141,12 +134,11 @@ module.exports = function override(config, env) {
       })
     );
   }
-  config.plugins.push(
+  config.plugins.unshift(
     new webpack.optimize.CommonsChunkPlugin({
-      minChunks: 3,
-      name: 'main',
-      async: 'commons',
-      children: true,
+      names: ['bootstrap'],
+      filename: 'static/js/[name].js',
+      minChunks: Infinity,
     })
   );
   if (process.env.NODE_ENV === 'production') {

hyperion/index.js

@@ -131,6 +131,11 @@ app.use(
 );
 app.get('/static/js/:name', (req: express$Request, res, next) => {
   if (!req.params.name) return next();
+  const existingFile = jsFiles.find(file => file.startsWith(req.params.name));
+  if (existingFile)
+    return res.sendFile(
+      path.resolve(__dirname, '..', 'build', 'static', 'js', req.params.name)
+    );
   const match = req.params.name.match(/(\w+?)\.(\w+?\.)?js/i);
   if (!match) return next();
   const actualFilename = jsFiles.find(file => file.startsWith(match[1]));

hyperion/renderer/index.js

@@ -70,10 +70,19 @@ const renderer = (req: express$Request, res: express$Response) => {
     cache,
   });
   // Define the initial redux state
+  const { t } = req.query;
+
   const initialReduxState = {
     users: {
       currentUser: req.user ? req.user : null,
     },
+    dashboardFeed: {
+      activeThread: t ? t : '',
+      mountedWithActiveThread: t ? t : '',
+      search: {
+        isOpen: false,
+      },
+    },
   };
   // Create the Redux store
   const store = initStore(initialReduxState);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "babel-cli": "^6.24.1",
@@ -41,7 +41,7 @@
     "uuid": "^3.0.1",
     "wait-on": "^2.1.0",
     "webpack-bundle-analyzer": "^2.9.1",
-    "write-file-webpack-plugin": "^4.1.0"
+    "write-file-webpack-plugin": "^4.3.2"
   },
   "dependencies": {
     "abab": "^1.0.4",
@@ -138,24 +138,24 @@
     "query-string": "^5.0.0",
     "raven": "^2.0.2",
     "raven-js": "^3.18.1",
-    "react": "16.2.0",
+    "react": "^16.4.0",
     "react-apollo": "2.x",
     "react-app-rewire-styled-components": "^3.0.0",
-    "react-app-rewired": "^1.0.5",
-    "react-clipboard.js": "^1.1.3",
-    "react-dom": "16.2.0",
-    "react-flip-move": "^2.10.1",
-    "react-helmet-async": "^0.0.4",
+    "react-app-rewired": "^1.5.2",
+    "react-clipboard.js": "^2.0.0",
+    "react-dom": "^16.4.0",
+    "react-flip-move": "^3.0.2",
+    "react-helmet-async": "^0.1.0",
     "react-infinite-scroller-with-scroll-element": "2.0.2",
-    "react-loadable": "5.3.1",
+    "react-loadable": "^5.4.0",
     "react-modal": "3.x",
     "react-popper": "^1.0.0-beta.5",
     "react-redux": "^5.0.2",
     "react-router": "^4.0.0-beta.7",
-    "react-router-dom": "^4.0.0-beta.7",
+    "react-router-dom": "^4.3.1",
     "react-stripe-checkout": "^2.2.5",
     "react-stripe-elements": "^1.4.1",
-    "react-textarea-autosize": "^4.0.5",
+    "react-textarea-autosize": "^6.1.0",
     "react-transition-group": "^2.2.0",
     "react-trend": "^1.2.4",
     "recompose": "0.26.x",

src/components/buttons/index.js

@@ -12,7 +12,7 @@ import {
 import { Spinner } from '../globals';
 import Icon from '../icons';
 
-type ButtonProps = {
+type ButtonProps = {|
   loading?: boolean,
   disabled?: boolean,
   large?: boolean,
@@ -21,7 +21,7 @@ type ButtonProps = {
   icon?: string,
   children?: any,
   dataCy?: string,
-};
+|};
 
 type IconProps = {
   glyph: string,

src/components/infiniteScroll/index.js

@@ -28,7 +28,6 @@ export default class InfiniteScroll extends React.Component<Props> {
     useWindow: true,
     isReverse: false,
     scrollElement: null,
-    scrollComponent: null,
   };
 
   scrollListener: Function;

src/components/upsell/joinChannel.js

@@ -105,7 +105,6 @@ class JoinChannel extends React.Component<Props, State> {
           loading={isLoading}
           onClick={this.toggleSubscription}
           icon="plus"
-          label
           dataCy="thread-join-channel-upsell-button"
         >
           Join

src/index.js

@@ -61,7 +61,6 @@ if (t && (!existingUser || !existingUser.currentUser)) {
 
 const store = initStore(window.__SERVER_STATE__ || initialState);
 
-// eslint-disable-next-line
 const renderMethod = !!window.__SERVER_STATE__
   ? // $FlowIssue
     ReactDOM.hydrate
@@ -83,7 +82,11 @@ function render() {
   );
 }
 
-Loadable.preloadReady().then(render);
+Loadable.preloadReady()
+  .then(render)
+  .catch(err => {
+    console.error(err);
+  });
 
 OfflinePluginRuntime.install({
   // Apply new updates immediately