Merge remote-tracking branch 'upstream/develop' into feature/searchQuery-graphQl-Update-1

# Conflicts:
#	src/graphql/elasticsearch/catalog/processor.js
#	src/graphql/elasticsearch/catalog/resolver.js

Author: yuriboyko

.eslintrc.js

@@ -0,0 +1,58 @@
+module.exports = {
+  root: true,
+  env: { jest: true, node: true, es6: true},
+  parserOptions: {
+    parser: '@typescript-eslint/parser',
+    ecmaVersion: 2018,
+    sourceType: 'module'
+  },
+  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  extends: [
+    'standard',
+    'plugin:@typescript-eslint/recommended'
+  ],
+  plugins: ['vue-storefront', '@typescript-eslint'],
+  // add your custom rules here
+  rules: {
+    '@typescript-eslint/no-var-requires': 1,
+    '@typescript-eslint/indent': ['error', 2],
+    '@typescript-eslint/camelcase': 0,
+    semi: 'off',
+    '@typescript-eslint/semi': 0,
+    '@typescript-eslint/member-delimiter-style': ['error', { 'multiline': { 'delimiter': 'comma', 'requireLast': false }, 'singleline': { 'delimiter': 'comma' } }],
+    '@typescript-eslint/no-empty-interface': 1,
+    '@typescript-eslint/no-use-before-define': 1,
+    '@typescript-eslint/no-explicit-any': 0,
+    '@typescript-eslint/class-name-casing': 1,
+    '@typescript-eslint/no-unused-vars': 0,
+    '@typescript-eslint/explicit-function-return-type': 0,
+    '@typescript-eslint/no-var-requires': 0,
+    'handle-callback-err': 1,
+    'prefer-promise-reject-errors': 0,
+    'import/no-duplicates': ['warning'],
+    // allow paren-less arrow functions
+    'arrow-parens': 0,
+    'prefer-arrow-callback': 1,
+    // allow async-await
+    'generator-star-spacing': 0,
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'no-restricted-imports': [2, { paths: ['lodash-es'] }],
+    'vue-storefront/no-corecomponent-import': 'error',
+    'vue-storefront/no-corecomponent': 'error',
+    'vue-storefront/no-corepage-import': 'error',
+    'vue-storefront/no-corepage': 'error',
+    'no-console': 0,
+    'no-unused-vars': 1
+  },
+  overrides: [
+    {
+      // @todo check if this is closed https://github.com/typescript-eslint/typescript-eslint/issues/342
+      // This is an issue with interfaces so we need to wait until it fixed.
+      files: ['core/**/*.ts'],
+      rules: {
+        'no-undef': 1
+      }
+    }
+  ]
+};

.gitignore

@@ -9,6 +9,7 @@ api_test.sh
 package-lock.json
 src/config.json
 config/local.json
