vuestorefront · andrzejewsky · Nov 4, 2019 · Sep 27, 2019 · Sep 28, 2019 · Sep 28, 2019
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,6 +1,7 @@
 module.exports = {
   root: true,
   env: { browser: true, jest: true },
+  globals: { fetchMock: true },
   parser: 'vue-eslint-parser',
   parserOptions: {
     parser: '@typescript-eslint/parser',

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,43 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.11.0-rc.2] - UNRELEASED
+## [1.11.0-rc.2] - 2019.10.31
 
 ### Fixed
+- Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
+- Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
+- Fixed three problems you can run into when you have bundle products - @resubaka (#3692)
+- Reset nested menu after logout - @gibkigonzo (#3680)
+- Fixed handling checkbox custom option -  @gibkigonzo (#2781)
+- Fixed typos in docs - @afozbek (#3709)
+- Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
+- Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
+- Allow falsy value for `parent_id` when searching category - @gibkigonzo (#3732)
+- Remove including .map files in service worker cache - @gibkigonzo (#3734)
+- Changed notification message object to factory fn - @gibkigozno (#3716)
+- Load recently viewed module in my account page - @gibkigonzo (#3722)
+- Added validation message for city field on checkout page - @dz3n (#3723)
+- Make price calculation based on saved original prices - @gibkigonzo (#3740)
+- Improving is_comparable to work with booleans and digits - @dz3n (#3697)
+- Fixed displaying categories on search menu - @andrzejewsky (#3758)
+- Fixed broken link for store locator - @andrzejewsky (#3754)
+- Fixed instant checkout functionality - @andrzejewsky (#3765)
+- Fixed links to the promoted banners - @andrzejewsky (#3753)
+- Fixed missing parameter in the compare list - @andrzejewsky (#3757)
+- Fixed product link on mobile - @andrzejewsky (#3772)
 
+### Added
+- Added support for ES7 - @andrzejewsky (#3690)
+- Added unit tests for `core/modules/mailer` - @krskibin (#3710)
+- Get payment methods with billing address data - @rain2o (#2878)
+- Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
+- Remove unused dayjs locales - @gibkigonzo (#3498)
+- check max quantity in microcart - @gibkigonzo (#3314)
+- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
+- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
+
+### Changed / Improved
+- Use `encodeURIComponent` to encode get parameters in `multimatch.js` - @adityasharma7 (#3736)
 
 ## [1.11.0-rc.1] - 2019.10.03
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -35,24 +35,22 @@ Here are some thoughts on how to use TypeScript features in Vue Storefront: [Typ
 
 ## Pull Request Checklist
 
-Here's how to submit a pull request. **Pull request that don't meet these requirements will not be merged.**
-
-**ALWAYS** use the [Pull Request template](https://github.com/DivanteLtd/vue-storefront/blob/master/PULL_REQUEST_TEMPLATE.md) it's automatically added to each PR.
-1. Fork the repository and clone it locally fro the 'develop' branch. Make sure it's up to date with current `develop` branch
+**ALWAYS** use [Pull Request template](https://github.com/DivanteLtd/vue-storefront/blob/master/PULL_REQUEST_TEMPLATE.md) it's automatically added to each PR.
+1. Fork the repository and clone it locally from the 'develop' branch. Make sure it's up to date with current `develop` branch
 2. Create a branch for your edits. Use the following branch naming conventions:
  * bugfix/task-title
  * feature/task-name
 3. Use Pull Request template and fill as much fields as possible to describe your solution.
 4. Reference any relevant issues or supporting documentation in your PR (ex. “Issue: 39. Issue title.”).
 5. If you are adding new feature provide documentation along with the PR. Also, add it to [upgrade notes](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Upgrade%20notes.md)
 6. If you are removing/renaming something or changing its behavior also include it in [upgrade notes](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Upgrade%20notes.md)
-7. Test your changes! Run your changes against any existing tests and create new ones when needed. Make sure your changes don’t break the existing project. Make sure that your branch is passing Travis CI build. 
+7. Test your changes! Run your changes against any existing tests and create new ones when needed. Make sure your changes don’t break the existing project. Make sure that your branch is passing Travis CI build.
 8. If you have found a potential security vulnerability, please DO NOT report it on the public issue tracker. Instead, send it to us at contributors@vuestorefront.io. We will work with you to verify and fix it as soon as possible.
 (https://github.com/DivanteLtd/vue-storefront/blob/master/README.md#documentation--table-of-contents))
 
 ## Acceptance Criteria
 
 Your pull request will be merged after meeting following criteria:
 - Everything from "Pull Request Checklist"
-- Pull request is proposed to appropriate branch 
+- PR is proposed to appropriate branch
 - There are at least two approvals from core team members
diff --git a/config/default.json b/config/default.json
@@ -183,15 +183,15 @@
       "validSearchOptionsFromRouteParams": ["url-key", "slug", "id"]
     },
     "attribute": {
-      "includeFields": [ "attribute_code", "id", "entity_type_id", "options", "default_value", "is_user_defined", "frontend_label", "attribute_id", "default_frontend_label", "is_visible_on_front", "is_visible", "is_comparable", "tier_prices", "frontend_input" ]
+      "includeFields": [ "activity", "attribute_code", "id", "entity_type_id", "options", "default_value", "is_user_defined", "frontend_label", "attribute_id", "default_frontend_label", "is_visible_on_front", "is_visible", "is_comparable", "tier_prices", "frontend_input" ]
     },
     "productList": {
       "sort": "updated_at:desc",
-      "includeFields": [ "type_id", "*sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "url_path", "url_key", "status", "tier_prices", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "*image","*small_image", "configurable_children.color", "configurable_children.size", "configurable_children.tier_prices"],
+      "includeFields": [ "activity", "type_id", "*sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "url_path", "url_key", "status", "tier_prices", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "*image","*small_image", "configurable_children.color", "configurable_children.size", "configurable_children.tier_prices", "final_price", "configurable_children.final_price"],
       "excludeFields": [ "description", "configurable_options", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options" ]
     },
     "productListWithChildren": {
-      "includeFields": [ "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices"],
+      "includeFields": [ "activity", "type_id", "sku", "name", "tax_class_id", "final_price", "special_price", "special_to_date", "special_from_date", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices", "configurable_children.special_to_date", "configurable_children.special_from_date", "configurable_children.regular_price", "configurable_children.final_price"],
       "excludeFields": [ "description", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options"]
     },
     "review": {
@@ -311,6 +311,7 @@
     "setupVariantByAttributeCode": true,
     "endpoint": "/api/product",
     "defaultFilters": ["color", "size", "price", "erin_recommends"],
+    "systemFilterNames": ["sort"],
     "maxFiltersQuerySize": 999,
     "routerFiltersSource": "query",
     "filterFieldMapping": {

diff --git a/core/build/webpack.base.config.ts b/core/build/webpack.base.config.ts
@@ -1,3 +1,4 @@
+import { buildLocaleIgnorePattern } from './../i18n/helpers';
 import path from 'path';
 import config from 'config';
 import fs from 'fs';
@@ -60,6 +61,7 @@ const isProd = process.env.NODE_ENV === 'production'
 // todo: usemultipage-webpack-plugin for multistore
 export default {
   plugins: [
+    new webpack.ContextReplacementPlugin(/dayjs[/\\]locale$/, buildLocaleIgnorePattern()),
     new webpack.ProgressPlugin(),
     // new BundleAnalyzerPlugin({
     //   generateStatsFile: true

diff --git a/core/build/webpack.prod.sw.config.ts b/core/build/webpack.prod.sw.config.ts
@@ -20,7 +20,9 @@ module.exports = merge(base, {
       filename: 'service-worker.js',
       staticFileGlobsIgnorePatterns: [/\.map$/],
       staticFileGlobs: [
-        'dist/**.*',
+        'dist/**.*.js',
+        'dist/**.*.json',
+        'dist/**.*.css',
         'assets/**.*',
         'assets/ig/**.*',
         'index.html',

diff --git a/core/i18n/helpers.ts b/core/i18n/helpers.ts
@@ -0,0 +1,29 @@
+import config from 'config'
+
+export const currentBuildLocales = (): string[] => {
+  const defaultLocale = config.i18n.defaultLocale || 'en-US'
+  const multistoreLocales = config.storeViews.multistore
+    ? Object.values(config.storeViews)
+      .map((store: any) => store && typeof store === 'object' && store.i18n && store.i18n.defaultLocale)
+      .filter(Boolean)
+    : []
+  const locales = multistoreLocales.includes(defaultLocale)
+    ? multistoreLocales
+    : [defaultLocale, ...multistoreLocales]
+
+  return locales
+}
+
+export const transformToShortLocales = (locales: string[]): string[] => locales.map(locale => {
+  const separatorIndex = locale.indexOf('-')
+  const shortLocale = separatorIndex ? locale.substr(0, separatorIndex) : locale
+
+  return shortLocale
+})
+
+export const buildLocaleIgnorePattern = (): RegExp => {
+  const locales = transformToShortLocales(currentBuildLocales())
+  const localesRegex = locales.map(locale => `${locale}$`).join('|')
+
+  return new RegExp(localesRegex)
+}
diff --git a/core/i18n/index.ts b/core/i18n/index.ts
@@ -28,12 +28,12 @@ function setI18nLanguage (lang: string): string {
 const loadDateLocales = async (lang: string = 'en'): Promise<void> => {
   let localeCode = lang.toLocaleLowerCase()
   try { // try to load full locale name
-    await import(/* webpackChunkName: "dayjs-locales" */ `dayjs/locale/${localeCode}`)
+    await import(/* webpackChunkName: "dayjs-locales-[request]" */ `dayjs/locale/${localeCode}`)
   } catch (e) { // load simplified locale name, example: de-DE -> de
     const separatorIndex = localeCode.indexOf('-')
     if (separatorIndex) {
       localeCode = separatorIndex ? localeCode.substr(0, separatorIndex) : localeCode
-      await import(/* webpackChunkName: "dayjs-locales" */ `dayjs/locale/${localeCode}`)
+      await import(/* webpackChunkName: "dayjs-locales-[request]" */ `dayjs/locale/${localeCode}`)
     }
   }
 }
@@ -62,6 +62,4 @@ export async function loadLanguageAsync (lang: string): Promise<string> {
   return lang
 }
 
-loadLanguageAsync(config.i18n.defaultLocale)
-
 export default i18n
diff --git a/core/i18n/resource/i18n/cs-CZ.csv b/core/i18n/resource/i18n/cs-CZ.csv
@@ -26,6 +26,7 @@
 "No products synchronized for this category. Please come back while online!","V této kategorii nemáte žádné synchronizované produkty. Zkuste prosím znovu až budete online!"
 "No such configuration for the product. Please do choose another combination of attributes.","Neexistuje žádná taková konfigurace pro daný výrobek. Vyberte prosím jinou kombinaci vlastností."
 "OK","OK"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Vyprodáno!"
 "Out of the stock!","Není skladem!"
 "Payment Information","Informace o platbě"
@@ -36,6 +37,7 @@
 "Proceed to checkout","Přejděte k nákupu"
 "Product has been added to the cart!","Produkt byl přidán do košíku!"
 "Product price is unknown, product cannot be added to the cart!","Cena produktu není známa, produkt nelze přidat do košíku!"
+"Product quantity has been updated!","Množství produktu bylo aktualizováno!"
 "Product {productName} has been added to the compare!","Produkt {productName} byl přidán k porovnání!"
 "Product {productName} has been added to wishlist!","Produkt {productName} byl přidán do seznamu přání!"
 "Product {productName} has been removed from compare!","Produkt {productName} byl odstraněn z porovnávání!"

diff --git a/core/i18n/resource/i18n/de-DE.csv b/core/i18n/resource/i18n/de-DE.csv
@@ -28,6 +28,7 @@
 "No products synchronized for this category. Please come back while online!","Es sind keine Produkte für diese Kategorie synchronisiert. Bitte versuchen Sie es erneut, wenn Sie online sind!"
 "No such configuration for the product. Please do choose another combination of attributes.","Diese Konfiguration ist für dieses Produkt nicht möglich. Bitte wählen Sie eine andere Kombination von Eigenschaften."
 "OK","OK"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Nicht auf Lager!"
 "Out of the stock!","Nicht mehr auf Lager!"
 "Payment Information","Bezahlinformationen"
@@ -40,6 +41,7 @@
 "Processing order...","Bestellung wird verarbeitet..."
 "Product has been added to the cart!","Produkt wurde zum Warenkorb hinzugefügt!"
 "Product price is unknown, product cannot be added to the cart!","Der Produktpreis ist unbekannt, daher kann dieses Produkt nicht zum Warenkorb hinzugefügt werden!"
+"Product quantity has been updated!","Produktmenge wurde aktualisiert!"
 "Product {productName} has been added to the compare!","Das Produkt {productName} wurde zur Vergleichsliste hinzugefügt!"
 "Product {productName} has been added to wishlist!","Das Produkt {productName} wurde der Wunschliste hinzugefügt!"
 "Product {productName} has been removed from compare!","Das Produkt {productName} wurde von der Vergleichsliste entfernt!"

diff --git a/core/i18n/resource/i18n/en-US.csv b/core/i18n/resource/i18n/en-US.csv
@@ -29,6 +29,7 @@
 "No products synchronized for this category. Please come back while online!","No products synchronized for this category. Please come back while online!"
 "No such configuration for the product. Please do choose another combination of attributes.","No such configuration for the product. Please do choose another combination of attributes."
 "OK","OK"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back.","Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back."
 "Out of stock!","Out of stock!"
 "Out of the stock!","Out of the stock!"

diff --git a/core/i18n/resource/i18n/es-ES.csv b/core/i18n/resource/i18n/es-ES.csv
@@ -15,10 +15,12 @@
 "Newsletter preferences have successfully been updated","Las preferencias del boletín se han actualizado con éxito"
 "No products synchronized for this category. Please come back while online!","No hay productos sincronizados para esta categoría. Por favor regrese mientras esta en linea!"
 "No such configuration for the product. Please do choose another combination of attributes.","No hay tal configuración para el producto. Por favor, elija otra combinación de atributos."
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","¡Agotado!"
 "Please fix the validation errors","Corrija los errores de validación"
 "Product has been added to the cart!","¡El producto ha sido agregado al carrito!"
 "Product price is unknown, product cannot be added to the cart!","El precio del producto es desconocido, ¡el producto no se puede agregar al carrito!"
+"Product quantity has been updated!","¡La cantidad del producto ha sido actualizada!"
 "Product {productName} has been added to the compare!","¡El producto {productName} se ha agregado a la comparación!"
 "Product {productName} has been added to wishlist!","¡El producto {productName} ha sido agregado a la lista de deseos!"
 "Product {productName} has been removed from compare!","¡El producto {productName} ha sido eliminado de la comparación!"

diff --git a/core/i18n/resource/i18n/fr-FR.csv b/core/i18n/resource/i18n/fr-FR.csv
@@ -20,13 +20,15 @@
 "No products synchronized for this category. Please come back while online!","Aucun produit synchronisé dans cette catégorie. Merci de passer en ligne !"
 "No such configuration for the product. Please do choose another combination of attributes.","Aucune configuration de ce type pour le produit. Veuillez choisir une autre combinaison d'attributs."
 "OK","OK"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Rupture de stock !"
 "Out of the stock!","Épuisé !"
 "Please configure product custom options and fix the validation errors","Veuillez configurer les options du produit et corriger les erreurs de validation"
 "Please fix the validation errors","Veuillez corriger les erreurs de validation"
 "Proceed to checkout","Passer la commande"
 "Product has been added to the cart!","Le produit a été ajouté au panier !"
 "Product price is unknown, product cannot be added to the cart!","Le prix du produit est inconnu, le produit ne peut pas être ajouté au panier !"
+"Product quantity has been updated!","La quantité de produit a été mise à jour!"
 "Product {productName} has been added to the compare!","Le produit {productName} a été ajouté au comparateur !"
 "Product {productName} has been added to wishlist!","Le produit {productName} a été ajouté à la liste des souhaits !"
 "Product {productName} has been removed from compare!","Le produit {productName} a été supprimé du comparateur !"

diff --git a/core/i18n/resource/i18n/it-IT.csv b/core/i18n/resource/i18n/it-IT.csv
@@ -29,6 +29,7 @@
 "No products synchronized for this category. Please come back while online!","Nessun prodotto in questa categoria. Verifica la connessione di rete e riprova!"
 "No such configuration for the product. Please do choose another combination of attributes.","Configurazione del prodotto inesistente. Scegli un'altra combinazione di attributi"
 "OK","OK"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back.","Oppure se rimarrai nella pagina di "Conferma ordine", l'ordine verrà automaticamente evaso senza conferma, una volta che la connessione sarà ripristinata."
 "Out of stock!","Non disponibile"
 "Out of the stock!","Non disponibile"