Merge branch 'master' into dev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "housesof",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Houses Of website",
   "author": {
     "name": "Flayks",
@@ -25,15 +25,15 @@
     "rellax": "^1.12.1",
     "scroll-out": "^2.2.8",
     "sirv": "^0.4.2",
-    "svelte-lazy": "^0.1.10",
+    "svelte-lazy": "^0.1.11",
     "swipe-listener": "^1.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
+    "@babel/core": "^7.9.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.9.0",
-    "@babel/preset-env": "^7.9.5",
-    "@babel/runtime": "^7.9.2",
+    "@babel/plugin-transform-runtime": "^7.9.6",
+    "@babel/preset-env": "^7.9.6",
+    "@babel/runtime": "^7.9.6",
     "@rollup/plugin-alias": "^3.1.0",
     "@rollup/plugin-babel": "^5.0.0",
     "@rollup/plugin-commonjs": "11.0.2",
@@ -42,16 +42,16 @@
     "autoprefixer": "^9.7.6",
     "dotenv": "^8.2.0",
     "node-fetch": "^2.6.0",
-    "node-sass": "^4.14.0",
-    "postcss": "^7.0.27",
+    "node-sass": "^4.14.1",
+    "postcss": "^7.0.29",
     "postcss-load-config": "^2.1.0",
     "postcss-preset-env": "^6.7.0",
-    "rollup": "^2.7.3",
+    "rollup": "^2.8.0",
     "rollup-plugin-glslify": "^1.2.0",
     "rollup-plugin-svelte": "^5.2.1",
     "rollup-plugin-terser": "^5.3.0",
     "sapper": "^0.27.12",
-    "svelte": "^3.21.0",
+    "svelte": "^3.22.2",
     "svelte-preprocess": "^3.7.4"
   },
   "browserslist": [

rollup.config.js

@@ -105,14 +105,13 @@ export default {
                 ...replaceOptions
             }),
             svelte({
+                generate: 'ssr',
                 dev,
-                preprocess,
-                generate: 'ssr'
+                preprocess
             }),
             aliases,
             glslify(),
             resolve({
-                browser: true,
                 extensions: resolveExtensions,
                 dedupe: ['svelte']
             }),
@@ -128,21 +127,22 @@ export default {
     /*
     ** Service worker
     */
-    // ...(!dev && {
-        // serviceworker: {
-        //     input: sapperConfig.serviceworker.input(),
-        //     output: sapperConfig.serviceworker.output(),
-        //     plugins: [
-        //         resolve(),
-        //     aliases,
-        //         replace({
-        //             'process.browser': true,
-        //             ...replaceOptions
-        //         }),
-        //         commonjs(),
-        //         !dev && terser()
-        //     ],
-        //     onwarn,
-        // }
-    // })
+    ...(!dev && {
+        serviceworker: {
+            input: sapperConfig.serviceworker.input(),
+            output: sapperConfig.serviceworker.output(),
+            plugins: [
+                resolve(),
+                replace({
+                    'process.browser': false,
+                    ...replaceOptions
+                }),
+                aliases,
+                glslify(),
+                commonjs(),
+                !dev && terser()
+            ],
+            onwarn,
+        }
+    })
 }

src/routes/sitemap.xml.js

@@ -46,7 +46,7 @@ const render = (pages, locations) => {
 // Get function
 export async function get (req, res, next) {
     // Define base url from request
-    baseURL = `http${(req.httpVersion >= 2) ? 's' : ''}://${req.headers.host}`
+    baseURL = `https://${req.headers.host}`
 
     // Get locations
     const locationsReq = await fetch(`${apiEndpoints.rest}/items/locations?fields=slug,country.slug,modified_on&status=published`)

src/style/molecules/_newsletter.scss

@@ -40,10 +40,10 @@
     &--small {
         .newsletter__text {
             max-width: 344px;
-            margin-bottom: 56px;
+            margin-bottom: 32px;
 
             @include breakpoint (sm) {
-                margin-bottom: 72px;
+                margin-bottom: 48px;
             }
         }
     }

src/style/organisms/_pagination.scss

@@ -99,16 +99,14 @@
 
     // Message
     &__message {
-        padding: pxVW(40) 0;
-
         h3 {
             font-family: $font-serif;
             font-size: rem(32px);
             color: $color-secondary;
-            margin-bottom: 24px;
+            margin-bottom: 16px;
 
             @include breakpoint (sm) {
-                margin-bottom: 32px;
+                margin-bottom: 24px;
                 font-size: rem(40px);
             }
         }