merge master

Author: patzick

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.10.0-rc.1] - 2019.06.17
+## [1.10.0] - 2019.08.10
 
 ### Added
 - Typescript support - @ResuBaka (#210, #242)
@@ -27,8 +27,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Include Magento Currency Code in mage2vs import and productsdelta if available @rain2o (#281)
 - Better handling of HTTP error codes provided by API client - pkarw (#3151)
 
+## [1.9.6] - 2019.07.11
+- Dependencies update to avoid lodash security issues.
+
 ## [1.9.5] - 2019.06.17
-- Dependencies security update against js-yaml flaws.
+- Dependencies update to avoid js-yaml security issues.
 
 ## [1.9.4] - 2019.06.03
 - Extension schemas in `src/models` are not required anymore - @EmilsM, @lukeromanowicz (#259, #263)

README.md

@@ -103,13 +103,8 @@ After setting the `config.magento2.api` section using Yours Magento2 oauth crede
 
 ```json
   "magento2": {
-    "url": "http://magento2.demo-1.xyz.com",
     "imgUrl": "http://localhost:8080/media/catalog/product",
     "assetPath": "/../var/magento2-sample-data/pub/media",
-    "magentoUserName": "",
-    "magentoUserPassword": "",
-    "httpUserName": "",
-    "httpUserPassword": "",
     "api": {
       "url": "http://demo-magento2.vuestorefront.io/rest",
       "consumerKey": "byv3730rhoulpopcq64don8ukb8lf2gq",

config/default.json

@@ -164,13 +164,8 @@
     }
   },
   "magento2": {
-    "url": "http://demo-magento2.vuestorefront.io/",
     "imgUrl": "http://demo-magento2.vuestorefront.io/media/catalog/product",
     "assetPath": "/../var/magento2-sample-data/pub/media",
-    "magentoUserName": "",
-    "magentoUserPassword": "",
-    "httpUserName": "",
-    "httpUserPassword": "",
     "api": {
       "url": "http://demo-magento2.vuestorefront.io/rest",
       "consumerKey": "byv3730rhoulpopcq64don8ukb8lf2gq",
@@ -180,7 +175,6 @@
     }
   },
   "magento1": {
-    "url": "http://magento-demo.local",
     "imgUrl": "http://magento-demo.local/media/catalog/product",
     "assetPath": "",
     "magentoUserName": "",
@@ -196,7 +190,6 @@
     }
   },
   "imageable": {
-    "namespace": "",
     "maxListeners": 512,
     "imageSizeLimit": 1024,
     "whitelist": {
@@ -215,8 +208,7 @@
       "queue": 2,
       "process": 4
     },
-    "simd": true,
-    "keepDownloads": true
+    "simd": true
   },
   "entities": {
       "category": {

doc/3. FAQ and Recipes.md

@@ -0,0 +1,20 @@
+# FAQ and Recipes
+
+Below, you can find solutions for the most common problems and advice for typical config changes required by Vue Storefront API. If you solved any new issues by yourself, please let us know on [Slack](http://vuestorefront.slack.com) or [Forum](https://forum.vuestorefront.io/) and we will add them to the list so others don't need to reinvent the wheel.
+
+## Problem starting Vue Storefront API on Windows Docker
+
+In case you can't get vue storefront api (app container) to work on Windows and in logs you can see:
+
+```
+app_1   |  standard_init_linux.go:207: exec user process caused "no such file or directory"
+```
+
+then your end of line character is probably set to native Windows crlf. To change that you need to run:
+
+```
+git config core.autocrlf false
+git config core.eol lf
+git reset --hard
+docker-compose -f docker-compose.yml -f docker-compose.nodejs.yml up --build
+```

package.json

@@ -68,7 +68,7 @@
     "elasticsearch": "^15.2.0",
     "email-check": "^1.1.0",
     "express": "^4.16.3",
-    "graphql": "^0.10.1",
+    "graphql": "^0.13.1",
     "graphql-tools": "^1.2.1",
     "humps": "^1.1.0",
     "jsonfile": "^4.0.0",