Merge pull request #4185 from withspectrum/2.4.59

2.4.59

Author: brianlovin

desktop/package.json

@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "electron": "^3.0.7",
-    "electron-builder": "^20.29.0",
+    "electron-builder": "^20.31.2",
     "nodemon": "^1.18.5",
     "rimraf": "^2.6.2"
   },

desktop/yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"7zip-bin@~4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179"
+"7zip-bin@~4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.1.0.tgz#33eff662a5c39c0c2061170cc003c5120743fff0"
 
 "@types/node@^8.0.24":
   version "8.10.37"
@@ -27,7 +27,7 @@ ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.5.2:
+ajv@^6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
   dependencies:
@@ -63,55 +63,26 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-[email protected]:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.1.4.tgz#87e679615fb26c204c4d81fa67d962e796ea99d3"
-
-[email protected]:
-  version "20.29.0"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.29.0.tgz#e4669f60d16672c71232d88e417fb5d7f31ca43f"
-  dependencies:
-    "7zip-bin" "~4.0.2"
-    app-builder-bin "2.1.4"
-    async-exit-hook "^2.0.1"
-    bluebird-lst "^1.0.5"
-    builder-util "7.0.0"
-    builder-util-runtime "5.0.0"
-    chromium-pickle-js "^0.2.0"
-    debug "^4.1.0"
-    ejs "^2.6.1"
-    electron-osx-sign "0.4.11"
-    electron-publish "20.29.0"
-    fs-extra-p "^4.6.1"
-    hosted-git-info "^2.7.1"
-    is-ci "^1.2.1"
-    isbinaryfile "^3.0.3"
-    js-yaml "^3.12.0"
-    lazy-val "^1.0.3"
-    minimatch "^3.0.4"
-    normalize-package-data "^2.4.0"
-    plist "^3.0.1"
-    read-config-file "3.1.2"
-    sanitize-filename "^1.6.1"
-    semver "^5.6.0"
-    temp-file "^3.1.3"
+[email protected]:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.3.0.tgz#01be654554167267c26a990b8cfc39ab9646007c"
 
-app-builder-lib@~20.29.0:
-  version "20.29.1"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.29.1.tgz#0cd6794fd5611366b1317bfaf0314ad388f009eb"
+app-builder-lib@20.31.2, app-builder-lib@~20.31.2:
+  version "20.31.2"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.31.2.tgz#f810ac0f76e1223c1ec018fc31a05e66047cf06e"
   dependencies:
-    "7zip-bin" "~4.0.2"
-    app-builder-bin "2.1.4"
+    "7zip-bin" "~4.1.0"
+    app-builder-bin "2.3.0"
     async-exit-hook "^2.0.1"
-    bluebird-lst "^1.0.5"
-    builder-util "7.0.0"
-    builder-util-runtime "5.0.0"
+    bluebird-lst "^1.0.6"
+    builder-util "8.0.0"
+    builder-util-runtime "6.1.0"
     chromium-pickle-js "^0.2.0"
     debug "^4.1.0"
     ejs "^2.6.1"
     electron-osx-sign "0.4.11"
-    electron-publish "20.29.0"
-    fs-extra-p "^4.6.1"
+    electron-publish "20.31.2"
+    fs-extra-p "^7.0.0"
     hosted-git-info "^2.7.1"
     is-ci "^1.2.1"
     isbinaryfile "^3.0.3"
@@ -120,7 +91,7 @@ app-builder-lib@~20.29.0:
     minimatch "^3.0.4"
     normalize-package-data "^2.4.0"
     plist "^3.0.1"
-    read-config-file "3.1.2"
+    read-config-file "3.1.3"
     sanitize-filename "^1.6.1"
     semver "^5.6.0"
     temp-file "^3.1.3"
@@ -230,7 +201,7 @@ binary-extensions@^1.0.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
 
-bluebird-lst@^1.0.5:
+bluebird-lst@^1.0.5, bluebird-lst@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.6.tgz#89bc4de0a357373605c8781f293f7b06d454f869"
   dependencies:
