From 496be1635acbef640163807f4f2cfe2e9a2b4af7 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <jrainwater@netatmo.com>
Date: Tue, 12 Feb 2019 15:02:55 +0100
Subject: [PATCH 01/39] Add video data to store and display placeholder with
 play icon in gallery

---
 .../catalog/components/ProductGallery.ts      |  3 ++
 core/modules/catalog/helpers/index.ts         | 13 ++++--
 .../components/core/ProductGallery.vue        | 41 ++++++++++++++++++-
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/core/modules/catalog/components/ProductGallery.ts b/core/modules/catalog/components/ProductGallery.ts
index a08de70f66..be60addbf7 100644
--- a/core/modules/catalog/components/ProductGallery.ts
+++ b/core/modules/catalog/components/ProductGallery.ts
@@ -88,6 +88,9 @@ export const ProductGallery = {
       if (this.isZoomOpen && event.keyCode === 27) {
         this.toggleZoom()
       }
+    },
+    initVideo (video) {
+      console.log(video)
     }
   }
 }
diff --git a/core/modules/catalog/helpers/index.ts b/core/modules/catalog/helpers/index.ts
index 23ceac4308..103e45957c 100644
--- a/core/modules/catalog/helpers/index.ts
+++ b/core/modules/catalog/helpers/index.ts
@@ -533,10 +533,15 @@ export function getMediaGallery (product) {
     if (product.media_gallery) {
         for (let mediaItem of product.media_gallery) {
             if (mediaItem.image) {
-                mediaGallery.push({
-                    'src': getThumbnailPath(mediaItem.image, rootStore.state.config.products.gallery.width, rootStore.state.config.products.gallery.height),
-                    'loading': getThumbnailPath(product.image, 310, 300)
-                })
+                let computedImage = {
+                  'src': getThumbnailPath(mediaItem.image, rootStore.state.config.products.gallery.width, rootStore.state.config.products.gallery.height),
+                  'loading': getThumbnailPath(product.image, 310, 300),
+                  'video': null
+                }
+                if (mediaItem.vid) {
+                  computedImage.video = mediaItem.vid
+                }
+                mediaGallery.push(computedImage)
             }
         }
     }
diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index 1dd2f5af70..b937a8fb77 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -37,7 +37,7 @@
               <slide
                 v-for="images in gallery"
                 :key="images.src">
-                <div class="bg-cl-secondary">
+                <div class="bg-cl-secondary" :class="{'video-container h-100': images.video}">
                   <img
                     class="product-image inline-flex pointer mw-100"
                     v-lazy="images"
@@ -47,6 +47,13 @@
                     data-testid="productGalleryImage"
                     itemprop="image"
                   >
+                  <div
+                    v-if="images.video"
+                    class="gallery-video"
+                    @click="initVideo(images.video)"
+                  >
+                    <i class="material-icons">play_circle_outline</i>
+                  </div>
                 </div>
               </slide>
             </carousel>
@@ -141,6 +148,38 @@ img[lazy=loading] {
     margin: 0 20px 20px 0;
   }
 }
