Merge branch 'master' into master

.gitignore

@@ -23,7 +23,7 @@ core/resource/i18n/en-US.json
 core/resource/i18n/es-ES.json
 core/resource/i18n/fr-FR.json
 core/resource/i18n/it-IT.json
-core/resource/i18n/jp-JP.json
+core/resource/i18n/ja-JP.json
 core/resource/i18n/multistoreLanguages.json
 core/resource/i18n/nl-NL.json
 core/resource/i18n/pl-PL.json

CHANGELOG.md

@@ -4,6 +4,19 @@ 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.5] - 28.11.2019
+
+### Fixed
+- Disable product mutation when assigning product variant - @gibkigonzo (#3735)
+- Fix issue with Cannot assign to read only property 'storeCode' - @yuriboyko (#3748)
+- Render correct category links when multistore is active - @gibkigonzo (#3753)
+- Disable product mutation when assigning product variant - @gibkigonzo (#3735)
+- Fixed null value of search input - @AdKamil (#3778)
+- Sorting fixed on category page - @AdKamil (#3785)
+- Mount app in 'beforeResolve' if it's not dispatched in 'onReady' - @gibkigonzo (#3669)
+- change translation from jp-JP to ja-JP - @gibkigonzo (#3824)
+- Fix product images, my account link, warnings in console - @andrzejewsky (#3850)
+
 ## [1.10.4] - 18.10.2019
 
 ### Fixed

README.md

@@ -892,19 +892,19 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
         </a>
 </td>
   <td align="center" valign="middle"> 
-<a href="">
+<a href="https://www.sitewards.com/">
           <img
-            src=""
-            alt=""
+            src="https://divante.com/partners/Vue-Storefront/Sitewards%20Logo.png"
+            alt="Sitewards"
             height="40"
           >
         </a>
 </td>
      <td align="center" valign="middle"> 
-<a href="">
+<a href="https://codecoda.com/en">
           <img
-            src=""
-            alt=""
+            src="https://divante.com/partners/Vue-Storefront/CodeCoda-800.png"
+            alt="CodeCoda"
             height="40"
           >
         </a>
@@ -944,3 +944,5 @@ If you like to become our Partner just let us know via contributors@vuestorefron
 ## The license
 
 Vue Storefront source code is completely free and released under the [MIT License](https://github.com/DivanteLtd/vue-storefront/blob/master/LICENSE).
+
+[![analytics](http://www.google-analytics.com/collect?v=1&t=pageview&_s=1&dl=https%3A%2F%2Fgithub.com%2FDivanteLtd%2Fvue-storefront&_u=MAC~&cid=1757014354.1393964045&tid=UA-108235765-10)]()

config/default.json

@@ -289,7 +289,7 @@
         "order": "desc"
       },
       "sortByAttributes": {
-        "Latest": "updated_at",
+        "Latest": "updated_at:desc",
         "Price: Low to high":"final_price",
         "Price: High to low":"final_price:desc"
       },
@@ -403,7 +403,7 @@
     "i18n": {
       "defaultCountry": "US",
       "defaultLanguage": "EN",
-      "availableLocale": ["en-US","de-DE","fr-FR","es-ES","nl-NL", "jp-JP", "ru-RU", "it-IT", "pt-BR", "pl-PL", "cs-CZ"],
+      "availableLocale": ["en-US","de-DE","fr-FR","es-ES","nl-NL", "ja-JP", "ru-RU", "it-IT", "pt-BR", "pl-PL", "cs-CZ"],
       "defaultLocale": "en-US",
       "currencyCode": "USD",
       "currencySign": "$",

core/app.ts

@@ -68,7 +68,12 @@ const createApp = async (ssrContext, config, storeCode = null): Promise<{app: Vu
   store.state.version = process.env.APPVERSION
   store.state.config = config // @deprecated
   store.state.__DEMO_MODE__ = (config.demomode === true)
-  if (ssrContext) Vue.prototype.$ssrRequestContext = ssrContext
+  if (ssrContext) {
+    // @deprecated - we shouldn't share server context between requests
+    Vue.prototype.$ssrRequestContext = {output: {cacheTags: ssrContext.output.cacheTags}}
+
+    Vue.prototype.$cacheTags = ssrContext.output.cacheTags
+  }
   if (!store.state.config) store.state.config = globalConfig //  @deprecated - we should avoid the `config`
   const storeView = await prepareStoreView(storeCode) // prepare the default storeView
   store.state.storeView = storeView
@@ -87,6 +92,10 @@ const createApp = async (ssrContext, config, storeCode = null): Promise<{app: Vu
     Object.keys(coreMixins).forEach(key => {
       Vue.mixin(coreMixins[key])
     })
+
+    Object.keys(coreFilters).forEach(key => {
+      Vue.filter(key, coreFilters[key])
+    })
   })
 
   // @todo remove this part when we'll get rid of global multistore mixin
@@ -99,10 +108,6 @@ const createApp = async (ssrContext, config, storeCode = null): Promise<{app: Vu
     })
   }
 
-  Object.keys(coreFilters).forEach(key => {
-    Vue.filter(key, coreFilters[key])
-  })
-
   let vueOptions = {
     router,
     store,

core/client-entry.ts

@@ -63,9 +63,23 @@ const invokeClientEntry = async () => {
     })
   }
   router.onReady(async () => {
+    // check if app can be mounted
+    const canBeMounted = () => RouterManager.isRouteDispatched() && // route is dispatched
+      !(router as any).history.pending && // there is no pending in router history
+      !(app as any)._isMounted // it's not mounted before
+
+    if (canBeMounted()) {
+      app.$mount('#app')
+    }
     router.beforeResolve((to, from, next) => {
-      if (!from.name) return next() // do not resolve asyncData on server render - already been done
-      if (Vue.prototype.$ssrRequestContext) Vue.prototype.$ssrRequestContext.output.cacheTags = new Set<string>()
+      if (!from.name) {
+        next()
+        if (canBeMounted()) {
+          app.$mount('#app')
+        }
+        return // do not resolve asyncData on server render - already been done
+      }
+      if (!Vue.prototype.$cacheTags) Vue.prototype.$cacheTags = new Set<string>()
       const matched = router.getMatchedComponents(to)
       if (to) { // this is from url
         if (globalConfig.storeViews.multistore === true) {
@@ -99,14 +113,6 @@ const invokeClientEntry = async () => {
         }
       }))
     })
-    // Mounting app
-    if (!RouterManager.isRouteDispatched()) {
-      RouterManager.addDispatchCallback(() => {
-        app.$mount('#app')
-      })
-    } else {
-      app.$mount('#app')
-    }
   })
   registerSyncTaskProcessor()
   window.addEventListener('online', () => { onNetworkStatusChange(store) })

core/filters/price.js

@@ -10,7 +10,9 @@ export function price (value) {
   }
   let formattedVal = Math.abs(parseFloat(value)).toFixed(2)
   const storeView = currentStoreView()
-
+  if (!storeView.i18n) {
+    return value;
+  }
   const prependCurrency = (price) => {
     return storeView.i18n.currencySign + price
   }

core/i18n/index.ts

@@ -33,7 +33,11 @@ const loadDateLocales = async (lang: string = 'en'): Promise<void> => {
     const separatorIndex = localeCode.indexOf('-')
     if (separatorIndex) {
       localeCode = separatorIndex ? localeCode.substr(0, separatorIndex) : localeCode
-      await import(/* webpackChunkName: "dayjs-locales" */ `dayjs/locale/${localeCode}`)
+      try {
+        await import(/* webpackChunkName: "dayjs-locales" */ `dayjs/locale/${localeCode}`)
+      } catch (err) {
+        Logger.debug('Unable to load translation from dayjs')()
+      }
     }
   }
 }

core/i18n/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/i18n",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "description": "Vue Storefront i18n",
   "license": "MIT",
   "main": "index.ts",

core/lib/multistore.ts

@@ -24,9 +24,13 @@ export async function prepareStoreView (storeCode: string): Promise<StoreView> {
   }
   const storeViewHasChanged = !rootStore.state.storeView || rootStore.state.storeView.storeCode !== storeCode
   if (storeCode) { // current store code
-    if ((storeView = config.storeViews[storeCode])) {
+    const currentStoreView = config.storeViews[storeCode]
+    if (currentStoreView) {
+      storeView = Object.assign({}, currentStoreView);
       storeView.storeCode = storeCode
       rootStore.state.user.current_storecode = storeCode
+    } else {
+      console.warn(`Not found 'storeView' matching the given 'storeCode': ${storeCode}`)
     }
   } else {
     storeView.storeCode = config.defaultStoreCode || ''

core/lib/search/adapter/api/searchAdapter.ts

@@ -80,10 +80,10 @@ export class SearchAdapter {
       },
       body: config.elasticsearch.queryMethod === 'POST' ? JSON.stringify(ElasticsearchQueryBody) : null
     })
-    .then(resp => { return resp.json() })
-    .catch(error => {
-      throw new Error('FetchError in request to ES: ' + error.toString())
-    })
+      .then(resp => { return resp.json() })
+      .catch(error => {
+        throw new Error('FetchError in request to ES: ' + error.toString())
+      })
   }
 
   public handleResult (resp, type, start = 0, size = 50): SearchResponse {

core/modules/catalog/components/Search.ts

@@ -26,7 +26,7 @@ export const Search = {
     }
   },
   beforeDestroy () {
-    localStorage.setItem(`shop/user/searchQuery`, this.search);
+    localStorage.setItem(`shop/user/searchQuery`, this.search ? this.search : '');
   },
   methods: {
     onEscapePress () {

core/modules/catalog/store/category/actions.ts

@@ -138,8 +138,8 @@ const actions: ActionTree<CategoryState, RootState> = {
         if (setCurrentCategory) {
           commit(types.CATEGORY_UPD_CURRENT_CATEGORY, mainCategory)
         }
-        if (populateRequestCacheTags && mainCategory && Vue.prototype.$ssrRequestContext) {
-          Vue.prototype.$ssrRequestContext.output.cacheTags.add(`C${mainCategory.id}`)
+        if (populateRequestCacheTags && mainCategory && Vue.prototype.$cacheTags) {
+          Vue.prototype.$cacheTags.add(`C${mainCategory.id}`)
         }
         if (setCurrentCategoryPath) {
           let currentPath = []

core/modules/catalog/store/product/actions.ts

@@ -294,8 +294,8 @@ const actions: ActionTree<ProductState, RootState> = {
     return quickSearchByQuery({ query, start, size, entityType, sort, excludeFields, includeFields }).then((resp) => {
       if (resp.items && resp.items.length) { // preconfigure products; eg: after filters
         for (let product of resp.items) {
-          if (populateRequestCacheTags && Vue.prototype.$ssrRequestContext) {
-            Vue.prototype.$ssrRequestContext.output.cacheTags.add(`P${product.id}`)
+          if (populateRequestCacheTags && Vue.prototype.$cacheTags) {
+            Vue.prototype.$cacheTags.add(`P${product.id}`);
           }
           product.errors = {} // this is an object to store validation result for custom options and others
           product.info = {}
@@ -307,7 +307,7 @@ const actions: ActionTree<ProductState, RootState> = {
           }
           if (configuration) {
             let selectedVariant = configureProductAsync(context, { product: product, configuration: configuration, selectDefaultVariant: false })
-            Object.assign(product, omit(selectedVariant, ['visibility']))
+            product = Object.assign({}, product, omit(selectedVariant, ['visibility']))
           }
           if (product.url_path) {
             rootStore.dispatch('url/registerMapping', {
@@ -430,7 +430,7 @@ const actions: ActionTree<ProductState, RootState> = {
           // todo: probably a good idea is to change this [0] to specific id
           const selectedVariant = configureProductAsync(context, { product: prod, configuration: { sku: options.childSku }, selectDefaultVariant: selectDefaultVariant, setProductErorrs: true })
           if (selectedVariant && assignDefaultVariant) {
-            prod = Object.assign(prod, selectedVariant)
+            prod = Object.assign({}, prod, selectedVariant)
           }
         } else if (!skipCache || (prod.type_id === 'simple' || prod.type_id === 'downloadable')) {
           if (setCurrentProduct) context.dispatch('setCurrent', prod)

core/modules/catalog/store/product/getters.ts

@@ -1,6 +1,19 @@
+import { PagedProductList } from './../../types/ProductState';
+import { nonReactiveState } from './index';
 import { GetterTree } from 'vuex'
 import RootState from '@vue-storefront/core/types/RootState'
 import ProductState from '../../types/ProductState'
+import cloneDeep from 'lodash-es/cloneDeep'
+
+function mapCategoryProducts (productsFromState, productsData) {
+  return productsFromState.map(prodState => {
+    if (typeof prodState === 'string') {
+      const product = productsData.find(prodData => prodData.sku === prodState)
+      return cloneDeep(product)
+    }
+    return prodState
+  })
+}
 
 const getters: GetterTree<ProductState, RootState> = {
   productParent: (state) => state.parent,
@@ -9,7 +22,8 @@ const getters: GetterTree<ProductState, RootState> = {
   productOriginal: (state) => state.original,
   currentOptions: (state) => state.current_options,
   breadcrumbs: (state) => state.breadcrumbs,
-  productGallery: (state) => state.productGallery
+  productGallery: (state) => state.productGallery,
+  list: (state) => mapCategoryProducts((state.list as PagedProductList).items, nonReactiveState.list)
 }
 
 export default getters

core/modules/catalog/store/product/index.ts

@@ -34,3 +34,7 @@ export const productModule: Module<ProductState, RootState> = {
   actions,
   mutations
 }
+
+export const nonReactiveState = {
+  list: []
+}

core/modules/catalog/store/product/mutations.ts

@@ -1,7 +1,10 @@
+import { isServer } from '@vue-storefront/core/helpers';
+import { nonReactiveState } from './index';
 import Vue from 'vue'
 import { MutationTree } from 'vuex'
 import * as types from './mutation-types'
 import ProductState, { PagedProductList } from '../../types/ProductState'
+import cloneDeep from 'lodash-es/cloneDeep'
 
 const mutations: MutationTree<ProductState> = {
   [types.CATALOG_SET_BREADCRUMBS] (state, payload) {
@@ -29,11 +32,16 @@ const mutations: MutationTree<ProductState> = {
   },
   [types.CATALOG_UPD_PRODUCTS] (state, { products, append }) {
     if (append === false) {
-      state.list = products
+      nonReactiveState.list = cloneDeep(products.items)
+      state.list = isServer ? products : cloneDeep({...products, items: products.items.map(prod => prod.sku)})
     } else {
-      (state.list as PagedProductList).start = products.start as number
-      (state.list as PagedProductList).perPage = products.perPage as number
-      (state.list as PagedProductList).items = (state.list as PagedProductList).items.concat(products.items)
+      const pagedProductList = state.list as PagedProductList
+      pagedProductList.start = products.start as number
+      pagedProductList.perPage = products.perPage as number
+      nonReactiveState.list = cloneDeep(nonReactiveState.list.concat(products.items))
+      pagedProductList.items = isServer
+        ? pagedProductList.items.concat(products.items)
+        : cloneDeep(pagedProductList.items.concat(products.items.map(prod => prod.sku)))
     }
   },
   [types.CATALOG_SET_PRODUCT_CURRENT] (state, product) {

core/modules/url/helpers/index.ts

@@ -59,8 +59,17 @@ export function normalizeUrlPath (url: string): string {
   return url
 }
 
-export function formatCategoryLink (category: { url_path: string, slug: string }): string {
-  return config.seo.useUrlDispatcher ? ('/' + category.url_path) : ('/c/' + category.slug)
+export function formatCategoryLink (category: { url_path: string, slug: string }, storeCode: string = currentStoreView().storeCode): string {
+  storeCode ? storeCode += '/' : storeCode = '';
+
+  if (currentStoreView().appendStoreCode === false) {
+    storeCode = ''
+  }
+
+  if (category) {
+    return config.seo.useUrlDispatcher ? ('/' + storeCode + category.url_path) : ('/' + storeCode + 'c/' + category.slug)
+  }
+  return '/' + storeCode;
 }
 
 export function formatProductLink (

core/pages/Category.js

@@ -29,10 +29,10 @@ export default {
   computed: {
     ...mapGetters('category', ['getCurrentCategory', 'getCurrentCategoryProductQuery', 'getAllCategoryFilters', 'getCategoryBreadcrumbs', 'getCurrentCategoryPath']),
     products () {
-      return this.$store.state.product.list.items
+      return this.$store.getters['product/list']
     },
     productsCounter () {
-      return this.$store.state.product.list.items ? this.$store.state.product.list.items.length : 0
+      return this.products ? this.products.length : 0
     },
     productsTotal () {
       return this.$store.state.product.list.total
@@ -41,7 +41,7 @@ export default {
       return this.getCurrentCategoryProductQuery
     },
     isCategoryEmpty () {
-      return (!(this.$store.state.product.list.items) || this.$store.state.product.list.items.length === 0)
+      return (!(this.products) || this.products.length === 0)
     },
     category () {
       return this.getCurrentCategory