@@ -293,7 +264,16 @@ buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
 
-[email protected], builder-util-runtime@^5.0.0, builder-util-runtime@~5.0.0:
+[email protected], builder-util-runtime@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-6.1.0.tgz#85f0c7bddbe4950ad708a1455b6ba79e16f2b731"
+  dependencies:
+    bluebird-lst "^1.0.6"
+    debug "^4.1.0"
+    fs-extra-p "^7.0.0"
+    sax "^1.2.4"
+
+builder-util-runtime@~5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-5.0.0.tgz#1f35cc28c87ca7de336efa098c6d3fd550db15a5"
   dependencies:
@@ -302,17 +282,17 @@ [email protected], builder-util-runtime@^5.0.0, builder-util-runtime@~5
     fs-extra-p "^4.6.1"
     sax "^1.2.4"
 
-builder-util@7.0.0, builder-util@~7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-7.0.0.tgz#ab65c7984939abc067f191cb06c4056a3104713b"
+builder-util@8.0.0, builder-util@~8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-8.0.0.tgz#ade1d5b0c62b9c260eb4fcb9be9918a28f2eb13b"
   dependencies:
-    "7zip-bin" "~4.0.2"
-    app-builder-bin "2.1.4"
-    bluebird-lst "^1.0.5"
-    builder-util-runtime "^5.0.0"
+    "7zip-bin" "~4.1.0"
+    app-builder-bin "2.3.0"
+    bluebird-lst "^1.0.6"
+    builder-util-runtime "^6.1.0"
     chalk "^2.4.1"
     debug "^4.1.0"
-    fs-extra-p "^4.6.1"
+    fs-extra-p "^7.0.0"
     is-ci "^1.2.1"
     js-yaml "^3.12.0"
     lazy-val "^1.0.3"
@@ -612,14 +592,14 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
-dmg-builder@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.0.0.tgz#d6a091b62c21a31523a6330fdcc97dc9727b9d8e"
+dmg-builder@6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.1.2.tgz#c6bdeab54cd051853eff7f91bfedbcde6c75a7b9"
   dependencies:
-    app-builder-lib "~20.29.0"
-    bluebird-lst "^1.0.5"
-    builder-util "~7.0.0"
-    fs-extra-p "^4.6.1"
+    app-builder-lib "~20.31.2"
+    bluebird-lst "^1.0.6"
+    builder-util "~8.0.0"
+    fs-extra-p "^7.0.0"
     iconv-lite "^0.4.24"
     js-yaml "^3.12.0"
     parse-color "^1.0.0"
@@ -635,7 +615,7 @@ dotenv-expand@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
 
-dotenv@^6.0.0:
+dotenv@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.1.0.tgz#9853b6ca98292acb7dec67a95018fa40bccff42c"
 
@@ -658,20 +638,20 @@ ejs@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
 
-electron-builder@^20.29.0:
-  version "20.29.0"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.29.0.tgz#f147eb9f24caed9139e7ad530b6ef6f13a82b069"
+electron-builder@^20.31.2:
+  version "20.31.2"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.31.2.tgz#8dcb773f6e315d9f46fc8674aba21f09007cce6c"
   dependencies:
-    app-builder-lib "20.29.0"
-    bluebird-lst "^1.0.5"
-    builder-util "7.0.0"
-    builder-util-runtime "5.0.0"
+    app-builder-lib "20.31.2"
+    bluebird-lst "^1.0.6"
+    builder-util "8.0.0"
+    builder-util-runtime "6.1.0"
     chalk "^2.4.1"
-    dmg-builder "6.0.0"
-    fs-extra-p "^4.6.1"
+    dmg-builder "6.1.2"
+    fs-extra-p "^7.0.0"
     is-ci "^1.2.1"
     lazy-val "^1.0.3"
-    read-config-file "3.1.2"
+    read-config-file "3.1.3"
     sanitize-filename "^1.6.1"
     update-notifier "^2.5.0"
     yargs "^12.0.2"