+
+.video-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .gallery-video {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+
+    > .material-icons {
+      position: absolute;
+      left: 0;
+      right: 0;
+      color: #fff;
+      font-size: 120px;
+      top: calc( 50% - 60px);
+      transition: transform ease 0.3s;
+    }
+
+    &:hover {
+      cursor: pointer;
+
+      > .material-icons {
+        transform: scale(1.1);
+      }
+    }
+  }
+}
 </style>
 <style lang="scss">
 .media-gallery {

From f7b9bdbd5582ad46ff941d23729b1adfc9423efe Mon Sep 17 00:00:00 2001
From: Joel Rainwater <jrainwater@netatmo.com>
Date: Wed, 13 Feb 2019 15:39:27 +0100
Subject: [PATCH 02/39] Add video embed for Youtube and Vimeo when click
 placeholder

---
 core/modules/catalog/helpers/index.ts         | 76 +++++++++++++++----
 .../components/core/ProductGallery.vue        | 53 ++++++++++---
 2 files changed, 101 insertions(+), 28 deletions(-)

diff --git a/core/modules/catalog/helpers/index.ts b/core/modules/catalog/helpers/index.ts
index 103e45957c..347ce4edf8 100644
--- a/core/modules/catalog/helpers/index.ts
+++ b/core/modules/catalog/helpers/index.ts
@@ -13,6 +13,7 @@ import i18n from '@vue-storefront/i18n'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { getThumbnailPath } from '@vue-storefront/core/helpers'
 import { Logger } from '@vue-storefront/core/lib/logger'
+import Url from 'url-parse'
 
 function _filterRootProductByStockitem (context, stockItem, product, errorCallback) {
   if (stockItem) {
@@ -529,23 +530,66 @@ export function configureProductAsync (context, { product, configuration, select
  */
 
 export function getMediaGallery (product) {
-    let mediaGallery = []
-    if (product.media_gallery) {
-        for (let mediaItem of product.media_gallery) {
-            if (mediaItem.image) {
-                let computedImage = {
-                  'src': getThumbnailPath(mediaItem.image, rootStore.state.config.products.gallery.width, rootStore.state.config.products.gallery.height),
-                  'loading': getThumbnailPath(product.image, 310, 300),
-                  'video': null
-                }
-                if (mediaItem.vid) {
-                  computedImage.video = mediaItem.vid
-                }
-                mediaGallery.push(computedImage)
-            }
-        }
+  let mediaGallery = []
+  if (product.media_gallery) {
+      for (let mediaItem of product.media_gallery) {
+          if (mediaItem.image) {
+              let computedImage = {
+                'src': getThumbnailPath(mediaItem.image, rootStore.state.config.products.gallery.width, rootStore.state.config.products.gallery.height),
+                'loading': getThumbnailPath(product.image, 310, 300),
+                'video': null
+              }
+              if (mediaItem.vid) {
+                computedImage.video = computeVideoData(mediaItem.vid)
+              }
+              mediaGallery.push(computedImage)
+          }
+      }
+  }
+  return mediaGallery
+}
+
+
+/**
+* Process video data to provide the proper 
+* provider and attributes
+* 
+* @param videoData Object
+*/
+
+function computeVideoData (videoData) {
+  let videoId = '';
+  let type = '';
+  let videoUrl = new Url(videoData.url);
+
+  if (videoUrl.host.match(/youtube\.com/) && videoUrl.search) {
+    videoId = videoUrl.search.split('v=')[1];
+
+    if (videoId) {
+      let ampersandPosition = videoId.indexOf('&');
+
+      if (ampersandPosition === -1) {
+          return videoId;
+      }
+
+      videoId = videoId.substring(0, ampersandPosition);
+      type = 'youtube';
     }
-    return mediaGallery
+  } else if (videoUrl.host.match(/youtube\.com|youtu\.be|youtube-nocookie.com/)) {
+    videoId = videoUrl.pathname.replace(/^\/(embed\/|v\/)?/, '').replace(/\/.*/, '');
+    type = 'youtube';
+  } else if (videoUrl.host.match(/vimeo\.com/)) {
+    type = 'vimeo';
+    let vimeoRegex = new RegExp(['https?:\\/\\/(?:www\\.|player\\.)?vimeo.com\\/(?:channels\\/(?:\\w+\\/)',
+        '?|groups\\/([^\\/]*)\\/videos\\/|album\\/(\\d+)\\/video\\/|video\\/|)(\\d+)(?:$|\\/|\\?)'
+    ].join(''));
+    videoId = videoUrl.href.match(vimeoRegex)[3];
+  }
+  return {
+    ...videoData,
+    type: type,
+    id: videoId
+  }
 }
 
 /**
diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index b937a8fb77..8edc68effe 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -35,10 +35,11 @@
               :speed="carouselTransitionSpeed"
             >
               <slide
-                v-for="images in gallery"
+                v-for="(images, index) in gallery"
                 :key="images.src">
-                <div class="bg-cl-secondary" :class="{'video-container h-100': images.video}">
+                <div class="bg-cl-secondary" :class="{'video-container h-100 flex relative': images.video}">
                   <img
+                    v-show="videoStarted !== index"
                     class="product-image inline-flex pointer mw-100"
                     v-lazy="images"
                     ref="images"
@@ -49,10 +50,26 @@
                   >
                   <div
                     v-if="images.video"
-                    class="gallery-video"
-                    @click="initVideo(images.video)"
+                    v-show="videoStarted !== index"
+                    class="gallery-video absolute w-100 h-100"
+                    @click="videoStarted = index"
                   >
-                    <i class="material-icons">play_circle_outline</i>
+                    <i class="material-icons absolute">play_circle_outline</i>
+                  </div>
+                  <div v-if="videoStarted === index" class="iframe-wrapper absolute w-100">
+                    <div class="iframe-container w-100">
+                      <iframe
+                        v-if="images.video.type === 'vimeo'"
+                        class="absolute w-100 h-100"
+                        :src="`https://player.vimeo.com/video/${images.video.id}?autoplay=1`"
+                        webkitallowfullscreen mozallowfullscreen allowfullscreen/>
+                      <iframe
+                        v-else-if="images.video.type === 'youtube'"
+                        class="absolute w-100 h-100"
+                        :src="`https://www.youtube.com/embed/${images.video.id}?autoplay=1`"
+                        allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+                        webkitallowfullscreen mozallowfullscreen allowfullscreen/>
+                    </div>
                   </div>
                 </div>
               </slide>
@@ -86,12 +103,16 @@ export default {
   data () {
     return {
       loaded: true,
-      carouselTransitionSpeed: 0
+      carouselTransitionSpeed: 0,
+      videoStarted: null
     }
   },
   methods: {
     validateRoute () {
       this.$forceUpdate()
+    },
+    clearVideo () {
+      this.videoStarted = null
     }
   }
 }
@@ -150,19 +171,13 @@ img[lazy=loading] {
 }
 
 .video-container {
-  position: relative;
-  display: flex;
   align-items: center;
   justify-content: center;
 
   .gallery-video {
-    position: absolute;
-    width: 100%;
-    height: 100%;
     top: 0;
 
     > .material-icons {
-      position: absolute;
       left: 0;
       right: 0;
       color: #fff;
@@ -179,6 +194,20 @@ img[lazy=loading] {
       }
     }
   }
+
+  .iframe-wrapper {
+    left: 0;
+
+    .iframe-container {
+      padding-top: 56.25%;
+
+      iframe {
+        top: 0;
+        left: 0;
+        border: none;
+      }
+    }
+  }
 }
 </style>
 <style lang="scss">

From baf01684ff69241952b89ba5e8e170696ee07095 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <jrainwater@netatmo.com>
Date: Wed, 13 Feb 2019 16:06:50 +0100
Subject: [PATCH 03/39] clear video on carousel pageChange

---
 src/themes/default/components/core/ProductGallery.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index 8edc68effe..2e99432771 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -33,6 +33,7 @@
               navigation-prev-label="<i class='material-icons p15 cl-bg-tertiary pointer'>keyboard_arrow_left</i>"
               ref="carousel"
               :speed="carouselTransitionSpeed"
+              @pageChange="clearVideo"
             >
               <slide
                 v-for="(images, index) in gallery"

From 8752c63135f947d79994fc2f37b92e3ecf4a1e59 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <jrainwater@netatmo.com>
Date: Wed, 13 Feb 2019 16:07:26 +0100
Subject: [PATCH 04/39] Add scoped loader component to be used for video
 loading

---
 .../default/components/core/LoaderScoped.vue  | 89 +++++++++++++++++++
 .../components/core/ProductGallery.vue        | 21 ++++-
 2 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 src/themes/default/components/core/LoaderScoped.vue

diff --git a/src/themes/default/components/core/LoaderScoped.vue b/src/themes/default/components/core/LoaderScoped.vue
new file mode 100644
index 0000000000..9e42aaa553
--- /dev/null
+++ b/src/themes/default/components/core/LoaderScoped.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="loader-container absolute">
+    <div class="loader-inner-container absolute">
+      <div class="spinner relative">
+        <div class="double-bounce1 absolute w-100 brdr-circle bg-cl-th-success"/>
+        <div class="double-bounce2 absolute w-100 brdr-circle bg-cl-th-success"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'LoaderScoped'
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~theme/css/base/global_vars';
+@import '~theme/css/variables/colors';
+@import '~theme/css/helpers/functions/color';
+$color-container-bg: color(black);
+$color-message-bg: color(success);
+$z-index-loader: map-get($z-index, loader);
+
+.loader-container {
+  z-index: $z-index-loader;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba($color-container-bg, 0.65);
+}
+
+.loader-inner-container {
+  left: 50%;
+  top: 50%;
+  transform: translateY(-50%) translateX(-50%);
+}
+
+.loader-message-container {
+  background-color: rgba($color-message-bg, 0.75);
+  border-radius: 50px;
+  letter-spacing: 0.5px;
+}
+
+.spinner {
+  width: 40px;
+  height: 40px;
+  margin: 0 auto;
+}
+
+.double-bounce1,
+.double-bounce2 {
+  height: 100%;
+  opacity: 0.6;
+  top: 0;
+  left: 0;
+  -webkit-animation: sk-bounce 2s infinite ease-in-out;
+  animation: sk-bounce 2s infinite ease-in-out;
+}
+
+.double-bounce2 {
+  -webkit-animation-delay: -1s;
+  animation-delay: -1s;
+}
+
+@-webkit-keyframes sk-bounce {
+  0%,
+  100% {
+    -webkit-transform: scale(0);
+  }
+  50% {
+    -webkit-transform: scale(1);
+  }
+}
+
+@keyframes sk-bounce {
+  0%,
+  100% {
+    transform: scale(0);
+    -webkit-transform: scale(0);
+  }
+  50% {
+    transform: scale(1);
+    -webkit-transform: scale(1);
+  }
+}
+</style>
diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index 2e99432771..8637d79d9a 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -58,18 +58,21 @@
                     <i class="material-icons absolute">play_circle_outline</i>
                   </div>
                   <div v-if="videoStarted === index" class="iframe-wrapper absolute w-100">
+                    <LoaderScoped v-if="!iframeLoaded"/>
                     <div class="iframe-container w-100">
                       <iframe
                         v-if="images.video.type === 'vimeo'"
                         class="absolute w-100 h-100"
                         :src="`https://player.vimeo.com/video/${images.video.id}?autoplay=1`"
-                        webkitallowfullscreen mozallowfullscreen allowfullscreen/>
+                        webkitallowfullscreen mozallowfullscreen allowfullscreen
+                        @load="iframeIsLoaded()"/>
                       <iframe
                         v-else-if="images.video.type === 'youtube'"
                         class="absolute w-100 h-100"
                         :src="`https://www.youtube.com/embed/${images.video.id}?autoplay=1`"
                         allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
-                        webkitallowfullscreen mozallowfullscreen allowfullscreen/>
+                        webkitallowfullscreen mozallowfullscreen allowfullscreen
+                        @load="iframeIsLoaded()"/>
                     </div>
                   </div>
                 </div>
@@ -87,6 +90,7 @@
 </template>
 
 <script>
+import LoaderScoped from 'theme/components/core/LoaderScoped.vue'
 import { ProductGallery } from '@vue-storefront/core/modules/catalog/components/ProductGallery.ts'
 import ProductGalleryZoom from './ProductGalleryZoom'
 import NoSSR from 'vue-no-ssr'
@@ -95,7 +99,8 @@ import VueOfflineMixin from 'vue-offline/mixin'
 export default {
   components: {
     'no-ssr': NoSSR,
-    ProductGalleryZoom
+    ProductGalleryZoom,
+    LoaderScoped
   },
   mixins: [ProductGallery, VueOfflineMixin],
   watch: {
@@ -105,15 +110,23 @@ export default {
     return {
       loaded: true,
       carouselTransitionSpeed: 0,
-      videoStarted: null
+      videoStarted: null,
+      iframeLoaded: false
     }
   },
   methods: {
     validateRoute () {
       this.$forceUpdate()
     },
+    initVideo (index) {
+      this.videoStarted = index
+    },
     clearVideo () {
       this.videoStarted = null
+      this.iframeLoaded = false
+    },
+    iframeIsLoaded () {
+      this.iframeLoaded = true
     }
   }
 }

From ab4aa73b6ab63dbc60c8cd30ed3fc2b17c2d5b31 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <jrainwater@netatmo.com>
Date: Thu, 14 Feb 2019 10:07:55 +0100
Subject: [PATCH 05/39] Removed unnecessary function

---
 core/modules/catalog/components/ProductGallery.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/modules/catalog/components/ProductGallery.ts b/core/modules/catalog/components/ProductGallery.ts
index be60addbf7..a08de70f66 100644
--- a/core/modules/catalog/components/ProductGallery.ts
+++ b/core/modules/catalog/components/ProductGallery.ts
@@ -88,9 +88,6 @@ export const ProductGallery = {
       if (this.isZoomOpen && event.keyCode === 27) {
         this.toggleZoom()
       }
-    },
-    initVideo (video) {
-      console.log(video)
     }
   }
 }

From 8df0e385f2cab48f2e875190d98afed24c7d39d2 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <jrainwater@netatmo.com>
Date: Thu, 14 Feb 2019 16:17:23 +0100
Subject: [PATCH 06/39] Cleaned up video data computations

---
 core/modules/catalog/helpers/index.ts | 62 ++++++++++++---------------
 1 file changed, 27 insertions(+), 35 deletions(-)

diff --git a/core/modules/catalog/helpers/index.ts b/core/modules/catalog/helpers/index.ts
index 347ce4edf8..a1dd7e9ea0 100644
--- a/core/modules/catalog/helpers/index.ts
+++ b/core/modules/catalog/helpers/index.ts
@@ -14,6 +14,9 @@ import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { getThumbnailPath } from '@vue-storefront/core/helpers'
 import { Logger } from '@vue-storefront/core/lib/logger'
 import Url from 'url-parse'
+// import queryString from 'querystring'
+import queryString from 'qs'
+import { url } from 'inspector';
 
 function _filterRootProductByStockitem (context, stockItem, product, errorCallback) {
   if (stockItem) {
@@ -534,15 +537,11 @@ export function getMediaGallery (product) {
   if (product.media_gallery) {
       for (let mediaItem of product.media_gallery) {
           if (mediaItem.image) {
-              let computedImage = {
+              mediaGallery.push({
                 'src': getThumbnailPath(mediaItem.image, rootStore.state.config.products.gallery.width, rootStore.state.config.products.gallery.height),
                 'loading': getThumbnailPath(product.image, 310, 300),
-                'video': null
-              }
-              if (mediaItem.vid) {
-                computedImage.video = computeVideoData(mediaItem.vid)
-              }
-              mediaGallery.push(computedImage)
+                'video': computeVideoData(mediaItem)
+              })
           }
       }
   }
@@ -552,41 +551,34 @@ export function getMediaGallery (product) {
 
 /**
 * Process video data to provide the proper 
-* provider and attributes
+* provider and attributes.
+* Currently supports YouTube and Vimeo
 * 
-* @param videoData Object
+* @param mediaItem Object
 */
 
-function computeVideoData (videoData) {
-  let videoId = '';
-  let type = '';
-  let videoUrl = new Url(videoData.url);
-
-  if (videoUrl.host.match(/youtube\.com/) && videoUrl.search) {
-    videoId = videoUrl.search.split('v=')[1];
-
-    if (videoId) {
-      let ampersandPosition = videoId.indexOf('&');
-
-      if (ampersandPosition === -1) {
-          return videoId;
-      }
+function computeVideoData (mediaItem) {
+  if (!mediaItem.vid || !mediaItem.vid.url) {
+    return null
+  }
 
-      videoId = videoId.substring(0, ampersandPosition);
-      type = 'youtube';
-    }
-  } else if (videoUrl.host.match(/youtube\.com|youtu\.be|youtube-nocookie.com/)) {
-    videoId = videoUrl.pathname.replace(/^\/(embed\/|v\/)?/, '').replace(/\/.*/, '');
-    type = 'youtube';
-  } else if (videoUrl.host.match(/vimeo\.com/)) {
-    type = 'vimeo';
-    let vimeoRegex = new RegExp(['https?:\\/\\/(?:www\\.|player\\.)?vimeo.com\\/(?:channels\\/(?:\\w+\\/)',
+  let videoId = null,
+      type = null,
+      youtubeRegex = /^(?:https?:\/\/)?(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})(?:\S+)?$/,
+      vimeoRegex = new RegExp(['https?:\\/\\/(?:www\\.|player\\.)?vimeo.com\\/(?:channels\\/(?:\\w+\\/)',
         '?|groups\\/([^\\/]*)\\/videos\\/|album\\/(\\d+)\\/video\\/|video\\/|)(\\d+)(?:$|\\/|\\?)'
-    ].join(''));
-    videoId = videoUrl.href.match(vimeoRegex)[3];
+      ].join(''));
+  
+  if (mediaItem.vid.url.match(youtubeRegex)) {
+    videoId = RegExp.$1
+    type = 'youtube'
+  } else if (mediaItem.vid.url.match(vimeoRegex)) {
+    videoId = RegExp.$3
+    type = 'vimeo'
   }
+
   return {
-    ...videoData,
+    ...mediaItem.vid,
     type: type,
     id: videoId
   }

From 385d52610f82dc04125f9c053a7409d993364e1a Mon Sep 17 00:00:00 2001
From: Joel Rainwater <jrainwater@netatmo.com>
Date: Thu, 14 Feb 2019 16:17:39 +0100
Subject: [PATCH 07/39] Moved product video to separate component

---
 .../catalog/components/ProductGallery.ts      |  6 +-
 .../catalog/components/ProductVideo.ts        | 48 ++++++++++
 .../components/core/ProductGallery.vue        | 90 ++++---------------
 .../default/components/core/ProductVideo.vue  | 76 ++++++++++++++++
 4 files changed, 144 insertions(+), 76 deletions(-)
 create mode 100644 core/modules/catalog/components/ProductVideo.ts
 create mode 100644 src/themes/default/components/core/ProductVideo.vue

diff --git a/core/modules/catalog/components/ProductGallery.ts b/core/modules/catalog/components/ProductGallery.ts
index a08de70f66..8de9e11d4b 100644
--- a/core/modules/catalog/components/ProductGallery.ts
+++ b/core/modules/catalog/components/ProductGallery.ts
@@ -28,7 +28,8 @@ export const ProductGallery = {
   },
   data () {
     return {
-      isZoomOpen: false
+      isZoomOpen: false,
+      currentPage: 0
     }
   },
   beforeMount () {
@@ -88,6 +89,9 @@ export const ProductGallery = {
       if (this.isZoomOpen && event.keyCode === 27) {
         this.toggleZoom()
       }
+    },
+    pageChange (index) {
+      this.currentPage = index
     }
   }
 }
diff --git a/core/modules/catalog/components/ProductVideo.ts b/core/modules/catalog/components/ProductVideo.ts
new file mode 100644
index 0000000000..5796831961
--- /dev/null
+++ b/core/modules/catalog/components/ProductVideo.ts
@@ -0,0 +1,48 @@
+export const ProductVideo = {
+  name: 'ProductVideo',
+  props: {
+    url: {
+      type: String,
+      required: true
+    },
+    id: {
+      type: String,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    index: {
+      type: Number,
+      required: false
+    }
+  },
+  data () {
+    return {
+      videoStarted: false,
+      iframeLoaded: false
+    }
+  },
+  methods: {
+    initVideo () {
+      this.videoStarted = true
+      this.$emit('video-started', this.index)
+    },
+    iframeIsLoaded () {
+      this.iframeLoaded = true
+    }
+  },
+  computed: {
+    embedUrl () {
+      switch (this.type) {
+        case "youtube":
+          return `https://www.youtube.com/embed/${this.id}?autoplay=1`
+        case "vimeo":
+          return `https://player.vimeo.com/video/${this.id}?autoplay=1`
+        default:
+          return
+      }
+    }
+  }
+}
diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index 8637d79d9a..bf8b8aa344 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -33,14 +33,14 @@
               navigation-prev-label="<i class='material-icons p15 cl-bg-tertiary pointer'>keyboard_arrow_left</i>"
               ref="carousel"
               :speed="carouselTransitionSpeed"
-              @pageChange="clearVideo"
+              @pageChange="pageChange"
             >
               <slide
                 v-for="(images, index) in gallery"
                 :key="images.src">
                 <div class="bg-cl-secondary" :class="{'video-container h-100 flex relative': images.video}">
                   <img
-                    v-show="videoStarted !== index"
+                    v-show="hideImage !== index"
                     class="product-image inline-flex pointer mw-100"
                     v-lazy="images"
                     ref="images"
@@ -49,32 +49,11 @@
                     data-testid="productGalleryImage"
                     itemprop="image"
                   >
-                  <div
-                    v-if="images.video"
-                    v-show="videoStarted !== index"
-                    class="gallery-video absolute w-100 h-100"
-                    @click="videoStarted = index"
-                  >
-                    <i class="material-icons absolute">play_circle_outline</i>
-                  </div>
-                  <div v-if="videoStarted === index" class="iframe-wrapper absolute w-100">
-                    <LoaderScoped v-if="!iframeLoaded"/>
-                    <div class="iframe-container w-100">
-                      <iframe
-                        v-if="images.video.type === 'vimeo'"
-                        class="absolute w-100 h-100"
-                        :src="`https://player.vimeo.com/video/${images.video.id}?autoplay=1`"
-                        webkitallowfullscreen mozallowfullscreen allowfullscreen
-                        @load="iframeIsLoaded()"/>
-                      <iframe
-                        v-else-if="images.video.type === 'youtube'"
-                        class="absolute w-100 h-100"
-                        :src="`https://www.youtube.com/embed/${images.video.id}?autoplay=1`"
-                        allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
-                        webkitallowfullscreen mozallowfullscreen allowfullscreen
-                        @load="iframeIsLoaded()"/>
-                    </div>
-                  </div>
+                  <product-video
+                    v-if="images.video && (index === currentPage)"
+                    v-bind="images.video"
+                    :index="index"
+                    @video-started="onVideoStarted"/>
                 </div>
               </slide>
             </carousel>
@@ -90,9 +69,9 @@
 </template>
 
 <script>
-import LoaderScoped from 'theme/components/core/LoaderScoped.vue'
 import { ProductGallery } from '@vue-storefront/core/modules/catalog/components/ProductGallery.ts'
 import ProductGalleryZoom from './ProductGalleryZoom'
+import ProductVideo from './ProductVideo'
 import NoSSR from 'vue-no-ssr'
 import VueOfflineMixin from 'vue-offline/mixin'
 
@@ -100,7 +79,7 @@ export default {
   components: {
     'no-ssr': NoSSR,
     ProductGalleryZoom,
-    LoaderScoped
+    ProductVideo
   },
   mixins: [ProductGallery, VueOfflineMixin],
   watch: {
@@ -110,23 +89,19 @@ export default {
     return {
       loaded: true,
       carouselTransitionSpeed: 0,
-      videoStarted: null,
-      iframeLoaded: false
+      hideImage: null
     }
   },
   methods: {
     validateRoute () {
       this.$forceUpdate()
     },
-    initVideo (index) {
-      this.videoStarted = index
-    },
-    clearVideo () {
-      this.videoStarted = null
-      this.iframeLoaded = false
+    onVideoStarted (index) {
+      this.hideImage = index
     },
-    iframeIsLoaded () {
-      this.iframeLoaded = true
+    pageChange (index) {
+      this.hideImage = null
+      this.currentPage = index
     }
   }
 }
@@ -187,41 +162,6 @@ img[lazy=loading] {
 .video-container {
   align-items: center;
   justify-content: center;
-
-  .gallery-video {
-    top: 0;
-
-    > .material-icons {
-      left: 0;
-      right: 0;
-      color: #fff;
-      font-size: 120px;
-      top: calc( 50% - 60px);
-      transition: transform ease 0.3s;
-    }
-
-    &:hover {
-      cursor: pointer;
-
-      > .material-icons {
-        transform: scale(1.1);
-      }
-    }
-  }
-
-  .iframe-wrapper {
-    left: 0;
-
-    .iframe-container {
-      padding-top: 56.25%;
-
-      iframe {
-        top: 0;
-        left: 0;
-        border: none;
-      }
-    }
-  }
 }
 </style>
 <style lang="scss">
diff --git a/src/themes/default/components/core/ProductVideo.vue b/src/themes/default/components/core/ProductVideo.vue
new file mode 100644
index 0000000000..d1bd369760
--- /dev/null
+++ b/src/themes/default/components/core/ProductVideo.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="product-video absolute w-100 h-100 flex">
+    <div
+      v-show="!videoStarted"
+      class="gallery-video absolute w-100 h-100"
+      @click="initVideo"
+    >
+      <i class="material-icons absolute">play_circle_outline</i>
+    </div>
+    <div v-if="videoStarted" class="iframe-wrapper absolute w-100">
+      <LoaderScoped v-if="!iframeLoaded"/>
+      <div class="iframe-container w-100">
+        <iframe
+          :src="embedUrl"
+          class="absolute w-100 h-100"
+          allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+          webkitallowfullscreen mozallowfullscreen allowfullscreen
+          @load="iframeIsLoaded()"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import LoaderScoped from 'theme/components/core/LoaderScoped.vue'
+import { ProductVideo } from '@vue-storefront/core/modules/catalog/components/ProductVideo.ts'
+
+export default {
+  components: {
+    LoaderScoped
+  },
+  mixins: [ProductVideo]
+}
+</script>
+
+<style lang="scss" scoped>
+.product-video {
+  align-items: center;
+  justify-content: center;
+
+  .gallery-video {
+    top: 0;
+
+    > .material-icons {
+      left: 0;
+      right: 0;
+      color: #fff;
+      font-size: 120px;
+      top: calc( 50% - 60px);
+      transition: transform ease 0.3s;
+    }
+
+    &:hover {
+      cursor: pointer;
+
+      > .material-icons {
+        transform: scale(1.1);
+      }
+    }
+  }
+
+  .iframe-wrapper {
+    left: 0;
+
+    .iframe-container {
+      padding-top: 56.25%;
+
+      iframe {
+        top: 0;
+        left: 0;
+        border: none;
+      }
+    }
+  }
+}
+</style>

From ce5811894db46a7b380838d83d5997305b8f6967 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <jrainwater@netatmo.com>
Date: Thu, 14 Feb 2019 17:29:25 +0100
Subject: [PATCH 08/39] Moved video url parsing logic to data import

---
 core/modules/catalog/helpers/index.ts | 42 +--------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/core/modules/catalog/helpers/index.ts b/core/modules/catalog/helpers/index.ts
index a1dd7e9ea0..7e38ec5a9c 100644
--- a/core/modules/catalog/helpers/index.ts
+++ b/core/modules/catalog/helpers/index.ts
@@ -13,10 +13,6 @@ import i18n from '@vue-storefront/i18n'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { getThumbnailPath } from '@vue-storefront/core/helpers'
 import { Logger } from '@vue-storefront/core/lib/logger'
-import Url from 'url-parse'
-// import queryString from 'querystring'
-import queryString from 'qs'
-import { url } from 'inspector';
 
 function _filterRootProductByStockitem (context, stockItem, product, errorCallback) {
   if (stockItem) {
@@ -540,7 +536,7 @@ export function getMediaGallery (product) {
               mediaGallery.push({
                 'src': getThumbnailPath(mediaItem.image, rootStore.state.config.products.gallery.width, rootStore.state.config.products.gallery.height),
                 'loading': getThumbnailPath(product.image, 310, 300),
-                'video': computeVideoData(mediaItem)
+                'video': mediaItem.vid
               })
           }
       }
@@ -548,42 +544,6 @@ export function getMediaGallery (product) {
   return mediaGallery
 }
 
-
-/**
-* Process video data to provide the proper 
-* provider and attributes.
-* Currently supports YouTube and Vimeo
-* 
-* @param mediaItem Object
-*/
-
-function computeVideoData (mediaItem) {
-  if (!mediaItem.vid || !mediaItem.vid.url) {
-    return null
-  }
-
-  let videoId = null,
-      type = null,
-      youtubeRegex = /^(?:https?:\/\/)?(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})(?:\S+)?$/,
-      vimeoRegex = new RegExp(['https?:\\/\\/(?:www\\.|player\\.)?vimeo.com\\/(?:channels\\/(?:\\w+\\/)',
-        '?|groups\\/([^\\/]*)\\/videos\\/|album\\/(\\d+)\\/video\\/|video\\/|)(\\d+)(?:$|\\/|\\?)'
-      ].join(''));
-  
-  if (mediaItem.vid.url.match(youtubeRegex)) {
-    videoId = RegExp.$1
-    type = 'youtube'
-  } else if (mediaItem.vid.url.match(vimeoRegex)) {
-    videoId = RegExp.$3
-    type = 'vimeo'
-  }
-
-  return {
-    ...mediaItem.vid,
-    type: type,
-    id: videoId
-  }
-}
-
 /**
  * Get configurable_children images from product if any
  * otherwise get attribute images

From b97949343fbdbdf0e7be71345643355a75ffdba2 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <joel.rainwater@netatmo.com>
Date: Mon, 18 Feb 2019 12:31:11 +0100
Subject: [PATCH 09/39] Added video support in Product Gallery component entry
 in CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5dc789243..11c22f1f0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved docs at contributing.md and configuration.md (spelling etc.) - @ruthgeridema (#2421, #2422, #2423, #2425, #2426)
 - Fixed design issue of Country label on Edge 17 & Firefox - @ananth-iyer (#2390,#2399)
 - Country field is filled by first counry from the list in cart in paymen section - @RakowskiPrzemyslaw (#2428)
+- Added video support in Product Gallery component. - @rain2o (#2433)
 
 ## [1.8.2] - 2019.02.11
 - Fixed docker-compose configuration for network_mode and TS build config - @lukeromanowicz (#2415)

From 076cb296d00d62662c7a48746ba7c94522f55ed9 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <joel.rainwater@netatmo.com>
Date: Tue, 19 Feb 2019 11:32:49 +0100
Subject: [PATCH 10/39] Added product video component to zoom carousel

---
 .../core/ProductGalleryZoomCarousel.vue       | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/themes/default/components/core/ProductGalleryZoomCarousel.vue b/src/themes/default/components/core/ProductGalleryZoomCarousel.vue
index fbe2492332..a20bf8f3f2 100644
--- a/src/themes/default/components/core/ProductGalleryZoomCarousel.vue
+++ b/src/themes/default/components/core/ProductGalleryZoomCarousel.vue
@@ -20,12 +20,15 @@
           ref="zoomCarousel"
           class="media-zoom-carousel__carousel"
           :speed="carouselTransitionSpeed"
+          @pageChange="pageChange"
         >
           <slide
-            v-for="images in gallery"
+            v-for="(images, index) in gallery"
             :key="images.src">
-            <div class="media-zoom-carousel__slide  bg-cl-secondary">
+            <div class="media-zoom-carousel__slide  bg-cl-secondary"
+                 :class="{'video-container h-100 flex relative': images.video}">
               <img
+                v-show="hideImage !== index"
                 class="product-image inline-flex pointer mw-100"
                 v-lazy="images"
                 ref="images"
@@ -33,6 +36,11 @@
                 data-testid="productGalleryImage"
                 itemprop="image"
               >
+              <product-video
+                v-if="images.video && (index === currentPage)"
+                v-bind="images.video"
+                :index="index"
+                @video-started="onVideoStarted"/>
             </div>
           </slide>
         </carousel>
@@ -43,6 +51,7 @@
 
 <script>
 import { Carousel, Slide } from 'vue-carousel'
+import ProductVideo from './ProductVideo'
 
 export default {
   name: 'ProductGalleryZoomCarousel',
@@ -63,12 +72,15 @@ export default {
   },
   data () {
     return {
-      carouselTransitionSpeed: 300
+      carouselTransitionSpeed: 300,
+      currentPage: 0,
+      hideImage: null
     }
   },
   components: {
     Carousel,
-    Slide
+    Slide,
+    ProductVideo
   },
   mounted () {
     this.navigate(this.currentSlide)
@@ -89,6 +101,13 @@ export default {
     },
     increaseCarouselTransitionSpeed () {
       this.carouselTransitionSpeed = 500
+    },
+    pageChange (index) {
+      this.currentPage = index
+      this.hideImage = null
+    },
+    onVideoStarted (index) {
+      this.hideImage = index
     }
   }
 }
@@ -191,6 +210,11 @@ export default {
   }
 
 }
+
+.video-container {
+  align-items: center;
+  justify-content: center;
+}
 </style>
 
 <style lang="scss">

From 6995f88dab30cbd2a10dcd6874891f6566124320 Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Wed, 20 Feb 2019 09:55:14 +0100
Subject: [PATCH 11/39] depreciate @vue-storefront/store

---
 CHANGELOG.md                                  |  4 ++++
 core/app.ts                                   |  2 +-
 core/build/webpack.base.config.ts             |  2 +-
 core/client-entry.ts                          |  4 ++--
 .../components/blocks/Microcart/Product.js    |  2 +-
 core/compatibility/plugins/config/index.js    |  2 +-
 core/helpers/index.ts                         |  2 +-
 core/helpers/initCacheStorage.ts              |  4 ++--
 core/lib/module/index.ts                      |  2 +-
 core/lib/search.ts                            |  2 +-
 .../adapter/api/elasticsearch/mapping.js      |  2 +-
 core/lib/search/adapter/api/searchAdapter.ts  |  2 +-
 .../adapter/graphql/processor/processType.ts  |  2 +-
 .../search/adapter/graphql/searchAdapter.ts   |  2 +-
 core/lib/sync/index.ts                        |  4 ++--
 core/lib/sync/task.ts                         |  6 ++---
 core/modules/breadcrumbs/helpers/index.ts     |  2 +-
 core/modules/cart/hooks/beforeRegistration.ts |  2 +-
 core/modules/cart/store/actions.ts            |  2 +-
 core/modules/cart/store/mutations.ts          |  2 +-
 .../catalog/components/ProductBundleOption.ts |  2 +-
 .../components/ProductBundleOptions.ts        |  2 +-
 .../components/ProductCustomOptions.ts        |  2 +-
 core/modules/catalog/helpers/index.ts         |  2 +-
 .../catalog/hooks/beforeRegistration.ts       |  2 +-
 core/modules/catalog/queries/common.js        |  2 +-
 core/modules/catalog/queries/related.js       |  2 +-
 core/modules/catalog/queries/searchPanel.js   |  2 +-
 .../catalog/store/attribute/actions.ts        |  2 +-
 .../catalog/store/attribute/mutations.ts      |  2 +-
 .../modules/catalog/store/category/actions.ts |  4 ++--
 .../catalog/store/category/mutations.ts       |  4 ++--
 core/modules/catalog/store/product/actions.ts |  4 ++--
 core/modules/catalog/store/stock/actions.ts   |  2 +-
 core/modules/catalog/store/tax/mutations.ts   |  2 +-
 .../checkout/hooks/beforeRegistration.ts      |  2 +-
 .../checkout/store/checkout/actions.ts        |  2 +-
 core/modules/checkout/store/payment/index.ts  |  2 +-
 core/modules/cms/hooks/beforeRegistration.ts  |  2 +-
 .../compare/hooks/beforeRegistration.ts       |  2 +-
 core/modules/compare/store/actions.ts         |  4 ++--
 .../offline-order/components/CancelOrders.ts  |  4 ++--
 .../helpers/onNetworkStatusChange.ts          |  4 ++--
 .../modules/order/hooks/beforeRegistration.ts |  2 +-
 core/modules/order/store/actions.ts           |  2 +-
 core/modules/order/store/mutations.ts         |  4 ++--
 core/modules/review/store/actions.ts          |  2 +-
 core/modules/user/hooks/beforeRegistration.ts |  2 +-
 core/modules/user/router/beforeEach.ts        |  2 +-
 core/modules/user/store/actions.ts            |  2 +-
 core/modules/wishlist/store/actions.ts        |  4 ++--
 core/package.json                             |  1 -
 core/pages/Category.js                        |  2 +-
 core/pages/Checkout.js                        |  2 +-
 core/pages/Product.js                         |  2 +-
 core/store/package.json                       | 23 -------------------
 docs/guide/data/data.md                       |  2 +-
 docs/guide/integrations/payment-gateway.md    |  2 +-
 docs/guide/upgrade-notes/README.md            |  4 ++--
 docs/guide/vuex/introduction.md               |  2 +-
 package.json                                  |  2 +-
 .../claims/hooks/beforeRegistration.ts        |  2 +-
 .../droppoint-shipping/store/actions.ts       |  2 +-
 .../magento-2-cms/components/CmsData.vue      |  2 +-
 .../hooks/afterRegistration.ts                |  2 +-
 .../components/core/ProductTile.vue           |  2 +-
 .../default/components/core/ColorSelector.vue |  2 +-
 .../core/ProductGalleryCarousel.vue           |  2 +-
 .../default/components/core/ProductTile.vue   |  2 +-
 .../core/blocks/Microcart/Product.vue         |  2 +-
 .../core/blocks/Product/Related.vue           |  2 +-
 .../core/blocks/Switcher/Language.vue         |  2 +-
 72 files changed, 87 insertions(+), 107 deletions(-)
 delete mode 100644 core/store/package.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5dc789243..6d2967934c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed design issue of Country label on Edge 17 & Firefox - @ananth-iyer (#2390,#2399)
 - Country field is filled by first counry from the list in cart in paymen section - @RakowskiPrzemyslaw (#2428)
 
+
+### Depreciated / Removed
+- `@vue-storefront/store` package depreciated - @filrak
+
 ## [1.8.2] - 2019.02.11
 - Fixed docker-compose configuration for network_mode and TS build config - @lukeromanowicz (#2415)
 
diff --git a/core/app.ts b/core/app.ts
index d1b8f6a2be..6bcaa6b707 100755
--- a/core/app.ts
+++ b/core/app.ts
@@ -29,7 +29,7 @@ import * as corePlugins from '@vue-storefront/core/compatibility/plugins'
 
 import { once } from '@vue-storefront/core/helpers'
 import { takeOverConsole } from '@vue-storefront/core/helpers/log'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 
 import { enabledModules } from './modules-entry'
 
diff --git a/core/build/webpack.base.config.ts b/core/build/webpack.base.config.ts
index b37219f6d3..7dd3b43651 100644
--- a/core/build/webpack.base.config.ts
+++ b/core/build/webpack.base.config.ts
@@ -110,7 +110,7 @@ export default {
       'theme/resource': themeResources,
 
       // Backward compatible
-      '@vue-storefront/store/lib/multistore' : path.resolve(__dirname, '../lib/multistore.ts'),
+      '@vue-storefront/core/store/lib/multistore' : path.resolve(__dirname, '../lib/multistore.ts'),
     }
   },
   module: {
diff --git a/core/client-entry.ts b/core/client-entry.ts
index 63d131c53c..c51b7204f8 100755
--- a/core/client-entry.ts
+++ b/core/client-entry.ts
@@ -4,11 +4,11 @@ import union from 'lodash-es/union'
 
 import { createApp } from '@vue-storefront/core/app'
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus/index'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 
 import buildTimeConfig from 'config'
 import { execute } from '@vue-storefront/core/lib/sync/task'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import i18n from '@vue-storefront/i18n'
 import { prepareStoreView, storeCodeFromRoute, currentStoreView, localizedRoute } from '@vue-storefront/core/lib/multistore'
 import { onNetworkStatusChange } from '@vue-storefront/core/modules/offline-order/helpers/onNetworkStatusChange'
diff --git a/core/compatibility/components/blocks/Microcart/Product.js b/core/compatibility/components/blocks/Microcart/Product.js
index 765f411506..fbed21185f 100644
--- a/core/compatibility/components/blocks/Microcart/Product.js
+++ b/core/compatibility/components/blocks/Microcart/Product.js
@@ -1,4 +1,4 @@
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { MicrocartProduct } from '@vue-storefront/core/modules/cart/components/Product.ts'
 import i18n from '@vue-storefront/i18n'
 
diff --git a/core/compatibility/plugins/config/index.js b/core/compatibility/plugins/config/index.js
index 725380dbc2..d9b61aade7 100644
--- a/core/compatibility/plugins/config/index.js
+++ b/core/compatibility/plugins/config/index.js
@@ -1,4 +1,4 @@
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 const config = store.state.config
 // deprecated, use vuex store instead
 const ConfigPlugin = {
diff --git a/core/helpers/index.ts b/core/helpers/index.ts
index d18f70a954..6b117ca29e 100644
--- a/core/helpers/index.ts
+++ b/core/helpers/index.ts
@@ -1,4 +1,4 @@
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
 import { remove as removeAccents } from 'remove-accents'
 import { Logger } from '@vue-storefront/core/lib/logger'
diff --git a/core/helpers/initCacheStorage.ts b/core/helpers/initCacheStorage.ts
index f8ca2729a4..85f973ffaa 100644
--- a/core/helpers/initCacheStorage.ts
+++ b/core/helpers/initCacheStorage.ts
@@ -1,7 +1,7 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 
 /** Inits cache storage for given module. By default via local storage */
 export function initCacheStorage(key, localised = true) {
diff --git a/core/lib/module/index.ts b/core/lib/module/index.ts
index 63a9453e4c..85e5da1fa1 100644
--- a/core/lib/module/index.ts
+++ b/core/lib/module/index.ts
@@ -2,7 +2,7 @@ import { Module } from 'vuex'
 import { RouteConfig, NavigationGuard } from 'vue-router'
 import Vue from 'vue'
 import merge from 'lodash-es/merge'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { Logger } from '@vue-storefront/core/lib/logger'
 import { setupMultistoreRoutes } from '..//multistore'
 import { router } from '@vue-storefront/core/app'
diff --git a/core/lib/search.ts b/core/lib/search.ts
index 774920bb82..2d6a0959e1 100644
--- a/core/lib/search.ts
+++ b/core/lib/search.ts
@@ -2,7 +2,7 @@ import Vue from 'vue'
 
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { sha3_224 } from 'js-sha3'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { getSearchAdapter } from './search/adapter/searchAdapterFactory'
 import { SearchRequest } from '@vue-storefront/core/types/search/SearchRequest'
 import { SearchResponse } from '@vue-storefront/core/types/search/SearchResponse'
diff --git a/core/lib/search/adapter/api/elasticsearch/mapping.js b/core/lib/search/adapter/api/elasticsearch/mapping.js
index d104872173..ed833d9c2d 100644
--- a/core/lib/search/adapter/api/elasticsearch/mapping.js
+++ b/core/lib/search/adapter/api/elasticsearch/mapping.js
@@ -1,4 +1,4 @@
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 
 export default function getMapping (attribute, entityType = 'products') {
   let mapping = [
diff --git a/core/lib/search/adapter/api/searchAdapter.ts b/core/lib/search/adapter/api/searchAdapter.ts
index 7ba0ee1a95..8891d397b6 100644
--- a/core/lib/search/adapter/api/searchAdapter.ts
+++ b/core/lib/search/adapter/api/searchAdapter.ts
@@ -1,5 +1,5 @@
 import map from 'lodash-es/map'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { prepareElasticsearchQueryBody } from './elasticsearchQuery'
 import fetch from 'isomorphic-fetch'
 import { slugify } from '@vue-storefront/core/helpers'
diff --git a/core/lib/search/adapter/graphql/processor/processType.ts b/core/lib/search/adapter/graphql/processor/processType.ts
index c63c1a0545..450588ff9e 100644
--- a/core/lib/search/adapter/graphql/processor/processType.ts
+++ b/core/lib/search/adapter/graphql/processor/processType.ts
@@ -1,7 +1,7 @@
 import { SearchResponse } from '@vue-storefront/core/types/search/SearchResponse'
 import map from 'lodash-es/map'
 import { slugify } from '@vue-storefront/core/helpers'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 
 export function processESResponseType (resp, start, size): SearchResponse {
   const response = {
diff --git a/core/lib/search/adapter/graphql/searchAdapter.ts b/core/lib/search/adapter/graphql/searchAdapter.ts
index 6bf20b8905..cf8ccf1b09 100644
--- a/core/lib/search/adapter/graphql/searchAdapter.ts
+++ b/core/lib/search/adapter/graphql/searchAdapter.ts
@@ -1,4 +1,4 @@
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { prepareQueryVars } from './gqlQuery'
 import { currentStoreView, prepareStoreView } from '../../../multistore'
 import fetch from 'isomorphic-fetch'
diff --git a/core/lib/sync/index.ts b/core/lib/sync/index.ts
index c72dca54d4..909d6d6266 100644
--- a/core/lib/sync/index.ts
+++ b/core/lib/sync/index.ts
@@ -1,10 +1,10 @@
 
 import Vue from 'vue'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { Logger } from '@vue-storefront/core/lib/logger'
 import { execute as taskExecute, _prepareTask } from './task'
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '../multistore'
 
 /** Syncs given task. If user is offline requiest will be sent to the server after restored connection */
diff --git a/core/lib/sync/task.ts b/core/lib/sync/task.ts
index a1d7063940..630fab8c8a 100644
--- a/core/lib/sync/task.ts
+++ b/core/lib/sync/task.ts
@@ -5,13 +5,13 @@ import isUndefined from 'lodash-es/isUndefined'
 import toString from 'lodash-es/toString'
 import fetch from 'isomorphic-fetch'
 import * as localForage from 'localforage'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { adjustMultistoreApiUrl, currentStoreView } from '@vue-storefront/core/lib/multistore'
 import Task from '@vue-storefront/core/lib/sync/types/Task'
 import { Logger } from '@vue-storefront/core/lib/logger'
 import { TaskQueue } from '@vue-storefront/core/lib/sync'
-import * as entities from '@vue-storefront/store/lib/entities'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import * as entities from '@vue-storefront/core/store/lib/entities'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 
 const AUTO_REFRESH_MAX_ATTEMPTS = 20
 
diff --git a/core/modules/breadcrumbs/helpers/index.ts b/core/modules/breadcrumbs/helpers/index.ts
index 294e2fc19f..03d6d57eaf 100644
--- a/core/modules/breadcrumbs/helpers/index.ts
+++ b/core/modules/breadcrumbs/helpers/index.ts
@@ -1,4 +1,4 @@
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 
 // Duplicate of breadCrumbRoutes, to repalce it soon. 
 /** Parse category path for product/category  */
diff --git a/core/modules/cart/hooks/beforeRegistration.ts b/core/modules/cart/hooks/beforeRegistration.ts
index f8e97fb11a..c339fd12c5 100644
--- a/core/modules/cart/hooks/beforeRegistration.ts
+++ b/core/modules/cart/hooks/beforeRegistration.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
diff --git a/core/modules/cart/store/actions.ts b/core/modules/cart/store/actions.ts
index 938f73faaa..44b5b084ca 100644
--- a/core/modules/cart/store/actions.ts
+++ b/core/modules/cart/store/actions.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { ActionTree } from 'vuex'
 import * as types from './mutation-types'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import i18n from '@vue-storefront/i18n'
 import { sha3_224 } from 'js-sha3'
 import { currentStoreView, localizedRoute} from '@vue-storefront/core/lib/multistore'
diff --git a/core/modules/cart/store/mutations.ts b/core/modules/cart/store/mutations.ts
index 21a24e64b1..f9c930fb84 100644
--- a/core/modules/cart/store/mutations.ts
+++ b/core/modules/cart/store/mutations.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { MutationTree } from 'vuex'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import * as types from './mutation-types'
 import CartState from '../types/CartState'
 
diff --git a/core/modules/catalog/components/ProductBundleOption.ts b/core/modules/catalog/components/ProductBundleOption.ts
index 173347f5f1..a0821a8f76 100644
--- a/core/modules/catalog/components/ProductBundleOption.ts
+++ b/core/modules/catalog/components/ProductBundleOption.ts
@@ -1,4 +1,4 @@
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 
 export const ProductBundleOption = {
   name: 'ProductBundleOption',
diff --git a/core/modules/catalog/components/ProductBundleOptions.ts b/core/modules/catalog/components/ProductBundleOptions.ts
index 3f3c843747..bf77899d8b 100644
--- a/core/modules/catalog/components/ProductBundleOptions.ts
+++ b/core/modules/catalog/components/ProductBundleOptions.ts
@@ -1,6 +1,6 @@
 import { mapMutations } from 'vuex'
 import * as types from '../store/product/mutation-types'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import i18n from '@vue-storefront/i18n'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
diff --git a/core/modules/catalog/components/ProductCustomOptions.ts b/core/modules/catalog/components/ProductCustomOptions.ts
index 98d8cded25..8a0d8e1aa4 100644
--- a/core/modules/catalog/components/ProductCustomOptions.ts
+++ b/core/modules/catalog/components/ProductCustomOptions.ts
@@ -1,6 +1,6 @@
 import { mapMutations } from 'vuex'
 import * as types from '../store/product/mutation-types'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import i18n from '@vue-storefront/i18n'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
diff --git a/core/modules/catalog/helpers/index.ts b/core/modules/catalog/helpers/index.ts
index 23ceac4308..c1b3328566 100644
--- a/core/modules/catalog/helpers/index.ts
+++ b/core/modules/catalog/helpers/index.ts
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { calculateProductTax } from '../helpers/tax'
 import flattenDeep from 'lodash-es/flattenDeep'
 import omit from 'lodash-es/omit'
diff --git a/core/modules/catalog/hooks/beforeRegistration.ts b/core/modules/catalog/hooks/beforeRegistration.ts
index 34239f2a72..dbb6fc83ba 100644
--- a/core/modules/catalog/hooks/beforeRegistration.ts
+++ b/core/modules/catalog/hooks/beforeRegistration.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
diff --git a/core/modules/catalog/queries/common.js b/core/modules/catalog/queries/common.js
index 70883e6cf3..6870a69b3b 100644
--- a/core/modules/catalog/queries/common.js
+++ b/core/modules/catalog/queries/common.js
@@ -1,5 +1,5 @@
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 
 export function prepareQuery ({queryText = '', filters = [], queryConfig = ''}) {
   let query = new SearchQuery()
diff --git a/core/modules/catalog/queries/related.js b/core/modules/catalog/queries/related.js
index b946b53af5..48fc24308b 100644
--- a/core/modules/catalog/queries/related.js
+++ b/core/modules/catalog/queries/related.js
@@ -1,5 +1,5 @@
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 
 export function prepareRelatedQuery (key, sku) {
   let relatedProductsQuery = new SearchQuery()
diff --git a/core/modules/catalog/queries/searchPanel.js b/core/modules/catalog/queries/searchPanel.js
index 34f81d3d32..289dc18bb2 100644
--- a/core/modules/catalog/queries/searchPanel.js
+++ b/core/modules/catalog/queries/searchPanel.js
@@ -1,5 +1,5 @@
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 
 export function prepareQuickSearchQuery (queryText) {
   let searchQuery = new SearchQuery()
diff --git a/core/modules/catalog/store/attribute/actions.ts b/core/modules/catalog/store/attribute/actions.ts
index 8e03e72059..8bdb1ff000 100644
--- a/core/modules/catalog/store/attribute/actions.ts
+++ b/core/modules/catalog/store/attribute/actions.ts
@@ -4,7 +4,7 @@ import { quickSearchByQuery } from '@vue-storefront/core/lib/search'
 import AttributeState from '../../types/AttributeState'
 import RootState from '@vue-storefront/core/types/RootState'
 import { ActionTree } from 'vuex'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
 const actions: ActionTree<AttributeState, RootState> = {
diff --git a/core/modules/catalog/store/attribute/mutations.ts b/core/modules/catalog/store/attribute/mutations.ts
index 8797465f28..79c0c94a3c 100644
--- a/core/modules/catalog/store/attribute/mutations.ts
+++ b/core/modules/catalog/store/attribute/mutations.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { MutationTree } from 'vuex'
-import { entityKeyName } from '@vue-storefront/store/lib/entities'
+import { entityKeyName } from '@vue-storefront/core/store/lib/entities'
 import * as types from './mutation-types'
 import AttributeState from '../../types/AttributeState'
 import { Logger } from '@vue-storefront/core/lib/logger'
diff --git a/core/modules/catalog/store/category/actions.ts b/core/modules/catalog/store/category/actions.ts
index b73ef7323e..1001698730 100644
--- a/core/modules/catalog/store/category/actions.ts
+++ b/core/modules/catalog/store/category/actions.ts
@@ -2,8 +2,8 @@ import Vue from 'vue'
 import { ActionTree } from 'vuex'
 import * as types from './mutation-types'
 import { quickSearchByQuery } from '@vue-storefront/core/lib/search'
-import { entityKeyName } from '@vue-storefront/store/lib/entities'
-import rootStore from '@vue-storefront/store'
+import { entityKeyName } from '@vue-storefront/core/store/lib/entities'
+import rootStore from '@vue-storefront/core/store'
 import i18n from '@vue-storefront/i18n'
 import chunk from 'lodash-es/chunk'
 import trim from 'lodash-es/trim'
diff --git a/core/modules/catalog/store/category/mutations.ts b/core/modules/catalog/store/category/mutations.ts
index 4dc7cad990..d54a18a057 100644
--- a/core/modules/catalog/store/category/mutations.ts
+++ b/core/modules/catalog/store/category/mutations.ts
@@ -2,9 +2,9 @@ import Vue from 'vue'
 import { MutationTree } from 'vuex'
 import * as types from './mutation-types'
 import { slugify, breadCrumbRoutes } from '@vue-storefront/core/helpers'
-import { entityKeyName } from '@vue-storefront/store/lib/entities'
+import { entityKeyName } from '@vue-storefront/core/store/lib/entities'
 import CategoryState from '../../types/CategoryState'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
 const mutations: MutationTree<CategoryState> = {
diff --git a/core/modules/catalog/store/product/actions.ts b/core/modules/catalog/store/product/actions.ts
index d7f0288b48..cc7b1a7c4e 100644
--- a/core/modules/catalog/store/product/actions.ts
+++ b/core/modules/catalog/store/product/actions.ts
@@ -14,13 +14,13 @@ import { configureProductAsync,
   configurableChildrenImages,
   attributeImages } from '../../helpers'
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
-import { entityKeyName } from '@vue-storefront/store/lib/entities'
+import { entityKeyName } from '@vue-storefront/core/store/lib/entities'
 import { optionLabel } from '../../helpers/optionLabel'
 import { quickSearchByQuery, isOnline } from '@vue-storefront/core/lib/search'
 import omit from 'lodash-es/omit'
 import trim from 'lodash-es/trim'
 import uniqBy from  'lodash-es/uniqBy'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import RootState from '@vue-storefront/core/types/RootState'
 import ProductState from '../../types/ProductState'
 import { Logger } from '@vue-storefront/core/lib/logger';
diff --git a/core/modules/catalog/store/stock/actions.ts b/core/modules/catalog/store/stock/actions.ts
index 9ead3d0c54..bb732d4718 100644
--- a/core/modules/catalog/store/stock/actions.ts
+++ b/core/modules/catalog/store/stock/actions.ts
@@ -5,7 +5,7 @@ import i18n from '@vue-storefront/i18n'
 import * as types from '@vue-storefront/core/modules/cart/store/mutation-types'
 import RootState from '@vue-storefront/core/types/RootState'
 import StockState from '../../types/StockState'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { TaskQueue } from '@vue-storefront/core/lib/sync'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
diff --git a/core/modules/catalog/store/tax/mutations.ts b/core/modules/catalog/store/tax/mutations.ts
index 8c95c05f0b..78d0d8b4a1 100644
--- a/core/modules/catalog/store/tax/mutations.ts
+++ b/core/modules/catalog/store/tax/mutations.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { MutationTree } from 'vuex'
 import * as types from './mutation-types'
-import { entityKeyName } from '@vue-storefront/store/lib/entities'
+import { entityKeyName } from '@vue-storefront/core/store/lib/entities'
 import TaxState from '../../types/TaxState'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
diff --git a/core/modules/checkout/hooks/beforeRegistration.ts b/core/modules/checkout/hooks/beforeRegistration.ts
index c59792ad6f..da56ab25ba 100644
--- a/core/modules/checkout/hooks/beforeRegistration.ts
+++ b/core/modules/checkout/hooks/beforeRegistration.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
diff --git a/core/modules/checkout/store/checkout/actions.ts b/core/modules/checkout/store/checkout/actions.ts
index 854585781d..ef84492316 100644
--- a/core/modules/checkout/store/checkout/actions.ts
+++ b/core/modules/checkout/store/checkout/actions.ts
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import { ActionTree } from 'vuex'
 import * as types from './mutation-types'
 import i18n from '@vue-storefront/i18n'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import RootState from '@vue-storefront/core/types/RootState'
 import CheckoutState from '../../types/CheckoutState'
 import { Logger } from '@vue-storefront/core/lib/logger'
diff --git a/core/modules/checkout/store/payment/index.ts b/core/modules/checkout/store/payment/index.ts
index bbc37b6c66..c94ec3a95c 100644
--- a/core/modules/checkout/store/payment/index.ts
+++ b/core/modules/checkout/store/payment/index.ts
@@ -1,7 +1,7 @@
 import { Module } from 'vuex'
 import RootState from '@vue-storefront/core/types/RootState'
 import PaymentState from '../../types/PaymentState'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 
 export const paymentModule: Module<PaymentState, RootState> = {
   namespaced: true,
diff --git a/core/modules/cms/hooks/beforeRegistration.ts b/core/modules/cms/hooks/beforeRegistration.ts
index 4a12f3c552..f9ff55a839 100644
--- a/core/modules/cms/hooks/beforeRegistration.ts
+++ b/core/modules/cms/hooks/beforeRegistration.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
diff --git a/core/modules/compare/hooks/beforeRegistration.ts b/core/modules/compare/hooks/beforeRegistration.ts
index e0cdd6a2b2..632d28bcd0 100644
--- a/core/modules/compare/hooks/beforeRegistration.ts
+++ b/core/modules/compare/hooks/beforeRegistration.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
diff --git a/core/modules/compare/store/actions.ts b/core/modules/compare/store/actions.ts
index ca1eea219b..97fe43c0bd 100644
--- a/core/modules/compare/store/actions.ts
+++ b/core/modules/compare/store/actions.ts
@@ -1,9 +1,9 @@
 import Vue from 'vue'
 import { ActionTree } from 'vuex'
 import * as types from './mutation-types'
-import { htmlDecode } from '@vue-storefront/store/lib/filters'
+import { htmlDecode } from '@vue-storefront/core/store/lib/filters'
 import i18n from '@vue-storefront/i18n'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import RootState from '@vue-storefront/core/types/RootState'
 import CompareState from '../types/CompareState'
 import { cacheStorage } from '../'
diff --git a/core/modules/offline-order/components/CancelOrders.ts b/core/modules/offline-order/components/CancelOrders.ts
index 7110db06b6..036ddc02da 100644
--- a/core/modules/offline-order/components/CancelOrders.ts
+++ b/core/modules/offline-order/components/CancelOrders.ts
@@ -1,7 +1,7 @@
 import * as localForage from 'localforage'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
 export const CancelOrders = {
diff --git a/core/modules/offline-order/helpers/onNetworkStatusChange.ts b/core/modules/offline-order/helpers/onNetworkStatusChange.ts
index a022b97a6f..d993558120 100644
--- a/core/modules/offline-order/helpers/onNetworkStatusChange.ts
+++ b/core/modules/offline-order/helpers/onNetworkStatusChange.ts
@@ -1,9 +1,9 @@
 import * as localForage from 'localforage'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus/index'
 
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
diff --git a/core/modules/order/hooks/beforeRegistration.ts b/core/modules/order/hooks/beforeRegistration.ts
index 7e7df58e7f..49b7df2c32 100644
--- a/core/modules/order/hooks/beforeRegistration.ts
+++ b/core/modules/order/hooks/beforeRegistration.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
   Vue.prototype.$db.ordersCollection = new UniversalStorage(localForage.createInstance({
diff --git a/core/modules/order/store/actions.ts b/core/modules/order/store/actions.ts
index e3b901d906..ea9f093e23 100644
--- a/core/modules/order/store/actions.ts
+++ b/core/modules/order/store/actions.ts
@@ -5,7 +5,7 @@ import { ActionTree } from 'vuex'
 import RootState from '@vue-storefront/core/types/RootState'
 import OrderState from '../types/OrderState'
 import { Order } from '../types/Order'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { isOnline } from '@vue-storefront/core/lib/search'
 import i18n from '@vue-storefront/i18n'
 import { TaskQueue } from '@vue-storefront/core/lib/sync'
diff --git a/core/modules/order/store/mutations.ts b/core/modules/order/store/mutations.ts
index f1e2817f73..ef766181d6 100644
--- a/core/modules/order/store/mutations.ts
+++ b/core/modules/order/store/mutations.ts
@@ -1,9 +1,9 @@
 import Vue from 'vue'
 import { MutationTree } from 'vuex'
 import * as types from './mutation-types'
-import * as entities from '@vue-storefront/store/lib/entities'
+import * as entities from '@vue-storefront/core/store/lib/entities'
 import OrderState from '../types/OrderState'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
 const mutations: MutationTree<OrderState> = {
diff --git a/core/modules/review/store/actions.ts b/core/modules/review/store/actions.ts
index 2e59781ad3..e4cdb2f1b4 100644
--- a/core/modules/review/store/actions.ts
+++ b/core/modules/review/store/actions.ts
@@ -7,7 +7,7 @@ import RootState from '@vue-storefront/core/types/RootState'
 import ReviewState from '../types/ReviewState'
 import * as types from './mutation-types'
 import i18n from '@vue-storefront/i18n'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import Review from '@vue-storefront/core/modules/review/types/Review'
 import { ReviewRequest } from '@vue-storefront/core/modules/review/types/ReviewRequest'
 import { Logger } from '@vue-storefront/core/lib/logger'
diff --git a/core/modules/user/hooks/beforeRegistration.ts b/core/modules/user/hooks/beforeRegistration.ts
index 44c0380442..8657b095b5 100644
--- a/core/modules/user/hooks/beforeRegistration.ts
+++ b/core/modules/user/hooks/beforeRegistration.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
diff --git a/core/modules/user/router/beforeEach.ts b/core/modules/user/router/beforeEach.ts
index 780244c9f6..272c7be561 100644
--- a/core/modules/user/router/beforeEach.ts
+++ b/core/modules/user/router/beforeEach.ts
@@ -1,5 +1,5 @@
 import { Route } from 'vue-router'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import i18n from '@vue-storefront/i18n'
 
 export function beforeEach(to: Route, from: Route, next) {
diff --git a/core/modules/user/store/actions.ts b/core/modules/user/store/actions.ts
index 694e29ef9d..62b5bb34cd 100644
--- a/core/modules/user/store/actions.ts
+++ b/core/modules/user/store/actions.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { ActionTree } from 'vuex'
 import * as types from './mutation-types'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import i18n from '@vue-storefront/i18n'
 import { adjustMultistoreApiUrl } from '@vue-storefront/core/lib/multistore'
 import RootState from '@vue-storefront/core/types/RootState'
diff --git a/core/modules/wishlist/store/actions.ts b/core/modules/wishlist/store/actions.ts
index dcc86197c0..0f4f3f07c1 100644
--- a/core/modules/wishlist/store/actions.ts
+++ b/core/modules/wishlist/store/actions.ts
@@ -2,8 +2,8 @@ import Vue from 'vue'
 import { ActionTree } from 'vuex'
 import * as types from './mutation-types'
 import i18n from '@vue-storefront/i18n'
-import { htmlDecode } from '@vue-storefront/store/lib/filters'
-import rootStore from '@vue-storefront/store'
+import { htmlDecode } from '@vue-storefront/core/store/lib/filters'
+import rootStore from '@vue-storefront/core/store'
 import RootState from '@vue-storefront/core/types/RootState'
 import WishlistState from '../types/WishlistState'
 import { cacheStorage } from '../'
diff --git a/core/package.json b/core/package.json
index 2f05766c87..2ee8acb2a2 100644
--- a/core/package.json
+++ b/core/package.json
@@ -8,7 +8,6 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@vue-storefront/store": "^1.7.0",
     "bodybuilder": "2.2.13",
     "config": "^1.30.0",
     "express": "^4.14.0",
diff --git a/core/pages/Category.js b/core/pages/Category.js
index aba76a0315..3f60418266 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import toString from 'lodash-es/toString'
 
 import i18n from '@vue-storefront/i18n'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
 import { baseFilterProductsQuery, buildFilterProductsQuery } from '@vue-storefront/core/helpers'
 import { htmlDecode } from '@vue-storefront/core/filters/html-decode'
diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index 68d351e357..f2d77bb899 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import i18n from '@vue-storefront/i18n'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 import VueOfflineMixin from 'vue-offline/mixin'
 import { mapGetters } from 'vuex'
 
diff --git a/core/pages/Product.js b/core/pages/Product.js
index d55475b438..a678cef782 100644
--- a/core/pages/Product.js
+++ b/core/pages/Product.js
@@ -1,6 +1,6 @@
 import { mapGetters } from 'vuex'
 
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
 import { htmlDecode } from '@vue-storefront/core/filters'
 import { currentStoreView, localizedRoute } from '@vue-storefront/core/lib/multistore'
diff --git a/core/store/package.json b/core/store/package.json
deleted file mode 100644
index 0538dcce7a..0000000000
--- a/core/store/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "@vue-storefront/store",
-  "version": "1.7.0",
-  "description": "Vue Storefront core data store",
-  "license": "MIT",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "ajv": "^6.4.0",
-    "bodybuilder": "2.2.13",
-    "isomorphic-fetch": "^2.2.1",
-    "js-sha3": "^0.8.0",
-    "lean-he": "^2.0.0",
-    "localforage": "^1.7.2",
-    "lodash-es": "^4.17.10",
-    "vuex": "^3.0.1"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}
diff --git a/docs/guide/data/data.md b/docs/guide/data/data.md
index 52b15c6622..8239575f61 100644
--- a/docs/guide/data/data.md
+++ b/docs/guide/data/data.md
@@ -107,7 +107,7 @@ Here you have an example on how the Vuex store should be constructed. Please not
 
 ```js
 import * as types from '../mutation-types';
-import { ValidationError } from '@vue-storefront/store/lib/exceptions';
+import { ValidationError } from '@vue-storefront/core/store/lib/exceptions';
 import * as entities from '../../lib/entities';
 import * as sw from '@vue-storefront/core/lib/sw';
 import config from '../../config';
diff --git a/docs/guide/integrations/payment-gateway.md b/docs/guide/integrations/payment-gateway.md
index d1c15c2a1b..3ebbcd4fe8 100644
--- a/docs/guide/integrations/payment-gateway.md
+++ b/docs/guide/integrations/payment-gateway.md
@@ -32,7 +32,7 @@ Here is an example of "Cash on delivery" payment method main logic. It's placed
 
 ```js
 import InfoComponent from '../components/Info.vue'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 
 export function afterRegistration({ Vue, config, store, isServer }) {
   // Place the order. Payload is empty as we don't have any specific info to add for this payment method '{}'
diff --git a/docs/guide/upgrade-notes/README.md b/docs/guide/upgrade-notes/README.md
index 1b3edfd88a..c3d1bd105b 100644
--- a/docs/guide/upgrade-notes/README.md
+++ b/docs/guide/upgrade-notes/README.md
@@ -15,7 +15,7 @@ const moduleConfig: VueStorefrontModuleConfig = {
 
 const module = createModule(moduleConfig)
 ````
-
+- `@vue-storefront/store` package has been depreciated. Just change imports to `@vue-storefront/core/store`.
 ## 1.7 -> 1.8
 Full changelog is available [here](https://github.com/DivanteLtd/vue-storefront/blob/master/CHANGELOG.md)
 
@@ -261,7 +261,7 @@ We've added the Reviews support, however, Magento2 is still lacking Reviews supp
 
 To get access to rootStore import it by
 
-`import rootStore from '@vue-storefront/store'`
+`import rootStore from '@vue-storefront/core/store'`
 
 #### cms extenstion was renamed to extension-magento2-cms
 
diff --git a/docs/guide/vuex/introduction.md b/docs/guide/vuex/introduction.md
index 3fc91d49bc..a37849360c 100644
--- a/docs/guide/vuex/introduction.md
+++ b/docs/guide/vuex/introduction.md
@@ -27,7 +27,7 @@ Before you start working with vuex, it's recommended to get familiar with our [v
 Existing core modules can be overridden in themes store. Just import any core store modules and override it using `extendStore()` utility method like the example given below in `themes/default/store/ui-store.js`.
 
 ```
-import coreStore from '@vue-storefront/store/modules/ui-store'
+import coreStore from '@vue-storefront/core/store/modules/ui-store'
 import { extendStore } from '@vue-storefront/core/lib/themes'
 
 const state = {
diff --git a/package.json b/package.json
index fd98e21008..f3c5ee9bc0 100755
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "localforage": "^1.7.2",
     "magento2-rest-client": "github:DivanteLtd/magento2-rest-client",
     "pm2": "^2.10.4",
+    "redis-tag-cache": "^1.2.1",
     "reflect-metadata": "^0.1.12",
     "register-service-worker": "^1.5.2",
     "ts-node": "^7.0.1",
@@ -174,7 +175,6 @@
   "workspaces": [
     "core",
     "core/i18n",
-    "core/store",
     "src/extensions/*",
     "src/modules/*",
     "src/themes/*",
diff --git a/src/modules/claims/hooks/beforeRegistration.ts b/src/modules/claims/hooks/beforeRegistration.ts
index 415375e7ab..d52b5f1247 100644
--- a/src/modules/claims/hooks/beforeRegistration.ts
+++ b/src/modules/claims/hooks/beforeRegistration.ts
@@ -1,5 +1,5 @@
 import * as localForage from 'localforage'
-import UniversalStorage from '@vue-storefront/store/lib/storage'
+import UniversalStorage from '@vue-storefront/core/store/lib/storage'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
diff --git a/src/modules/droppoint-shipping/store/actions.ts b/src/modules/droppoint-shipping/store/actions.ts
index 3d9b232d59..2ae4a1fe6e 100644
--- a/src/modules/droppoint-shipping/store/actions.ts
+++ b/src/modules/droppoint-shipping/store/actions.ts
@@ -1,6 +1,6 @@
 import { ActionTree } from 'vuex';
 import { execute as taskExecute } from '@vue-storefront/core/lib/sync/task'
-import * as entities from '@vue-storefront/store/lib/entities'
+import * as entities from '@vue-storefront/core/store/lib/entities'
 
 // actions
 export const actions: ActionTree<any, any> = {
diff --git a/src/modules/magento-2-cms/components/CmsData.vue b/src/modules/magento-2-cms/components/CmsData.vue
index a9a91eafe6..a6f6555728 100644
--- a/src/modules/magento-2-cms/components/CmsData.vue
+++ b/src/modules/magento-2-cms/components/CmsData.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 
 export default {
diff --git a/src/modules/payment-cash-on-delivery/hooks/afterRegistration.ts b/src/modules/payment-cash-on-delivery/hooks/afterRegistration.ts
index e77c9611b6..247c0ab1fe 100644
--- a/src/modules/payment-cash-on-delivery/hooks/afterRegistration.ts
+++ b/src/modules/payment-cash-on-delivery/hooks/afterRegistration.ts
@@ -1,5 +1,5 @@
 import InfoComponent from '../components/Info.vue'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 
 export function afterRegistration({ Vue, config, store, isServer }) {
   // Place the order. The payload is empty as we don't have any specific info to add for this payment method '{}'
diff --git a/src/themes/default-amp/components/core/ProductTile.vue b/src/themes/default-amp/components/core/ProductTile.vue
index f81668b623..685bd4f88c 100755
--- a/src/themes/default-amp/components/core/ProductTile.vue
+++ b/src/themes/default-amp/components/core/ProductTile.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { ProductTile } from '@vue-storefront/core/modules/catalog/components/ProductTile.ts'
 
 export default {
diff --git a/src/themes/default/components/core/ColorSelector.vue b/src/themes/default/components/core/ColorSelector.vue
index 9069e5d798..4bd1a5a31d 100644
--- a/src/themes/default/components/core/ColorSelector.vue
+++ b/src/themes/default/components/core/ColorSelector.vue
@@ -13,7 +13,7 @@
 
 <script>
 import GenericSelector from '@vue-storefront/core/compatibility/components/GenericSelector'
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 export default {
   mixins: [GenericSelector],
   methods: {
diff --git a/src/themes/default/components/core/ProductGalleryCarousel.vue b/src/themes/default/components/core/ProductGalleryCarousel.vue
index ced5a5455a..556e5be178 100644
--- a/src/themes/default/components/core/ProductGalleryCarousel.vue
+++ b/src/themes/default/components/core/ProductGalleryCarousel.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 import { Carousel, Slide } from 'vue-carousel'
 
 export default {
diff --git a/src/themes/default/components/core/ProductTile.vue b/src/themes/default/components/core/ProductTile.vue
index a7914ff49e..88f57543b9 100644
--- a/src/themes/default/components/core/ProductTile.vue
+++ b/src/themes/default/components/core/ProductTile.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import { ProductTile } from '@vue-storefront/core/modules/catalog/components/ProductTile.ts'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index b6574dbd5a..f009733916 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -87,7 +87,7 @@
 </template>
 
 <script>
-import rootStore from '@vue-storefront/store'
+import rootStore from '@vue-storefront/core/store'
 import Product from '@vue-storefront/core/compatibility/components/blocks/Microcart/Product'
 
 import EditButton from './EditButton'
diff --git a/src/themes/default/components/core/blocks/Product/Related.vue b/src/themes/default/components/core/blocks/Product/Related.vue
index 5d0833208e..d086671665 100644
--- a/src/themes/default/components/core/blocks/Product/Related.vue
+++ b/src/themes/default/components/core/blocks/Product/Related.vue
@@ -21,7 +21,7 @@ import ProductListing from 'theme/components/core/ProductListing'
 
 import { prepareRelatedQuery } from '@vue-storefront/core/modules/catalog/queries/related'
 import i18n from '@vue-storefront/i18n'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 
 export default {
   name: 'Related',
diff --git a/src/themes/default/components/core/blocks/Switcher/Language.vue b/src/themes/default/components/core/blocks/Switcher/Language.vue
index 934c64f97f..ba41349927 100644
--- a/src/themes/default/components/core/blocks/Switcher/Language.vue
+++ b/src/themes/default/components/core/blocks/Switcher/Language.vue
@@ -23,7 +23,7 @@
 </template>
 <script>
 import Modal from 'theme/components/core/Modal.vue'
-import store from '@vue-storefront/store'
+import store from '@vue-storefront/core/store'
 export default {
   components: {
     Modal

From 21c683ce6cec28c14ce19f68b712f03915ae968e Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Wed, 20 Feb 2019 10:00:37 +0100
Subject: [PATCH 12/39] yarn lock update

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 0a6f08a7a8..4e24bffa45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1232,7 +1232,7 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.0.1, ajv@^6.1.0, ajv@^6.4.0, ajv@^6.5.5:
+ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.5:
   version "6.6.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.1.tgz#6360f5ed0d80f232cc2b294c362d5dc2e538dd61"
   dependencies:

From 0bea9e1ef41b51d333bfba7c206f321a517334d4 Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Wed, 20 Feb 2019 10:24:46 +0100
Subject: [PATCH 13/39] Fix 2452 and add new example static page

---
 .../components/theme/blocks/Static/Short.vue  | 16 +++++++++++++++
 src/themes/default/pages/Static.vue           | 20 ++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 src/themes/default/components/theme/blocks/Static/Short.vue

diff --git a/src/themes/default/components/theme/blocks/Static/Short.vue b/src/themes/default/components/theme/blocks/Static/Short.vue
new file mode 100644
index 0000000000..e1611fdf3e
--- /dev/null
+++ b/src/themes/default/components/theme/blocks/Static/Short.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <p>
+      This website ("website") is operated by Luma Inc., which includes Luma stores, and Luma Private Sales. This privacy policy only covers information collected at this website, and does not cover any information collected offline by Luma. All Luma websites are covered by this privacy policy.
+    </p>
+    <h2>
+      Luma Privacy Policy
+    </h2>
+    <p>
+      To help us achieve our goal of providing the highest quality products and services, we use information from our interactions with you and other customers, as well as from other parties. Because we respect your privacy, we have implemented procedures to ensure that your personal information is handled in a safe, secure, and responsible manner. We have posted this privacy policy in order to explain our information collection practices and the choices you have about the way information is collected and used.
+    </p>
+    <p>
+      As we continue to develop the Luma website and take advantage of advances in technology to improve the services we offer, this privacy policy likely will change. We therefore encourage you to refer to this policy on an ongoing basis so that you understand our current privacy policy.
+    </p>
+  </div>
+</template>
diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index 2ed1f992e5..eca6b0a02a 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -30,6 +30,7 @@
 import i18n from '@vue-storefront/i18n'
 import Breadcrumbs from 'theme/components/core/Breadcrumbs'
 import StaticExample from 'theme/components/theme/blocks/Static/Example'
+import StaticShortExample from 'theme/components/theme/blocks/Static/Short'
 
 export default {
   components: {
@@ -41,9 +42,6 @@ export default {
       meta: this.$route.meta.description ? [{vmid: 'description', description: this.$route.meta.description}] : []
     }
   },
-  created () {
-    this.activeComponent = this.navigation.find(nav => nav.link === this.$route.path) ? this.navigation.find(nav => nav.link === this.$route.path).component : null
-  },
   props: {
     title: {
       type: String,
@@ -59,17 +57,25 @@ export default {
       this.activeComponent = component
     }
   },
+  watch: {
+    '$route.name': {
+      immediate: true,
+      handler: function () {
+        this.activeComponent = this.navigation.find(nav => nav.link === this.$route.path) ? this.navigation.find(nav => nav.link === this.$route.path).component : null
+      }
+    }
+  },
   data () {
     return {
       navigation: [
         { title: i18n.t('About us'), link: '/about-us', component: StaticExample },
-        { title: i18n.t('Customer service'), link: '/customer-service', component: StaticExample },
+        { title: i18n.t('Customer service'), link: '/customer-service', component: StaticShortExample },
         { title: i18n.t('Store locator'), link: '/store-locator', component: StaticExample },
-        { title: i18n.t('Delivery'), link: '/delivery', component: StaticExample },
+        { title: i18n.t('Delivery'), link: '/delivery', component: StaticShortExample },
         { title: i18n.t('Return policy'), link: '/returns', component: StaticExample },
-        { title: i18n.t('Privacy policy'), link: '/privacy', component: StaticExample },
+        { title: i18n.t('Privacy policy'), link: '/privacy', component: StaticShortExample },
         { title: i18n.t('Size guide'), link: '/size-guide', component: StaticExample },
-        { title: i18n.t('Contact us'), link: '/contact', component: StaticExample }
+        { title: i18n.t('Contact us'), link: '/contact', component: StaticShortExample }
       ],
       activeComponent: null
     }

From 2b6b0a5d9155a4292236aed99791cd8aef6e85d3 Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Wed, 20 Feb 2019 10:28:08 +0100
Subject: [PATCH 14/39] update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c281a94e3d..17805392e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated to Vue 2.6.6 - @filrak (#2456)
 - Null sidebar menu data on static page fixed - @filrak (#2456)
 - Fix cannot edit previous steps in checkout - @filrak (#2457)
-
+- Fix links in footer to static pages bug - @filrak (#2464)
 
 ### Depreciated / Removed
 - `@vue-storefront/store` package depreciated - @filrak

From 4c11039c2c6cfb63e4e233a9e3b3273da7844ad0 Mon Sep 17 00:00:00 2001
From: Joel Rainwater <joel.rainwater@netatmo.com>
Date: Wed, 20 Feb 2019 10:48:50 +0100
Subject: [PATCH 15/39] renamed hideImage for clarity. Set default value for
 ProductVideo index prop

---
 core/modules/catalog/components/ProductVideo.ts           | 3 ++-
 .../default/components/core/ProductGalleryCarousel.vue    | 8 ++++----
 .../components/core/ProductGalleryZoomCarousel.vue        | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/modules/catalog/components/ProductVideo.ts b/core/modules/catalog/components/ProductVideo.ts
index 5796831961..b4140dc4ed 100644
--- a/core/modules/catalog/components/ProductVideo.ts
+++ b/core/modules/catalog/components/ProductVideo.ts
@@ -15,7 +15,8 @@ export const ProductVideo = {
     },
     index: {
       type: Number,
-      required: false
+      required: false,
+      default: 0
     }
   },
   data () {
diff --git a/src/themes/default/components/core/ProductGalleryCarousel.vue b/src/themes/default/components/core/ProductGalleryCarousel.vue
index fc7d9d3434..4a8366222c 100644
--- a/src/themes/default/components/core/ProductGalleryCarousel.vue
+++ b/src/themes/default/components/core/ProductGalleryCarousel.vue
@@ -17,7 +17,7 @@
         :key="images.src">
         <div class="bg-cl-secondary" :class="{'video-container h-100 flex relative': images.video}">
           <img
-            v-show="hideImage !== index"
+            v-show="hideImageAtIndex !== index"
             class="product-image inline-flex pointer mw-100"
             v-lazy="images"
             ref="images"
@@ -66,7 +66,7 @@ export default {
     return {
       carouselTransitionSpeed: 300,
       currentPage: 0,
-      hideImage: null
+      hideImageAtIndexAtIndex: null
     }
   },
   components: {
@@ -119,10 +119,10 @@ export default {
     },
     pageChange (index) {
       this.currentPage = index
-      this.hideImage = null
+      this.hideImageAtIndex = null
     },
     onVideoStarted (index) {
-      this.hideImage = index
+      this.hideImageAtIndex = index
     }
   }
 }
diff --git a/src/themes/default/components/core/ProductGalleryZoomCarousel.vue b/src/themes/default/components/core/ProductGalleryZoomCarousel.vue
index a20bf8f3f2..e36d560b68 100644
--- a/src/themes/default/components/core/ProductGalleryZoomCarousel.vue
+++ b/src/themes/default/components/core/ProductGalleryZoomCarousel.vue
@@ -28,7 +28,7 @@
             <div class="media-zoom-carousel__slide  bg-cl-secondary"
                  :class="{'video-container h-100 flex relative': images.video}">
               <img
-                v-show="hideImage !== index"
+                v-show="hideImageAtIndex !== index"
                 class="product-image inline-flex pointer mw-100"
                 v-lazy="images"
                 ref="images"
@@ -74,7 +74,7 @@ export default {
     return {
       carouselTransitionSpeed: 300,
       currentPage: 0,
-      hideImage: null
+      hideImageAtIndex: null
     }
   },
   components: {
@@ -104,10 +104,10 @@ export default {
     },
     pageChange (index) {
       this.currentPage = index
-      this.hideImage = null
+      this.hideImageAtIndex = null
     },
     onVideoStarted (index) {
-      this.hideImage = index
+      this.hideImageAtIndex = index
     }
   }
 }

From eca80d02f194d5c922cba271b89a4f27269a2ae0 Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Wed, 20 Feb 2019 13:40:51 +0100
Subject: [PATCH 16/39] Update CHANGELOG.md

Co-Authored-By: filrak <f.rakowskI@hotmail.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c63ad293c3..5fdbdabaf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 ### Depreciated / Removed
-- `@vue-storefront/store` package depreciated - @filrak
+- `@vue-storefront/store` package deprecated - @filrak
 
 ## [1.8.2] - 2019.02.11
 - Fixed docker-compose configuration for network_mode and TS build config - @lukeromanowicz (#2415)

From c441653d0270de5bd91838d906cddab2c2e8278d Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Wed, 20 Feb 2019 15:03:57 +0100
Subject: [PATCH 17/39] bugfix/too early breadcrumbs change

---
 core/modules/catalog/store/product/actions.ts        | 2 +-
 core/modules/catalog/store/product/mutation-types.ts | 3 ++-
 core/modules/catalog/store/product/mutations.ts      | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/modules/catalog/store/product/actions.ts b/core/modules/catalog/store/product/actions.ts
index cc7b1a7c4e..7a944efbfe 100644
--- a/core/modules/catalog/store/product/actions.ts
+++ b/core/modules/catalog/store/product/actions.ts
@@ -101,7 +101,7 @@ const actions: ActionTree<ProductState, RootState> = {
       routes: breadCrumbRoutes,
       current: breadcrumbsName
     }
-    context.dispatch('breadcrumbs/set', breadcrumbs, { root: true })
+    context.commit(types.CATALOG_SET_BREADCRUMBS, breadcrumbs)
     return Promise.all(subloaders)
   },
   doPlatformPricesSync (context, { products }) {
diff --git a/core/modules/catalog/store/product/mutation-types.ts b/core/modules/catalog/store/product/mutation-types.ts
index ed71a5e183..2e08a15e94 100644
--- a/core/modules/catalog/store/product/mutation-types.ts
+++ b/core/modules/catalog/store/product/mutation-types.ts
@@ -9,4 +9,5 @@ export const CATALOG_SET_PRODUCT_PARENT = SN_PRODUCT + '/SET_PARENT'
 export const CATALOG_UPD_CUSTOM_OPTION = SN_PRODUCT + '/SET_CUSTOM_OPTION'
 export const CATALOG_UPD_BUNDLE_OPTION = SN_PRODUCT + '/SET_BUNDLE_OPTION'
 export const CATALOG_ADD_CUSTOM_OPTION_VALIDATOR = SN_PRODUCT + '/ADD_CUSTOM_OPTION_VALIDATOR'
-export const CATALOG_UPD_GALLERY = SN_PRODUCT + '/SET_GALLERY'
\ No newline at end of file
+export const CATALOG_UPD_GALLERY = SN_PRODUCT + '/SET_GALLERY'
+export const CATALOG_SET_BREADCRUMBS = SN_PRODUCT + '/SET_BREADCRUMBS'
\ No newline at end of file
diff --git a/core/modules/catalog/store/product/mutations.ts b/core/modules/catalog/store/product/mutations.ts
index 59f078c8f1..ccef6d5e99 100644
--- a/core/modules/catalog/store/product/mutations.ts
+++ b/core/modules/catalog/store/product/mutations.ts
@@ -4,6 +4,9 @@ import * as types from './mutation-types'
 import ProductState, { PagedProductList } from '../../types/ProductState'
 
 const mutations: MutationTree<ProductState> = {
+  [types.CATALOG_SET_BREADCRUMBS] (state, payload) {
+    state.breadcrumbs = payload
+  },
   [types.CATALOG_UPD_RELATED] (state, { key, items }) {
     state.related[key] = items
     Vue.prototype.$bus.$emit('product-after-related', { key: key, items: items })

From 1961c930054efb4baad76c7c26a829dbbe7f6c79 Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Wed, 20 Feb 2019 15:04:24 +0100
Subject: [PATCH 18/39] Update CHANGELOG.md

Co-Authored-By: filrak <f.rakowskI@hotmail.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fdbdabaf6..cd842718de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix cannot edit previous steps in checkout - @filrak (#2457)
 
 
-### Depreciated / Removed
+### Deprecated / Removed
 - `@vue-storefront/store` package deprecated - @filrak
 
 ## [1.8.2] - 2019.02.11

From f760b9445bc4b1302e05d0616fa4be54f6a63d43 Mon Sep 17 00:00:00 2001
From: Filip Rakowski <f.rakowskI@hotmail.com>
Date: Wed, 20 Feb 2019 15:05:52 +0100
Subject: [PATCH 19/39] Update package.json

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index c33cca5207..90057fac86 100755
--- a/package.json
+++ b/package.json
@@ -61,7 +61,6 @@
     "localforage": "^1.7.2",
     "magento2-rest-client": "github:DivanteLtd/magento2-rest-client",
     "pm2": "^2.10.4",
-    "redis-tag-cache": "^1.2.1",
     "reflect-metadata": "^0.1.12",
     "register-service-worker": "^1.5.2",
     "ts-node": "^7.0.1",

From 2909f342f9cec128bc5df80a62193d129487954a Mon Sep 17 00:00:00 2001
From: Filip Rakowski <f.rakowskI@hotmail.com>
Date: Wed, 20 Feb 2019 16:36:35 +0100
Subject: [PATCH 20/39] Update package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 90057fac86..c33cca5207 100755
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "localforage": "^1.7.2",
     "magento2-rest-client": "github:DivanteLtd/magento2-rest-client",
     "pm2": "^2.10.4",
+    "redis-tag-cache": "^1.2.1",
     "reflect-metadata": "^0.1.12",
     "register-service-worker": "^1.5.2",
     "ts-node": "^7.0.1",

From 8fa0f3417d7f0756f22044552061469e811a6178 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 21 Feb 2019 07:17:29 +0100
Subject: [PATCH 21/39] refactor elastic debug logs to Logger

---
 core/lib/search.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/lib/search.ts b/core/lib/search.ts
index 774920bb82..b5e2a84261 100644
--- a/core/lib/search.ts
+++ b/core/lib/search.ts
@@ -6,6 +6,7 @@ import rootStore from '@vue-storefront/store'
 import { getSearchAdapter } from './search/adapter/searchAdapterFactory'
 import { SearchRequest } from '@vue-storefront/core/types/search/SearchRequest'
 import { SearchResponse } from '@vue-storefront/core/types/search/SearchResponse'
+import { Logger } from '@vue-storefront/core/lib/logger'
 
 // TODO - use one from helpers instead
 export function isOnline () : boolean {
@@ -61,7 +62,8 @@ export const quickSearchByQuery  = async ({ query, start = 0, size = 50, entityT
         res.noresults = false
         res.offline = !isOnline() // TODO: refactor it to checking ES heartbit
         resolve(res)
-        console.debug('Result from cache for ' + cacheKey + ' (' + entityType + '), ms=' + (new Date().getTime() - benchmarkTime.getTime()))
+        Logger.debug('Result from cache for ' + cacheKey + ' (' + entityType + '), ms=' + (new Date().getTime() - benchmarkTime.getTime()))()
+
         servedFromCache = true
       }
     }).catch((err) => {
@@ -87,7 +89,7 @@ export const quickSearchByQuery  = async ({ query, start = 0, size = 50, entityT
       if (res) { // otherwise it can be just a offline mode
         cache.setItem(cacheKey, res, null, rootStore.state.config.elasticsearch.disableLocalStorageQueriesCache).catch((err) => { console.error('Cannot store cache for ' + cacheKey + ', ' + err) })
         if (!servedFromCache) { // if navigator onLine == false means ES is unreachable and probably this will return false; sometimes returned false faster than indexedDb cache returns result ...
-          console.debug('Result from ES for ' + cacheKey + ' (' + entityType + '),  ms=' + (new Date().getTime() - benchmarkTime.getTime()))
+          Logger.debug('Result from ES for ' + cacheKey + ' (' + entityType + '),  ms=' + (new Date().getTime() - benchmarkTime.getTime()))()
           res.cache = false
           res.noresults = false
           res.offline = false
@@ -96,7 +98,7 @@ export const quickSearchByQuery  = async ({ query, start = 0, size = 50, entityT
       }
     }).catch(err => {
       if (!servedFromCache) {
-        console.debug('No results and offline ' + cacheKey + ' (' + entityType + '), ms=' + (new Date().getTime() - benchmarkTime.getTime()))
+        Logger.debug('No results and offline ' + cacheKey + ' (' + entityType + '), ms=' + (new Date().getTime() - benchmarkTime.getTime()))()
         const res = {
           items: [],
           total: 0,

From 95e6a956af7705f3c019eacfad115ee5e52b94a8 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 21 Feb 2019 07:18:21 +0100
Subject: [PATCH 22/39] improve tsconfig for better IDE paths support

---
 tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index 35851199d7..b9d898bced 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,7 +19,8 @@
     "paths": {
       "core/*": ["core/*"],
       "theme/*": ["src/themes/default/*"], //needs testing with non-default theme!
-      "core/modules/*": ["./core/modules/*"]
+      "core/modules/*": ["./core/modules/*"],
+      "@vue-storefront/*": ["./"]
     },
     "lib": ["es2017", "dom"]
   },
@@ -31,7 +32,6 @@
     "core/**/*.vue",
     "tests/**/*.ts",
     "module/**/*.ts",
-    "core/build/theme-path.js"
   ],
   "exclude": [
     "node_modules"

From d0f8ca51942fe87ee461374d4997008c640b98ce Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 21 Feb 2019 07:26:02 +0100
Subject: [PATCH 23/39] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d249079aa..ee490941d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Null sidebar menu data on static page fixed - @filrak (#2456)
 - Fix cannot edit previous steps in checkout - @filrak (#2457)
 - Improve images loading on category page, corrected alt view and blinking problem - @patzick (#2465)
+- Improve tsconfig for better IDE paths support - @patzick, @filrak (#2474)
 
 
 ### Deprecated / Removed

From b0275dedf6777ccd98fc0c3c83f4d1ab47f5818f Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Thu, 21 Feb 2019 09:58:28 +0100
Subject: [PATCH 24/39] merge cobflicts

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77259e2c48..39600efa68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,13 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated to Vue 2.6.6 - @filrak (#2456)
 - Null sidebar menu data on static page fixed - @filrak (#2456)
 - Fix cannot edit previous steps in checkout - @filrak (#2457)
-<<<<<<< HEAD
 - Fix links in footer to static pages bug - @filrak (#2464)
-=======
 - Improve images loading on category page, corrected alt view and blinking problem - @patzick (#2465)
 - Improve tsconfig for better IDE paths support - @patzick, @filrak (#2474)
 
->>>>>>> main/develop
 
 ### Deprecated / Removed
 - `@vue-storefront/store` package deprecated - @filrak

From aadb936bb409d818bcc5393070fdeb5a922b123e Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Thu, 21 Feb 2019 11:26:31 +0100
Subject: [PATCH 25/39] change activeComponent to computed prop

---
 src/themes/default/pages/Static.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index eca6b0a02a..50317aaa6d 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -57,12 +57,10 @@ export default {
       this.activeComponent = component
     }
   },
-  watch: {
-    '$route.name': {
-      immediate: true,
-      handler: function () {
-        this.activeComponent = this.navigation.find(nav => nav.link === this.$route.path) ? this.navigation.find(nav => nav.link === this.$route.path).component : null
-      }
+  computed: {
+    activeComponent () {
+      const matchedNav = this.navigation.find(nav => nav.link === this.$route.path)
+      return matchedNav ? matchedNav.component : null
     }
   },
   data () {
@@ -76,8 +74,7 @@ export default {
         { title: i18n.t('Privacy policy'), link: '/privacy', component: StaticShortExample },
         { title: i18n.t('Size guide'), link: '/size-guide', component: StaticExample },
         { title: i18n.t('Contact us'), link: '/contact', component: StaticShortExample }
-      ],
-      activeComponent: null
+      ]
     }
   }
 }

From 42b4196d68841e0d3e7150023bcb5f52ed648437 Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Thu, 21 Feb 2019 12:04:26 +0100
Subject: [PATCH 26/39] removed redundant fn call

---
 src/themes/default/pages/Static.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index 50317aaa6d..4b311ab57a 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -13,7 +13,7 @@
           <nav class="static-menu serif h4 mb35">
             <ul class="m0 p0">
               <li class="mb10" v-for="page in navigation" :key="page.id">
-                <router-link :to="localizedRoute(page.link)" @click.native="setContent(page.component)" class="cl-accent relative">{{ page.title }}</router-link>
+                <router-link :to="localizedRoute(page.link)" class="cl-accent relative">{{ page.title }}</router-link>
               </li>
             </ul>
           </nav>
@@ -52,11 +52,6 @@ export default {
       required: true
     }
   },
-  methods: {
-    setContent (component) {
-      this.activeComponent = component
-    }
-  },
   computed: {
     activeComponent () {
       const matchedNav = this.navigation.find(nav => nav.link === this.$route.path)

From d0622b69be429458dff030dbe9fb7ef38498a357 Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Thu, 21 Feb 2019 12:43:46 +0100
Subject: [PATCH 27/39] add changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39600efa68..9f2083aa19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix links in footer to static pages bug - @filrak (#2464)
 - Improve images loading on category page, corrected alt view and blinking problem - @patzick (#2465)
 - Improve tsconfig for better IDE paths support - @patzick, @filrak (#2474)
-
+- fix breadcrumbs changing too early - @filrak (#2469)
 
 ### Deprecated / Removed
 - `@vue-storefront/store` package deprecated - @filrak

From a26656ee6da886214a38329b689963ec095410d1 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 21 Feb 2019 22:14:56 +0100
Subject: [PATCH 28/39] fix breadcrumb required value

---
 core/compatibility/components/Breadcrumbs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/compatibility/components/Breadcrumbs.js b/core/compatibility/components/Breadcrumbs.js
index c0264fa15a..b7f1c0b0c7 100644
--- a/core/compatibility/components/Breadcrumbs.js
+++ b/core/compatibility/components/Breadcrumbs.js
@@ -8,7 +8,7 @@ export default {
     },
     activeRoute: {
       type: String,
-      required: true
+      default: ''
     }
   }
 }

From eb335814684fe7aee18ea4be858e9be9650cfbd1 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 21 Feb 2019 22:15:30 +0100
Subject: [PATCH 29/39] fix carousel variable typo

---
 src/themes/default/components/core/ProductGalleryCarousel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/default/components/core/ProductGalleryCarousel.vue b/src/themes/default/components/core/ProductGalleryCarousel.vue
index 3a7badca1a..aa508269e6 100644
--- a/src/themes/default/components/core/ProductGalleryCarousel.vue
+++ b/src/themes/default/components/core/ProductGalleryCarousel.vue
@@ -66,7 +66,7 @@ export default {
     return {
       carouselTransitionSpeed: 300,
       currentPage: 0,
-      hideImageAtIndexAtIndex: null
+      hideImageAtIndex: null
     }
   },
   components: {

From 6582a9221ce1b4f783ec569df9fa49f74c0a5629 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 21 Feb 2019 22:16:57 +0100
Subject: [PATCH 30/39] correct loading gallery thumbnails

---
 core/modules/catalog/helpers/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/modules/catalog/helpers/index.ts b/core/modules/catalog/helpers/index.ts
index df672ef1b8..bf8d7c8950 100644
--- a/core/modules/catalog/helpers/index.ts
+++ b/core/modules/catalog/helpers/index.ts
@@ -535,7 +535,7 @@ export function getMediaGallery (product) {
           if (mediaItem.image) {
               mediaGallery.push({
                 'src': getThumbnailPath(mediaItem.image, rootStore.state.config.products.gallery.width, rootStore.state.config.products.gallery.height),
-                'loading': getThumbnailPath(product.image, 310, 300),
+                'loading': getThumbnailPath(mediaItem.image, 310, 300),
                 'video': mediaItem.vid
               })
           }
@@ -560,7 +560,7 @@ export function configurableChildrenImages(product) {
             if (groupedByAttribute[confChild][0].image) {
                 configurableChildrenImages.push({
                     'src': getThumbnailPath(groupedByAttribute[confChild][0].image, rootStore.state.config.products.gallery.width, rootStore.state.config.products.gallery.height),
-                    'loading': getThumbnailPath(product.image, 310, 300),
+                    'loading': getThumbnailPath(groupedByAttribute[confChild][0].image, 310, 300),
                     'id': confChild
                 })
             }

From 69b373caad5aaee86f9cbec246d309559406c6cd Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 21 Feb 2019 22:18:25 +0100
Subject: [PATCH 31/39] fix lazy loading animation and first product slie

---
 .../default/components/core/ProductGalleryCarousel.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/themes/default/components/core/ProductGalleryCarousel.vue b/src/themes/default/components/core/ProductGalleryCarousel.vue
index aa508269e6..86be01e19f 100644
--- a/src/themes/default/components/core/ProductGalleryCarousel.vue
+++ b/src/themes/default/components/core/ProductGalleryCarousel.vue
@@ -64,7 +64,7 @@ export default {
   },
   data () {
     return {
-      carouselTransitionSpeed: 300,
+      carouselTransitionSpeed: 0,
       currentPage: 0,
       hideImageAtIndex: null
     }
@@ -140,11 +140,11 @@ export default {
   right: 0;
 }
 img {
-  opacity: 0.9;
+  opacity: 1;
   mix-blend-mode: multiply;
   vertical-align: top;
   &:hover {
-    opacity: 1;
+    opacity: 0.9;
   }
 }
 img[lazy=error] {
@@ -153,6 +153,10 @@ img[lazy=error] {
 img[lazy=loading] {
   width: 100%;
 }
+img[lazy=loaded] {
+  -webkit-animation: none;
+  animation: none;
+}
 
 .video-container {
   align-items: center;

From d5a34009aae02e81af1741c2ea701680995fca2c Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 21 Feb 2019 23:23:16 +0100
Subject: [PATCH 32/39] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a3164e141..05d64a691a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve images loading on category page, corrected alt view and blinking problem - @patzick (#2465)
 - Improve tsconfig for better IDE paths support - @patzick, @filrak (#2474)
 - fix breadcrumbs changing too early - @filrak (#2469)
+- improved product gallery load view, shows correct image on reload - @patzick (#2481)
 
 ### Deprecated / Removed
 - `@vue-storefront/store` package deprecated - @filrak

From 2504b103ad691607eae586c134bfb8221e75dcf0 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Fri, 22 Feb 2019 11:17:33 +0100
Subject: [PATCH 33/39] add gallery placeholder

---
 src/themes/default/components/core/ProductGallery.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index e7d4e74cda..371e18c7df 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -21,7 +21,8 @@
             :current-slide="currentSlide"
             :product-name="product.name"
             :gallery="gallery"
-            @close="toggleZoom"/>
+            @close="toggleZoom"
+          />
           <no-ssr>
             <product-gallery-carousel
               v-if="showProductGalleryCarousel"
@@ -92,6 +93,10 @@ export default {
 .media-gallery {
   text-align: center;
   height: 100%;
+  background-image: url('/assets/placeholder.svg');
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 40% auto;
 }
 .offline-image {
   width: 100%;

From 1aa3ce2db066bb0bded7f857a4a17593569220dd Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Fri, 22 Feb 2019 11:29:32 +0100
Subject: [PATCH 34/39] update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05d64a691a..25ac07a8d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve images loading on category page, corrected alt view and blinking problem - @patzick (#2465)
 - Improve tsconfig for better IDE paths support - @patzick, @filrak (#2474)
 - fix breadcrumbs changing too early - @filrak (#2469)
-- improved product gallery load view, shows correct image on reload - @patzick (#2481)
+- improved product gallery load view, shows correct image on reload - @patzick (#2481, #2382)
 
 ### Deprecated / Removed
 - `@vue-storefront/store` package deprecated - @filrak

From d4c32c5ebc810f6f25affb0a512bcc011db95f07 Mon Sep 17 00:00:00 2001
From: Paul Emich <paul@madebymouses.com>
Date: Fri, 22 Feb 2019 15:39:50 +0100
Subject: [PATCH 35/39] Add cart.minicartCountType to config

---
 config/default.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/default.json b/config/default.json
index 3e7ed38ce2..ad851950f0 100644
--- a/config/default.json
+++ b/config/default.json
@@ -235,6 +235,7 @@
       "setConfigurableProductOptions": true,
       "askBeforeRemoveProduct": true,
       "displayItemDiscounts": true,
+      "minicartCountType": "quantities",
       "create_endpoint": "http://localhost:8080/api/cart/create?token={{token}}",
       "updateitem_endpoint": "http://localhost:8080/api/cart/update?token={{token}}&cartId={{cartId}}",
       "deleteitem_endpoint": "http://localhost:8080/api/cart/delete?token={{token}}&cartId={{cartId}}",

From a88ad9ca1f0c22ad6bd4d8d27a9366d92a6888bc Mon Sep 17 00:00:00 2001
From: Paul Emich <paul@madebymouses.com>
Date: Fri, 22 Feb 2019 15:40:08 +0100
Subject: [PATCH 36/39] Explain cart.minicartCountType in the docs

---
 docs/guide/basics/configuration.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/guide/basics/configuration.md b/docs/guide/basics/configuration.md
index 7f217dbd7d..8039577bcf 100644
--- a/docs/guide/basics/configuration.md
+++ b/docs/guide/basics/configuration.md
@@ -302,6 +302,12 @@ If this option is set to `true`, in case of configurable products, Vue Storefron
 
 If this option is set to `true`, Vue Storefront will add use price item with a discount to the shopping cart. Otherwise, the product price and special will be added to the shopping cart instead.
 
+```json
+  "minicartCountType": "quantities",
+```
+
+If this option is set to `items`, Vue Storefront will calculate the cart count based on items instead of the item quantities.
+
 ```json
   "create_endpoint": "http://localhost:8080/api/cart/create?token={{token}}",
   "updateitem_endpoint": "http://localhost:8080/api/cart/update?token={{token}}&cartId={{cartId}}",

From c07a3b5b0e01bf9302827c7998a005bd1187a163 Mon Sep 17 00:00:00 2001
From: Paul Emich <paul@madebymouses.com>
Date: Fri, 22 Feb 2019 15:40:47 +0100
Subject: [PATCH 37/39] Return the cartItems length instead of the total
 quantities based on the config setting

---
 core/modules/cart/store/getters.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/modules/cart/store/getters.ts b/core/modules/cart/store/getters.ts
index 5ec470a3eb..4a78163939 100644
--- a/core/modules/cart/store/getters.ts
+++ b/core/modules/cart/store/getters.ts
@@ -45,7 +45,11 @@ const getters: GetterTree<CartState, RootState> = {
       return totalsArray
     }
   },
-  totalQuantity (state) {
+  totalQuantity (state, getters, rootStore) {
+    if (rootStore.config.cart.minicartCountType === 'items') {
+      return state.cartItems.length
+    }
+
     return sumBy(state.cartItems, (p) => {
       return p.qty
     })

From fc949b8614cd7f36823f2ba8484583d1f15a0c08 Mon Sep 17 00:00:00 2001
From: Paul Emich <paul@madebymouses.com>
Date: Fri, 22 Feb 2019 15:55:50 +0100
Subject: [PATCH 38/39] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05d64a691a..f56e1dddc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve tsconfig for better IDE paths support - @patzick, @filrak (#2474)
 - fix breadcrumbs changing too early - @filrak (#2469)
 - improved product gallery load view, shows correct image on reload - @patzick (#2481)
+- add cart count config, allows you to display the item count instead of a sum of the item quantities - @pauluse
 
 ### Deprecated / Removed
 - `@vue-storefront/store` package deprecated - @filrak

From 1308f7cf7c1ec4ad278fbd630b1d2447aaee643b Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Fri, 22 Feb 2019 22:52:34 +0100
Subject: [PATCH 39/39] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b2ae837a1..c39e46c4c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve images loading on category page, corrected alt view and blinking problem - @patzick (#2465)
 - Improve tsconfig for better IDE paths support - @patzick, @filrak (#2474)
 - fix breadcrumbs changing too early - @filrak (#2469)
-- improved product gallery load view, shows correct image on reload - @patzick (#2481)
 - add cart count config, allows you to display the item count instead of a sum of the item quantities - @pauluse (#2483)
 - improved product gallery load view, shows correct image on reload - @patzick (#2481, #2382)