Merge pull request #3758 from withspectrum/alpha

Prod cut

Author: mxstbr

analytics/package.json

@@ -12,7 +12,7 @@
     "raven": "^2.6.3",
     "rethinkdbdash": "^2.3.29",
     "sha1": "^1.1.1",
-    "source-map-support": "^0.5.6",
+    "source-map-support": "^0.5.8",
     "toobusy-js": "^0.5.1"
   }
 }

analytics/yarn.lock

@@ -353,9 +353,9 @@ sha1@^1.1.1:
     charenc ">= 0.0.1"
     crypt ">= 0.0.1"
 
-source-map-support@^0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
+source-map-support@^0.5.8:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.8.tgz#04f5581713a8a65612d0175fbf3a01f80a162613"
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"

hyperion/index.js

@@ -145,7 +145,8 @@ app.get('/static/js/:name', (req: express$Request, res, next) => {
     return res.sendFile(
       path.resolve(__dirname, '..', 'build', 'static', 'js', req.params.name)
     );
-  const match = req.params.name.match(/(\w+?)\.(\w+?\.)?js/i);
+  // Match the first part of the file name, i.e. from "UserSettings.asdf123.chunk.js" match "UserSettings"
+  const match = req.params.name.match(/(\w+?)\..+js/i);
   if (!match) return next();
   const actualFilename = jsFiles.find(file => file.startsWith(match[1]));
   if (!actualFilename) return next();

mobile/package.json

@@ -3,8 +3,8 @@
   "private": true,
   "dependencies": {
     "@expo/react-native-action-sheet": "^1.0.2",
-    "apollo-cache-inmemory": "^1.2.6",
-    "apollo-client": "^2.3.7",
+    "apollo-cache-inmemory": "^1.2.7",
+    "apollo-client": "^2.3.8",
     "apollo-link": "^1.2.2",
     "apollo-link-error": "^1.1.0",
     "apollo-link-http": "^1.5.4",

mobile/yarn.lock

@@ -875,29 +875,29 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
-apollo-cache-inmemory@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.6.tgz#85e2a52d63ea275117596c93a46a4e3b42b89b13"
+apollo-cache-inmemory@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.7.tgz#80517c4b5e910022ab8d318f47d9364f99db8541"
   dependencies:
-    apollo-cache "^1.1.13"
-    apollo-utilities "^1.0.17"
-    graphql-anywhere "^4.1.15"
+    apollo-cache "^1.1.14"
+    apollo-utilities "^1.0.18"
+    graphql-anywhere "^4.1.16"
 
-apollo-cache@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.13.tgz#75c28091825992b2eec9fb63c9a367db3b4714a8"
+apollo-cache@^1.1.14:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.14.tgz#c7d54cdbc7f544161f78fa5e4bae56650e22f7ad"
   dependencies:
-    apollo-utilities "^1.0.17"
+    apollo-utilities "^1.0.18"
 
-apollo-client@^2.3.7:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.3.7.tgz#891cd2392851f861a62fe334fa76fc629ed19fd3"
+apollo-client@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.3.8.tgz#0384a7210eb601ab88b1c13750da076fc9255b95"
   dependencies:
     "@types/zen-observable" "^0.8.0"
-    apollo-cache "^1.1.13"
+    apollo-cache "^1.1.14"
     apollo-link "^1.0.0"
     apollo-link-dedup "^1.0.0"
-    apollo-utilities "^1.0.17"
+    apollo-utilities "^1.0.18"
     symbol-observable "^1.0.2"
     zen-observable "^0.8.0"
   optionalDependencies:
@@ -947,9 +947,9 @@ apollo-utilities@^1.0.0:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.11.tgz#cd36bfa6e5c04eea2caf0c204a0f38a0ad550802"
 
-apollo-utilities@^1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.17.tgz#04cd22db5c5dba8dbd349e28b0d9f9f525ab8e8a"
+apollo-utilities@^1.0.18:
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.18.tgz#e4ee91534283fde2b744a26caaea120fe6a94f67"
   dependencies:
     fast-json-stable-stringify "^2.0.0"
 
@@ -3555,11 +3555,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6,
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-graphql-anywhere@^4.1.15:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.15.tgz#09ac33970e85930aa8682fc3276b76df2637e042"
+graphql-anywhere@^4.1.16:
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.16.tgz#82bb59643e30183cfb7b485ed4262a7b39d8a6c1"
   dependencies:
-    apollo-utilities "^1.0.17"
+    apollo-utilities "^1.0.18"
 
 graphql-tag@^2.9.2:
   version "2.9.2"
@@ -6118,8 +6118,8 @@ rc@^1.1.7:
     strip-json-comments "~2.0.1"
 
 [email protected]:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.1.9.tgz#1fd30ea2116375197bd53daa725e6fb8ab43ab80"
+  version "2.1.11"
+  resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.1.11.tgz#ef4805f07af1d732ec94caebf7ba0728e2d162ca"
   dependencies:
     fbjs "^0.8.16"
     hoist-non-react-statics "^2.5.0"

now.json

@@ -1,5 +1,14 @@
 {
-  "regions": ["sfo1"],
+  "scale": {
+    "bru1": {
+      "min": 0,
+      "max": 0
+    },
+    "sfo1": {
+      "min": 1,
+      "max": "auto"
+    }
+  },
   "env": {
     "S3_TOKEN": "@s3-token",
     "S3_SECRET": "@s3-secret",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.22",
+  "version": "2.4.24",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "babel-cli": "^6.24.1",

pluto/package.json

@@ -16,7 +16,7 @@
     "rethinkdb-changefeed-reconnect": "^0.3.2",
     "rethinkdbdash": "^2.3.31",
     "shortid": "^2.2.12",
-    "source-map-support": "^0.5.6",
+    "source-map-support": "^0.5.8",
     "stripe": "^5.10.0",
     "toobusy-js": "^0.5.1"
   },

pluto/yarn.lock

@@ -657,9 +657,9 @@ shortid@^2.2.12:
   dependencies:
     nanoid "^1.0.7"
 
-source-map-support@^0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
+source-map-support@^0.5.8:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.8.tgz#04f5581713a8a65612d0175fbf3a01f80a162613"
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"

src/components/message/view.js

@@ -30,10 +30,6 @@ export const Body = (props: BodyProps) => {
   const emojiOnly =
     message.messageType === 'draftjs' &&
     draftOnlyContainsEmoji(JSON.parse(message.content.body));
-  if (emojiOnly)
-    return (
-      <Emoji>{toPlainText(toState(JSON.parse(message.content.body)))}</Emoji>
-    );
   const WrapperComponent = bubble ? Text : QuotedParagraph;
   switch (message.messageType) {
     case 'text':
@@ -55,7 +51,13 @@ export const Body = (props: BodyProps) => {
               // $FlowIssue
               <QuotedMessage message={message.parent} />
             )}
-          {redraft(JSON.parse(message.content.body), messageRenderer)}
+          {emojiOnly ? (
+            <Emoji>
+              {toPlainText(toState(JSON.parse(message.content.body)))}
+            </Emoji>
+          ) : (
+            redraft(JSON.parse(message.content.body), messageRenderer)
+          )}
         </WrapperComponent>
       );
     }