@@ -728,15 +708,15 @@ [email protected]:
     minimist "^1.2.0"
     plist "^3.0.1"
 
-electron-publish@20.29.0:
-  version "20.29.0"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.29.0.tgz#ab61e95bc4d466b4aff360c12bf1ee3d673967a4"
+electron-publish@20.31.2:
+  version "20.31.2"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.31.2.tgz#46d36168a26c85c1cbc21476cd71367bf6f542bc"
   dependencies:
-    bluebird-lst "^1.0.5"
-    builder-util "~7.0.0"
-    builder-util-runtime "^5.0.0"
+    bluebird-lst "^1.0.6"
+    builder-util "~8.0.0"
+    builder-util-runtime "^6.1.0"
     chalk "^2.4.1"
-    fs-extra-p "^4.6.1"
+    fs-extra-p "^7.0.0"
     lazy-val "^1.0.3"
     mime "^2.3.1"
 
@@ -974,6 +954,13 @@ fs-extra-p@^4.6.1:
     bluebird-lst "^1.0.5"
     fs-extra "^6.0.1"
 
+fs-extra-p@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.0.tgz#da9a72df71dc77fb938162025a5fc658713c98ab"
+  dependencies:
+    bluebird-lst "^1.0.6"
+    fs-extra "^7.0.0"
+
 fs-extra@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
@@ -990,6 +977,14 @@ fs-extra@^6.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -1421,9 +1416,9 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "http://registry.npmjs.org/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+json5@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
   dependencies:
     minimist "^1.2.0"
 
@@ -2053,18 +2048,18 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.1, rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-[email protected].2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.1.2.tgz#9b299cb7a2bcec1511a4c22e71620df0a2e3b896"
+[email protected].3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.1.3.tgz#8eae6e6688d5a4721c473cf47f2ea8727aa0501a"
   dependencies:
-    ajv "^6.5.2"
+    ajv "^6.5.4"
     ajv-keywords "^3.2.0"
-    bluebird-lst "^1.0.5"
-    dotenv "^6.0.0"
+    bluebird-lst "^1.0.6"
+    dotenv "^6.1.0"
     dotenv-expand "^4.2.0"
-    fs-extra-p "^4.6.1"
+    fs-extra-p "^7.0.0"
     js-yaml "^3.12.0"
-    json5 "^1.0.1"
+    json5 "^2.1.0"
     lazy-val "^1.0.3"
 
 read-pkg-up@^1.0.1:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.58",
+  "version": "2.4.59",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "@babel/preset-flow": "^7.0.0",

src/components/gallery/browser.js

@@ -146,7 +146,7 @@ class Browser extends React.Component<Props, State> {
     // prop. If it's the case that this happens, we just select the *last* image, assuming it's the one that the user just uploaded.
     let filteredIndex = typeof index === 'number' ? index : messages.length - 1;
 
-    const src = `${images[filteredIndex].content.body}?max-w=768`;
+    const src = `${images[filteredIndex].content.body}`;
 
     return (
       <GalleryWrapper>
@@ -158,7 +158,7 @@ class Browser extends React.Component<Props, State> {
             {images.map((image, i) => {
               return (
                 <MiniImg
-                  src={`${image.content.body}?max-w=64`}
+                  src={`${image.content.body}`}
                   key={i}
                   onClick={() => this.setCount(i)}
                   active={i === filteredIndex}

src/components/gallery/style.js

@@ -31,7 +31,8 @@ export const ActiveImage = styled.img`
   transform: translate(-50%, -50%);
   object-fit: cover;
   max-height: 90%;
-  max-width: 100%;
+  width: 100%;
+  max-width: 768px;
   margin: auto 0 5rem;
   box-shadow: ${Shadow.high};
   z-index: ${zIndex.fullscreen + 2};
@@ -54,6 +55,7 @@ export const MiniImg = styled.img`
   margin: 0.25rem;
   opacity: ${props => (props.active ? 1 : 0.5)};
   transition: opacity 0.2s ease-in-out;
+  max-width: 64px;
 
   &:hover {
     transition: opacity 0.2s ease-in-out;