Merge pull request #1886 from DivanteLtd/develop

Release 1.5.0

Author: pkarw

.eslintignore

@@ -1,3 +1,3 @@
 core/build/*.js
 node_modules
-core/modules/**/test
+core/modules/**/tests

CHANGELOG.md

@@ -4,6 +4,24 @@ 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.5.0] - 2018.10.22
+
+### Added
+- Contact form mailer - #1875 - Akbar Abdrakhmanov @akbarik
+- oauth2 configuration in setup - #1865 - Krister Andersson @Cyclonecode
+
+### Changed
+- New Modules API, and base modules (cart, wishlist, newsletter ...) refactored [read more...](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/api-modules/about-modules.md) - Filip Rakowski @filrak
+
+### Fixed
+- The `regionId` field added to Order interface - #1258 - Jim Hil @jimcreate78
+- SSR Memory leaks fixed - #1882 Tomasz Duda @tomasz-duda
+- E2E tests fixed - #1861 - Patryk Tomczyk @patzik
+- UI animations - #1857 - Javier Villanueva @jahvi
+- Disabled buttons fixed - #1852 - Patryk Tomczyk @patzik
+- Mailchimp / Newsletter modules rebuilt - Filip Rakowski @filrak
+- Search component UX fixes - #1862 - Adrian Cagaanan @diboy2
+
 ## [1.4.0] - 2018.10.05
 
 ### Added

PULL_REQUEST_TEMPLATE.md

@@ -12,14 +12,14 @@
 
 ### Screenshot of passed e2e tests (if you are using our standard setup as a backend)
 
-(run `yarn tests:e2e` and paste the results. If you are not using our standard backend setup or demo.vuestorefront.io you can ommit this step) 
+(run `yarn test:e2e` and paste the results. If you are not using our standard backend setup or demo.vuestorefront.io you can ommit this step) 
 
 ### Upgrade Notes and Changelog
 
 - [x] No upgrade steps required (100% backward compatibility)
 - [ ] I've updated the [Upgrade notes](https://github.com/DivanteLtd/vue-storefront/blob/develop/doc/Upgrade%20notes.md) and [Changelog](https://github.com/DivanteLtd/vue-storefront/blob/develop/CHANGELOG.md) on how to port existing VS sites with this new feature
 
-### Contribution and curently important rules acceptance
+### Contribution and currently important rules acceptance
 
 - [ ] I read and followed [contribution rules](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md)
 - [ ] I read the [TypeScript Action Plan](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/TypeScript%20Action%20Plan.md) and adjusted my PR according to it

README.md

