Merge branch 'develop' of github.com:DivanteLtd/vue-storefront-api into feature/add-usergroupid-for-product-tax-calculation

# Conflicts:
#	CHANGELOG.md
#	config/default.json
#	src/api/catalog.js
#	src/api/user.js
#	src/platform/magento1/tax.js
#	src/platform/magento2/tax.js

Author: ResuBaka

.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
+      }
+    }
+  ]
+};

.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

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### 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)
+- Added caching factory and action factory for the image endpoint. This gives the possibility to use other services for caching or image processing - @resubaka (#317, #315)
 - Added support for tax calculation where the values from customer_tax_class_ids is used - @resubaka (#307)
 
 ### Fixed

config/default.json

@@ -229,7 +229,22 @@
       "process": 4
     },
     "simd": true,
-    "keepDownloads": true
+    "keepDownloads": true,
+    "caching": {
+      "active": false,
+      "type": "file",
+      "file": {
+        "path": "/tmp/vue-storefront-api"
+      },
+      "google-cloud-storage": {
+        "libraryOptions": {},
+        "bucket": "",
+        "prefix": "vue-storefront-api/image-cache"
+      }
+    },
+    "action": {
+      "type": "local"
+    }
   },
   "entities": {
       "category": {

config/test.json

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

docker/vue-storefront-api/Dockerfile

@@ -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 && \

migrations/1530101328854-local_es_config_fix.js

@@ -7,32 +7,31 @@ const path = require('path')
 
 const configDir = path.resolve('./config')
 
-var files = fs.readdirSync(configDir).filter(function(file) {
+var files = fs.readdirSync(configDir).filter((file) => {
   if (file === 'default.json') return false
 
   if (file.startsWith('elastic.schema.')) return false
 
   return path.extname(file) === '.json'
 })
 
-
 module.exports.up = next => {
-  files.forEach(function(file) {
+  files.forEach((file) => {
     var filePath = path.join(configDir, file)
 
     try {
       console.log(`Searching for deprecated parameters in file '${filePath}'...`)
       let config = JSON.parse(fs.readFileSync(filePath))
 
-      if ("esHost" in config) {
+      if ('esHost' in config) {
         console.log("Parameter 'esHost' found - rewriting...", filePath)
         let esHostPort = config.esHost.split(':')
         _set(config, 'elasticsearch.host', esHostPort[0])
         _set(config, 'elasticsearch.port', esHostPort[1])
         delete config.esHost
       }
 
-      if ("esIndexes" in config) {
+      if ('esIndexes' in config) {
         console.log("Parameter 'esIndexes' found - rewriting...")
         _set(config, 'elasticsearch.indices', config.esIndexes)
         delete config.esIndexes

package.json

@@ -31,31 +31,21 @@
     "migrate": "node node_modules/migrate/bin/migrate",
     "prestart": "npm run -s build",
     "test": "eslint src",
+    "test:unit": "jest -c test/unit/jest.conf.js",
     "setup": "npm run restore; npm run migrate",
-    "lint": "eslint --ext .js src migrations scripts"
-  },
-  "eslintConfig": {
-    "extends": "eslint:recommended",
-    "parserOptions": {
-      "ecmaVersion": 2018,
-      "sourceType": "module"
-    },
-    "env": {
-      "node": true,
-      "es6": true
-    },
-    "rules": {
-      "no-console": 0,
-      "no-unused-vars": 1
-    }
+    "lint": "eslint --ext .js,.ts src migrations scripts --fix"
   },
+  "pre-commit": [
+    "lint"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/DivanteLtd/vue-storefront-api.git"
   },
   "author": "Piotr Karwatka <pkarwatka@divante.pl>",
   "license": "MIT",
   "dependencies": {
+    "@google-cloud/storage": "^3.0.3",
     "ajv": "^6.4.0",
     "ajv-keywords": "^3.4.0",
     "body-parser": "^1.18.2",
@@ -68,6 +58,7 @@
     "elasticsearch": "^15.2.0",
     "email-check": "^1.1.0",
     "express": "^4.16.3",
+    "fs-extra": "^8.1.0",
     "graphql": "^0.10.1",
     "graphql-tools": "^1.2.1",
     "humps": "^1.1.0",
@@ -99,11 +90,23 @@
     "@types/body-parser": "^1.17.0",
     "@types/config": "^0.0.34",
     "@types/express": "^4.16.1",
+    "@types/jest": "^24.0.11",
     "@types/node": "^11.13.4",
+    "@typescript-eslint/eslint-plugin": "^1.7.1-alpha.17",
+    "@typescript-eslint/parser": "^1.7.1-alpha.17",
     "apollo-server-express": "^1.3.6",
     "cpx": "^1.5.0",
-    "eslint": "^4.16.0",
+    "jest": "^24.8.0",
+    "eslint": "^5.0.0",
+    "eslint-config-standard": "^11.0.0",
+    "eslint-plugin-import": "^2.13.0",
+    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-promise": "^3.7.0",
+    "eslint-plugin-standard": "^3.1.0",
+    "eslint-plugin-vue-storefront": "^0.0.1",
     "nodemon": "^1.18.7",
+    "ts-jest": "^24.0.2",
+    "pre-commit": "^1.2.2",
     "ts-node": "^8.1.0",
     "tslib": "^1.9.3",
     "typescript": "3.3.*"

scripts/db.js

@@ -14,31 +14,30 @@ program
 
     console.log('** Hello! I am going to rebuild EXISTING ES index to fix the schema')
     const originalIndex = cmd.indexName
-    const tempIndex = originalIndex + '_' + Math.round(+new Date()/1000)
-  
+    const tempIndex = originalIndex + '_' + Math.round(+new Date() / 1000)
+
     console.log(`** Creating temporary index ${tempIndex}`)
-    es.createIndex(common.db, tempIndex, function(err) {
+    es.createIndex(common.db, tempIndex, (err) => {
       if (err) {
         console.log(err)
       }
-  
+
       console.log(`** Putting the mappings on top of ${tempIndex}`)
-      es.putMappings(common.db, tempIndex, function(err) {
-  
+      es.putMappings(common.db, tempIndex, (err) => {
         console.log(`** We will reindex ${originalIndex} with the current schema`)
-        es.reIndex(common.db, originalIndex, tempIndex, function (err) {
+        es.reIndex(common.db, originalIndex, tempIndex, (err) => {
           if (err) {
             console.log(err)
           }
-          
+
           console.log('** Removing the original index')
-          es.deleteIndex(common.db, originalIndex, function (err) {
+          es.deleteIndex(common.db, originalIndex, (err) => {
             if (err) {
               console.log(err)
             }
-  
+
             console.log('** Creating alias')
-            es.putAlias(common.db, tempIndex, originalIndex, function (err) {
+            es.putAlias(common.db, tempIndex, originalIndex, (err) => {
               console.log('Done! Bye!')
               process.exit(0)
             })
@@ -59,7 +58,7 @@ program
 
     console.log('** Hello! I am going to create NEW ES index')
     const indexName = cmd.indexName
-    es.createIndex(common.db, indexName, function (err) {
+    es.createIndex(common.db, indexName, (err) => {
       if (err) {
         console.log(err)
       }
@@ -83,7 +82,7 @@ process.on('unhandledRejection', (reason, p) => {
   // application specific logging, throwing an error, or other logic here
 })
 
-process.on('uncaughtException', function (exception) {
+process.on('uncaughtException', (exception) => {
   console.error(exception) // to see your exception details in the console
   // if you are on production, maybe you can send the exception details to your
   // email as well ?

scripts/elastic.js

@@ -2,11 +2,9 @@ const program = require('commander')
 const config = require('config').elasticsearch
 const spawnSync = require('child_process').spawnSync
 
-function stdOutErr(stdout, stderr) {
-  if (stdout.length > 0)
-    console.log(stdout.toString('utf8'))
-  if (stderr.length > 0)
-    console.error(stderr.toString('utf8'))
+function stdOutErr (stdout, stderr) {
+  if (stdout.length > 0) { console.log(stdout.toString('utf8')) }
+  if (stderr.length > 0) { console.error(stderr.toString('utf8')) }
 }
 
 program
@@ -49,9 +47,9 @@ program
   .parse(process.argv)
 
 process.on('unhandledRejection', (reason, p) => {
-  console.log("Unhandled Rejection at: Promise ", p, " reason: ", reason)
+  console.log('Unhandled Rejection at: Promise ', p, ' reason: ', reason)
 })
 
-process.on('uncaughtException', function(exception) {
+process.on('uncaughtException', (exception) => {
   console.log(exception)
 })