Merge remote-tracking branch 'upstream/develop' into HEAD

Author: andrzejewsky

.travis.yml

@@ -18,15 +18,11 @@ jobs:
       - yarn build
       node_js: '10'
 
-    - <<: *build
-      node_js: '8'
-
     - &unit
       stage: Test
       script: yarn test:unit
       name: "NodeJS 10 unit tests"
       node_js: "10"
+    - <<: *build
+      node_js: '12'
 
-    - <<: *unit
-      name: "NodeJS 8 unit tests"
-      node_js: "8"

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed some smaller issues with graphql so that it is now working again with the fronted - #350
+- Replaced the old `crop` function call which has been removed from Sharp image processor - @grimasod (#381)
 
 
 ## [1.11.0-rc.1] - 2019.10.03

babel.config.js

@@ -3,7 +3,7 @@ module.exports = {
     [
       '@babel/preset-env', {
         targets: {
-          node: "8"
+          node: "10"
         }
       }
     ]

package.json

@@ -91,7 +91,7 @@
     "request": "^2.85.0",
     "request-promise-native": "^1.0.5",
     "resource-router-middleware": "^0.6.0",
-    "sharp": "^0.22.1",
+    "sharp": "^0.23.4",
     "soap": "^0.25.0",
     "syswide-cas": "latest",
     "winston": "^2.4.2"

src/api/user.js

@@ -119,8 +119,8 @@ export default ({config, db}) => {
    */
   userApi.post('/reset-password', (req, res) => {
     const userProxy = _getProxy(req)
-    const storeCode = req.query.storeCode
-    const websiteId = config.storeViews[storeCode].websiteId
+    const { storeCode } = req.query
+    const websiteId = storeCode ? config.storeViews[storeCode].websiteId : undefined
 
     if (!req.body.email) {
       return apiStatus(res, 'Invalid e-mail provided!', 500)

src/lib/image.js

@@ -45,7 +45,7 @@ export async function fit (buffer, width, height) {
     const transformer = sharp(buffer);
 
     if (width || height) {
-      transformer.resize(width, height).crop();
+      transformer.resize(width, height, { fit: sharp.fit.cover });
     }
 
     return transformer.toBuffer();