@@ -4,7 +4,6 @@
 ![Branch stable](https://img.shields.io/badge/stable%20branch-master-blue.svg)
 ![Branch Develop](https://img.shields.io/badge/dev%20branch-develop-blue.svg)
 <a href="https://join.slack.com/t/vuestorefront/shared_invite/enQtMzA4MTM2NTE5NjM2LTI1M2RmOWIyOTk0MzFlMDU3YzJlYzcyYzNiNjUyZWJiMTZjZjc3MjRlYmE5ZWQ1YWRhNTQyM2ZjN2ZkMzZlNTg">![Branch Develop](https://img.shields.io/badge/community%20chat-slack-FF1493.svg)</a>
-[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)
 
 Vue Storefront is a standalone PWA storefront for your eCommerce, possible to connect with any eCommerce backend (eg. Magento, <a href="https://github.com/DivanteLtd/pimcore2vuestorefront">Pimcore</a>,  Prestashop or Shopware) through the API.
 

config/default.json

@@ -20,7 +20,7 @@
       "host": "localhost",
       "port": 6379,
       "db": 0
-    },    
+    },
     "graphql":{
       "host": "localhost",
       "port": 8080
@@ -207,7 +207,6 @@
         "claims": "LOCALSTORAGE",
         "compare": "INDEXEDDB",
         "syncTasks": "INDEXEDDB",
-        "newsletterPreferences": "INDEXEDDB",
         "ordersHistory": "INDEXEDDB",
         "checkoutFieldValues": "LOCALSTORAGE"
       }
@@ -274,6 +273,14 @@
     "mailchimp": {
       "endpoint": "http://localhost:8080/api/ext/mailchimp-subscribe/subscribe"
     },
+    "mailer": {
+      "endpoint": {
+        "send": "http://localhost:8080/api/ext/mail-service/send-email",
+        "token": "http://localhost:8080/api/ext/mail-service/get-token"
+      },
+      "contactAddress": "[email protected]",
+      "sendConfirmation": true
+    },
     "theme": "@vue-storefront/theme-default",
     "analytics": {
       "id": false

core/app.ts

@@ -20,70 +20,80 @@ import App from 'theme/App.vue'
 import themeModules from 'theme/store'
 import themeExtensionEntryPoints from 'theme/extensions'
 import extensionEntryPoints from 'src/extensions'
+import { once } from './helpers'
 
 // Declare Apollo graphql client
 import ApolloClient from 'apollo-client'
 import { HttpLink } from 'apollo-link-http'
 import { InMemoryCache } from 'apollo-cache-inmemory'
 import VueApollo from 'vue-apollo'
 
+// core modules registration that'll be completely moved to theme TODO: move to accesibel entry point when ready
+import { enabledModules } from './modules-entry'
 import { takeOverConsole } from '@vue-storefront/core/helpers/log'
+
 if (buildTimeConfig.console.verbosityLevel !== 'display-everything') {
-  takeOverConsole(buildTimeConfig.console.verbosityLevel)
+  once('__TAKE_OVER_CONSOLE__', () => {
+    takeOverConsole(buildTimeConfig.console.verbosityLevel)
+  })
 }
 
+
 export function createApp (ssrContext, config): { app: Vue, router: any, store: any } {
   sync(store, router)
-  store.state.version = '1.4.0'
+  store.state.version = '1.5.0'
   store.state.config = config
   store.state.__DEMO_MODE__ = (config.demomode === true) ? true : false
-
   if(ssrContext) Vue.prototype.$ssrRequestContext = ssrContext
 
   if (!store.state.config) store.state.config = buildTimeConfig // if provided from SSR, don't replace it
   const storeModules = Object.assign(coreModules, themeModules || {})
-  
+
   for (const moduleName of Object.keys(storeModules)) {
     console.debug('Registering Vuex module', moduleName)
     store.registerModule(moduleName, storeModules[moduleName])
   }
-  
+
   const storeView = prepareStoreView(null) // prepare the default storeView
   store.state.storeView = storeView
   // store.state.shipping.methods = shippingMethods
-  
+
   Vue.use(Vuelidate)
   Vue.use(VueLazyload, {attempt: 2})
   Vue.use(Meta)
   Vue.use(VueObserveVisibility)
-  
-  require('theme/plugins')
-  const pluginsObject = plugins()
-  Object.keys(pluginsObject).forEach(key => {
-    Vue.use(pluginsObject[key])
-  })
-  
-  const mixinsObject = mixins()
-  Object.keys(mixinsObject).forEach(key => {
-    Vue.mixin(mixinsObject[key])
+
+  once('__VUE_EXTEND__', () => {
+    console.debug('Registering Vue plugins')
+    require('theme/plugins')
+    const pluginsObject = plugins()
+    Object.keys(pluginsObject).forEach(key => {
+      Vue.use(pluginsObject[key])
+    })
+
+    console.debug('Registering Vue mixins')
+    const mixinsObject = mixins()
+    Object.keys(mixinsObject).forEach(key => {
+      Vue.mixin(mixinsObject[key])
+    })
   })
-  
+
   const filtersObject = filters()
   Object.keys(filtersObject).forEach(key => {
     Vue.filter(key, filtersObject[key])
   })
     const httpLink = new HttpLink({
       uri: store.state.config.graphql.host.indexOf('://') >= 0 ? store.state.config.graphql.host : (store.state.config.server.protocol + '://' + store.state.config.graphql.host + ':' + store.state.config.graphql.port + '/graphql')
     })
-  
+
   const apolloClient = new ApolloClient({
     link: httpLink,
     cache: new InMemoryCache(),
     connectToDevTools: true
   })
-  
+
   let loading = 0
-  
+
   const apolloProvider = new VueApollo({
     clients: {
         a: apolloClient
@@ -101,9 +111,9 @@ export function createApp (ssrContext, config): { app: Vue, router: any, store:
         console.error(error)
     }
   })
-  
+
   Vue.use(VueApollo)
-  // End declare Apollo graphql client    
+  // End declare Apollo graphql client
   const app = new Vue({
     router,
     store,
@@ -120,8 +130,7 @@ export function createApp (ssrContext, config): { app: Vue, router: any, store:
     ssrContext
   )
   registerTheme(buildTimeConfig.theme, app, router, store, store.state.config, ssrContext)
-
+  enabledModules.forEach(m => m.register())
   app.$emit('application-after-init', app)
-
   return { app, router, store }
 }

core/components/AddToCart.js

@@ -1,12 +1,6 @@
-import { addToCart } from '@vue-storefront/core/modules/cart/features'
+import { AddToCart } from '@vue-storefront/core/modules/cart/components/AddToCart.ts'
 
 export default {
   name: 'AddToCart',
-  props: {
-    product: {
-      type: Object,
-      required: true
-    }
-  },
-  mixins: [ addToCart ]
+  mixins: [ AddToCart ]
 }

core/components/Notification.js

@@ -21,16 +21,15 @@ export default {
         this.action('close', this.notifications.length - 1)
       }, data.timeToLive || 5000)
     },
-    action (action, id) {
-      this.$bus.$emit('notification-after-' + action, id)
+    action (action, id, notification) {
+      this.$bus.$emit('notification-after-' + action, notification)
       switch (action) {
-        case 'close':
-          this.notifications.splice(id, 1)
-          break
         case 'goToCheckout':
           this.$router.push(this.localizedRoute('/checkout'))
           this.notifications.splice(id, 1)
           break
+        default:
+          this.notifications.splice(id, 1)
       }
     }
   }

core/components/ProductBundleOptions.js

@@ -40,6 +40,22 @@ export default {
       }
     }
   },
+  computed: {
+    /**
+     * Error messages map for validation options.
+     * TODO: Each option should be a separate component to avoid such complex logic.
+     */
+    errorMessages () {
+      let messages = {}
+      Object.keys(this.validation.results).map(optionKey => {
+        const validationResult = this.validation.results[optionKey]
+        if (validationResult.error) {
+          messages[optionKey] = validationResult.message
+        }
+      })
+      return messages
+    }
+  },
   beforeMount () {
     rootStore.dispatch('product/addCustomOptionValidator', {
       validationRule: 'gtzero', // You may add your own custom fields validators elsewhere in the theme

core/components/blocks/Checkout/Shipping.js

@@ -137,7 +137,7 @@ export default {
     },
     getCurrentShippingMethod () {
       let shippingCode = this.shipping.shippingMethod
-      let currentMethod = this.shippingMethods.find(item => item.method_code === shippingCode)
+      let currentMethod = this.shippingMethods ? this.shippingMethods.find(item => item.method_code === shippingCode) : {}
       return currentMethod
     },
     changeShippingMethod () {