From 095f1d7f3db5475e80c9107f67177a8b5874833a Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 13 Feb 2020 14:00:17 +0100
Subject: [PATCH 1/3] 4030 remove gallery prefetch js, add font to head, move
 common js from app to vendor

---
 core/build/webpack.client.config.ts                          | 2 +-
 src/themes/default/components/core/ProductGallery.vue        | 3 +--
 src/themes/default/components/core/ProductGalleryOverlay.vue | 2 +-
 src/themes/default/components/core/ProductImage.vue          | 4 ++--
 src/themes/default/css/base/_fonts.scss                      | 1 -
 src/themes/default/css/main.scss                             | 1 -
 src/themes/default/head.js                                   | 3 ++-
 7 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 src/themes/default/css/base/_fonts.scss

diff --git a/core/build/webpack.client.config.ts b/core/build/webpack.client.config.ts
index 7eb6814584..6a3d71fea1 100644
--- a/core/build/webpack.client.config.ts
+++ b/core/build/webpack.client.config.ts
@@ -9,7 +9,7 @@ const config = merge(base, {
     splitChunks: {
       cacheGroups: {
         commons: {
-          test: /[\\/]node_modules[\\/](vue|vuex|vue-router|vue-meta|vue-i18n|vuex-router-sync|localforage)[\\/]/,
+          test: /[\\/]node_modules[\\/](vue|vuex|vue-router|vue-meta|vue-i18n|vuex-router-sync|localforage|lean-he|vue-lazyload|js-sha3|dayjs|core-js|whatwg-fetch|vuelidate)[\\/]/,
           name: 'vendor',
           chunks: 'all'
         }
diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index be9975b86c..cd928ea533 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -31,8 +31,7 @@ import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
 import NoSSR from 'vue-no-ssr'
 import ProductImage from './ProductImage'
 import { onlineHelper } from '@vue-storefront/core/helpers'
-
-const ProductGalleryCarousel = () => import(/* webpackChunkName: "vsf-product-gallery-carousel" */ './ProductGalleryCarousel.vue')
+import ProductGalleryCarousel from './ProductGalleryCarousel.vue'
 
 export default {
   components: {
diff --git a/src/themes/default/components/core/ProductGalleryOverlay.vue b/src/themes/default/components/core/ProductGalleryOverlay.vue
index d43979f438..d6154f283d 100644
--- a/src/themes/default/components/core/ProductGalleryOverlay.vue
+++ b/src/themes/default/components/core/ProductGalleryOverlay.vue
@@ -16,7 +16,7 @@
 </template>
 <script>
 import NoSSR from 'vue-no-ssr'
-const ProductGalleryZoomCarousel = () => import(/* webpackChunkName: "vsf-product-gallery-zoom-carousel" */ './ProductGalleryZoomCarousel.vue')
+import ProductGalleryZoomCarousel from './ProductGalleryZoomCarousel.vue'
 
 export default {
   name: 'ProductGalleryOverlay',
diff --git a/src/themes/default/components/core/ProductImage.vue b/src/themes/default/components/core/ProductImage.vue
index 9854f75695..21ebacf866 100644
--- a/src/themes/default/components/core/ProductImage.vue
+++ b/src/themes/default/components/core/ProductImage.vue
@@ -14,7 +14,7 @@
     <img
       v-if="!lowerQualityImageError || isOnline"
       v-show="showLowerQuality"
-      :src="image.loading"
+      v-lazy="image.loading"
       :alt="alt"
       @load="imageLoaded('lower', true)"
       @error="imageLoaded('lower', false)"
@@ -24,7 +24,7 @@
     <img
       v-if="!highQualityImageError || isOnline"
       v-show="showHighQuality"
-      :src="image.src"
+      v-lazy="image.src"
       :alt="alt"
       @load="imageLoaded('high', true)"
       @error="imageLoaded('high', false)"
diff --git a/src/themes/default/css/base/_fonts.scss b/src/themes/default/css/base/_fonts.scss
deleted file mode 100644
index c6203f700f..0000000000
--- a/src/themes/default/css/base/_fonts.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import url('https://fonts.googleapis.com/css?family=Playfair+Display:400,700|Roboto:400,700|Material+Icons&display=swap');
diff --git a/src/themes/default/css/main.scss b/src/themes/default/css/main.scss
index e09b296a12..3d0bdeaa1f 100644
--- a/src/themes/default/css/main.scss
+++ b/src/themes/default/css/main.scss
@@ -1,4 +1,3 @@
-@import 'base/fonts';
 @import 'vendor/flexboxgrid2';
 
 @import 'variables/variables';
diff --git a/src/themes/default/head.js b/src/themes/default/head.js
index fb70d4a69f..582643eecb 100644
--- a/src/themes/default/head.js
+++ b/src/themes/default/head.js
@@ -24,7 +24,8 @@ export default {
     { rel: 'apple-touch-startup-image', href: '/assets/apple_splash_1242.png', sizes: '1242x2208' },
     { rel: 'apple-touch-startup-image', href: '/assets/apple_splash_750.png', sizes: '750x1334' },
     { rel: 'apple-touch-startup-image', href: '/assets/apple_splash_640.png', sizes: '640x1136' },
-    { rel: 'manifest', href: '/assets/manifest.json' }
+    { rel: 'manifest', href: '/assets/manifest.json' },
+    { rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Playfair+Display:400,700|Roboto:400,700|Material+Icons&display=swap' }
   ],
   script: [
     {

From 58a15a4d7e6143f0738575bfb931f0e7fe464046 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 13 Feb 2020 14:42:16 +0100
Subject: [PATCH 2/3] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1298ff80b3..a32d736be4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed / Improved
 - Set cache tag when loading a category - @haelbichalex (#3940)
 - In development build `webpack.config.js` in theme folder is now called without the `default` key
+- optimizations - improved prefetch strategy - @gibkigonzo (#4080)
 
 ### Fixed
 - Added Finnish translations - @mattiteraslahti and @alphpkeemik

From 6c8a0270891cbc008def1f762f5a0f13ffa0d5b7 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 13 Feb 2020 15:32:59 +0100
Subject: [PATCH 3/3] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ceed31ce6..5f17f25c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed / Improved
 - Set cache tag when loading a category - @haelbichalex (#3940)
-- In development build `webpack.config.js` in theme folder is now called without the `default` key
 - In development build `webpack.config.js` in theme folder is now called without the `default` key - @psmyrek
 
 ### Fixed