Merge pull request #325 from DivanteLtd/release/v1.10

Release/v1.10

Author: lukeromanowicz

.gitignore

@@ -11,5 +11,6 @@ src/config.json
 config/local.json
 var/magento2-sample-data/
 .migrate
+*.iml
 /docker/elasticsearch/data/
 !/docker/elasticsearch/data/.gitkeep

.travis.yml

@@ -11,12 +11,13 @@ install:
 
 jobs:
   include:
-    - stage: Build
+    - &build
+      stage: Build
       script:
-        - yarn lint
-        - yarn build
-      node_js: "8"
-    - script:
-        - yarn lint
-        - yarn build
-      node_js: "10"
+      - yarn lint
+      - yarn build
+      node_js: '10'
+
+    - <<: *build
+      node_js: '8'
+

CHANGELOG.md

@@ -4,6 +4,32 @@ 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] - 2019.08.12
+
+### Added
+- Typescript support - @ResuBaka (#210, #242)
+- Multi Stock Inventory (Magento MSI) support - @aleron75, @dimasch (#226)
+- Import of magento 2 cms pages and blocks to the full import - @toh82 (#235)
+- Information about magento 2 cms pages and blocks import to the readme - @toh82 (#235)
+- Introduce orderNumber to order creation endpoint - @Flyingmana (#251)
+- Optional Redis Auth functionality. - @rain2o (#267)
+- Extensions have ability to modify Elasticsearch results. - @grimasod (#269)
+- Refactored Travis build config - @Tjitse-E (#273)
+- Multistore support for `magento1`-platform using `magento1-vsbridge` - @cewald (#276)
+
+### Changed
+- Sharp dependency has been updated. *It might require reinstalling yarn dependencies* - @lukeromanowicz
+
+### Fixed
+- Missing `res` and `req` parameters are now passed to ProductProcessor - @jahvi (#218)
+- Moving of graphql files to the dist folder - @ResuBaka (#242)
+- Moving of schema files to the dist folder - @ResuBaka (#244)
+- Missing assetPath config for magento1 - @ResuBaka (#245)
+- New payload for magento1 stock check endpoint - @cewald (#261)
+- `yarn dev:inspect` command and extract nodemon config to nodemon.json - @Tjitse-E, @cewald (#272, #279)
+- 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.
 

README.md

@@ -126,6 +126,12 @@ You can run the following command to execute the full import:
 ```bash
  yarn mage2vs import --store-code=de
  ```
+
+ Import of CMS blocks and pages is also performed by the full import. If the CMS API extension ((SnowdogApps/magento2-cms-api)[https://github.com/SnowdogApps/magento2-cms-api]) was not installed in magento 2, it's recommended to skip the CMS import commands.
+
+```bash
+ yarn mage2vs import --skip-blocks --skip-pages
+ ```
 
 ## Executing delta indexer
 

config/custom-environment-variables.json

@@ -10,6 +10,7 @@
   "redis": {
     "host": "REDIS_HOST",
     "port": "REDIS_PORT",
-    "db": "REDIS_DB"
+    "db": "REDIS_DB",
+    "auth": "REDIS_AUTH"
   }
 }

config/default.json

@@ -35,13 +35,18 @@
   "redis": {
     "host": "localhost",
     "port": 6379,
-    "db": 0
+    "db": 0,
+    "auth": false
   },
   "kue": {},
   "availableStores": [
     "de",
     "it"
   ],
+  "msi": {
+    "enabled": false,
+    "defaultStockId": 1
+  },
   "storeViews": {
     "multistore": true,
     "mapStoreUrlsFor": [
@@ -50,19 +55,22 @@
     ],
     "de": {
       "storeCode": "de",
-      "disabled": true,
+      "disabled": false,
       "storeId": 3,
       "name": "German Store",
       "url": "/de",
       "elasticsearch": {
         "host": "localhost:8080/api/catalog",
         "index": "vue_storefront_catalog_de"
       },
+      "msi": {
+        "stockId": 2
+      },
       "tax": {
         "defaultCountry": "DE",
         "defaultRegion": "",
         "calculateServerSide": true,
-		"sourcePriceIncludesTax": false
+		    "sourcePriceIncludesTax": false
       },
       "i18n": {
         "fullCountryName": "Germany",
@@ -77,14 +85,17 @@
     },
     "it": {
       "storeCode": "it",
-      "disabled": true,
+      "disabled": false,
       "storeId": 4,
       "name": "Italian Store",
       "url": "/it",
       "elasticsearch": {
         "host": "localhost:8080/api/catalog",
         "index": "vue_storefront_catalog_it"
       },
+      "msi": {
+        "stockId": 2
+      },
       "tax": {
         "defaultCountry": "IT",
         "defaultRegion": "",
@@ -126,7 +137,8 @@
     "mailchimp-subscribe",
     "example-magento-api",
     "cms-data",
-    "mail-service"
+    "mail-service",
+    "example-processor"
   ],
   "extensions": {
     "mailchimp": {
@@ -144,6 +156,11 @@
       },
       "targetAddressWhitelist": ["contributors@vuestorefront.io"],
       "secretString": "__THIS_IS_SO_SECRET__"
+    },
+    "example-processor": {
+      "resultProcessors": {
+        "product": "my-product-processor"
+      }
     }
   },
   "magento2": {
@@ -159,6 +176,11 @@
   },
   "magento1": {
     "imgUrl": "http://magento-demo.local/media/catalog/product",
+    "assetPath": "",
+    "magentoUserName": "",
+    "magentoUserPassword": "",
+    "httpUserName": "",
+    "httpUserPassword": "",
     "api": {
       "url": "http://magento-demo.local/vsbridge",
       "consumerKey": "",

docker-compose.nodejs.yml

@@ -17,6 +17,8 @@ services:
       - './migrations:/var/www/migrations'
       - './package.json:/var/www/package.json'
       - './babel.config.js:/var/www/babel.config.js'
+      - './tsconfig.json:/var/www/tsconfig.json'
+      - './nodemon.json:/var/www/nodemon.json'
       - './scripts:/var/www/scripts'
       - './src:/var/www/src'
       - './var:/var/www/var'

ecosystem.json

@@ -2,7 +2,6 @@
   "apps": [
     {
       "name": "api",
-      "interpreter": "babel-node",
       "script": "./dist/index.js",
       "log_date_format": "YYYY-MM-DD HH:mm:ss",
       "ignore_watch": ["node_modules"]

nodemon.json

@@ -0,0 +1,8 @@
+{
+  "verbose": true,
+  "debug": false,
+  "exec": "ts-node src",
+  "watch": ["./src"],
+  "ext": "ts, js",
+  "inspect": true
+}

package.json

@@ -1,12 +1,16 @@
 {
   "name": "vue-storefront-api",
-  "version": "1.9.5",
+  "version": "1.10.0-rc1",
   "private": true,
   "description": "vue-storefront API and data services",
   "main": "dist",
   "scripts": {
-    "dev": "nodemon -w src --exec \"babel-node src\"",
-    "build": "babel src -s -D -d dist",
+    "dev": "nodemon",
+    "dev:inspect": "nodemon --exec \"node --inspect -r ts-node/register src\"",
+    "build": "npm run -s build:code && npm run -s build:copy:graphql && npm run -s build:copy:schema",
+    "build:code": "tsc --build",
+    "build:copy:graphql": "cpx src/**/*.graphqls dist",
+    "build:copy:schema": "cpx 'src/**/*.schema*.json' dist",
     "start": "pm2 start ecosystem.json $PM2_ARGS",
     "db": "node scripts/db.js",
     "seo": "node scripts/seo.js",
@@ -75,6 +79,7 @@
     "mage2vuestorefront": "git+https://github.com/DivanteLtd/mage2vuestorefront.git",
     "magento1-vsbridge-client": "github:DivanteLtd/magento1-vsbridge-client",
     "magento2-rest-client": "github:DivanteLtd/magento2-rest-client",
+    "md5": "^2.2.1",
     "merge-graphql-schemas": "^1.5.2",
     "migrate": "^1.6.2",
     "mime-types": "^2.1.18",
@@ -90,13 +95,17 @@
     "winston": "^2.4.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.4.0",
-    "@babel/node": "^7.2.2",
-    "@babel/preset-env": "^7.4.2",
+    "@types/body-parser": "^1.17.0",
+    "@types/config": "^0.0.34",
+    "@types/express": "^4.16.1",
+    "@types/node": "^11.13.4",
     "apollo-server-express": "^1.3.6",
+    "cpx": "^1.5.0",
     "eslint": "^4.16.0",
-    "nodemon": "^1.18.7"
+    "nodemon": "^1.18.7",
+    "ts-node": "^8.1.0",
+    "tslib": "^1.9.3",
+    "typescript": "3.3.*"
   },
   "bugs": {
     "url": "https://github.com/DivanteLtd/vue-storefront-api/issues"