+config/certs/*.pem
 var/magento2-sample-data/
 .migrate
 *.iml

.travis.yml

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

CHANGELOG.md

@@ -4,6 +4,20 @@ 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.11.0-rc.1] - UNRELEASED
+
+### Added
+- Constant for Mailchimp subscription status - @KonstantinSoelch (#294)
+- mage2vs import now has optional `--generate-unique-url-keys` parameter which defaults to `false` to enable/disable the url key generation with name and id for categories - @rain2o (#232)
+- Added eslint config from vue-storefront so we have the same config and in both repos typescript support - @resubaka (#320)
+- Added jest support - @resubaka (#321)
+
+### Fixed
+- The `product.price_*` fields have been normalized with the backward compatibility support (see `config.tax.deprecatedPriceFieldsSupport` which is by default true) - @pkarw (#289)
+- The `product.final_price` field is now being taken into product price calcualtion. Moreover, we've added the `config.tax.finalPriceIncludesTax` - which is set to `true` by default. All the `price`, `original_price` and `special_price` fields are calculated accordingly. It was required as Magento2 uses `final_price` to set the catalog pricing rules after-prices - @pkarw (#289)
+- Force ES connections to use protocol config option - @cewald (#303, #304)
+- Better handling of HTTP error codes provided by API client - #3151
+
 ## [1.10.0-rc.1] - UNRELEASED
 
 ### Added
@@ -16,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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)
+- Support self signed certificates - @lukeromanowicz (#287)
 
 ### Fixed
 - Missing `res` and `req` parameters are now passed to ProductProcessor - @jahvi (#218)

README.md

@@ -146,6 +146,11 @@ You can use the following command to run a delta indexer for a specific storevie
 yarn mage2vs productsdelta --store-code=de
 ```
 
+## Self signed certificates
+
+Often in non production environment other services are using self signed certificates for secure connection.
+You can easily setup the application to trust them by putting them in config/certs directory.  
+
 License
 -------
 

config/certs/.gitkeep

@@ -69,8 +69,10 @@
       "tax": {
         "defaultCountry": "DE",
         "defaultRegion": "",
+        "deprecatedPriceFieldsSupport": true,
         "calculateServerSide": true,
-		    "sourcePriceIncludesTax": false
+        "sourcePriceIncludesTax": false,
+		    "finalPriceIncludesTax": true
       },
       "i18n": {
         "fullCountryName": "Germany",
@@ -100,7 +102,9 @@
         "defaultCountry": "IT",
         "defaultRegion": "",
         "calculateServerSide": true,
-		"sourcePriceIncludesTax": false
+        "sourcePriceIncludesTax": false,
+        "deprecatedPriceFieldsSupport": true,
+        "finalPriceIncludesTax": true
       },
       "i18n": {
         "fullCountryName": "Italy",
@@ -126,7 +130,9 @@
     "alwaysSyncPlatformPricesOver": false,
     "usePlatformTotals": true,
     "setConfigurableProductOptions": true,
-	"sourcePriceIncludesTax": false
+    "sourcePriceIncludesTax": false,
+    "deprecatedPriceFieldsSupport": true,
+    "finalPriceIncludesTax": true
   },
   "bodyLimit": "100kb",
   "corsHeaders": [
@@ -144,7 +150,8 @@
     "mailchimp": {
       "listId": "e06875a7e1",
       "apiKey": "a9a3318ea7d30f5c5596bd4a78ae0985-us3",
-      "apiUrl": "https://us3.api.mailchimp.com/3.0"
+      "apiUrl": "https://us3.api.mailchimp.com/3.0",
+      "userStatus": "subscribed"
     },
     "mailService": {
       "transport": {
@@ -216,7 +223,17 @@
       "process": 4
     },
     "simd": true,
-    "keepDownloads": true
+    "keepDownloads": true,
+    "caching": {
+      "active": false,
+      "type": "file",
+      "file": {
+        "path": "/tmp/vue-storefront-api"
+      }
+    },
+    "action": {
+      "type": "local"
+    }
   },
   "entities": {
       "category": {

config/default.json

@@ -0,0 +1 @@
+{}

config/test.json

@@ -7,6 +7,7 @@ WORKDIR /var/www
 RUN apk add --no-cache curl git
 
 COPY package.json ./
+COPY yarn.lock ./
 
 RUN apk add --no-cache --virtual .build-deps ca-certificates wget && \
     yarn install --no-cache && \

docker/vue-storefront-api/Dockerfile

@@ -5,7 +5,11 @@ let queue = kue.createQueue(Object.assign(config.kue, { redis: config.redis }))
 
 let es = require('elasticsearch')
 const esConfig = {
-  host: config.elasticsearch.host + ':' + config.elasticsearch.port,
+  host: {
+    host: config.elasticsearch.host,
+    port: config.elasticsearch.port,
+    protocol: config.elasticsearch.protocol
+  },
   log: 'debug',
   apiVersion: config.elasticsearch.apiVersion,
   requestTimeout: 1000 * 60 * 60,