Update develop/1.12.1

.github/workflows/deploy-storefrontcloud.yml

@@ -11,15 +11,18 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
+      - name: Add theme
+        run: |
+          git clone --single-branch --branch master https://github.com/DivanteLtd/vsf-default.git ./src/themes/default
       - name: Setup node
         uses: actions/setup-node@v1
         with:
           node-version: "10.x"
       - name: Create config file
         run: |
-          echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://demo.storefrontcloud.io"}}' > config/local-cloud-demo.json
-          echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://demo.storefrontcloud.io"}}' > config/local-cloud-next.json
-          echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://test.storefrontcloud.io"}}' > config/local-cloud-test.json
+          echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://demo.storefrontcloud.io"},"elasticsearch":{"index":"vue_storefront_magento_1"},"entities":{"attribute":{"loadByAttributeMetadata":true}},"urlModule":{"enableMapFallbackUrl":true}}' > config/local-cloud-demo.json
+          echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://demo.storefrontcloud.io"},"elasticsearch":{"index":"vue_storefront_magento_1"},"entities":{"attribute":{"loadByAttributeMetadata":true}},"urlModule":{"enableMapFallbackUrl":true}}' > config/local-cloud-next.json
+          echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://test.storefrontcloud.io"},"elasticsearch":{"index":"vue_storefront_magento_1"},"entities":{"attribute":{"loadByAttributeMetadata":true}},"urlModule":{"enableMapFallbackUrl":true}}' > config/local-cloud-test.json
       - name: Build and publish docker image
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
@@ -85,4 +88,4 @@ jobs:
           target_url: https://demo.storefrontcloud.io
           description: Unfortunately, the instance hasn't been updated.
           state: "failure"
-          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+          deployment_id: ${{ steps.deployment.outputs.deployment_id }}

CHANGELOG.md

@@ -5,7 +5,23 @@ 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.12.0-rc1] - UNRELEASED
+## [1.12.1] - 2020.06.22
+
+### Added
+
+- Add `purgeConfig` to default.json and purge-config loader - @gibkigonzo (#4540)
+- Load attributes data of attribute-meta for bundled and grouped products - @cewald (#4551)
+- Separate theme installation and add it as yarn init:theme or as a step in yarn installer. - @gibkigonzo (4534, #4552)
+
+### Fixed
+
+- use `config.i18n.defaultLocale` as fallback locale instead of `'en-US'` - @gibkigonzo (#4489)
+- use Math.abs on raw price - @gibkigonzo (#4521)
+- Clears vuex warnings about overriding state by module - @gibkigonzo (#4541)
+
+### Changed / Improved
+
+## [1.12.0] - 2020.06.01
 
 ### Added
 
@@ -61,6 +77,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - removed possible memory leak in ssr - @resubaka (#4247)
 - Bugfix for reactivity of `current_configuration` in `populateProductConfigurationAsync` - @cewald (#4258)
 - Bugfix for build exception in Node v13.13+ - @cewald (#4249)
+- Convert option ids to string while comparing them in `getProductConfiguration` - @gibkigonzo (#4484)
+- change value to number in price filter - @gibkigonzo (#4478)
 
 ### Changed / Improved
 
@@ -79,6 +97,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Homepage, new products query, uses now `new` attribute - @mdanilwoicz
 - Refactor product module, more info in upgrade notes- @gibkigonzo (#3952, #4459)
 - Move default theme to separate repository https://github.com/DivanteLtd/vsf-default - @gibkigonzo (#4255)
+- add two numbers after dot to price by default, calculate default price for bundle or grouped main product, update typing, add fallback to attribute options - @gibkigonzo (#4476)
+- udpate yarn and filter shipping methods for instant checkout - @gibkigonzo (#4480)
+- add attribute metadata search query, add parentId - @gibkigonzo (#4491)
 
 ## [1.11.4] - 2020.05.26
 

README.md

@@ -156,6 +156,7 @@ You can find some tutorials and explanations on our [YouTube channel](https://ww
 - [Starter pack for install](https://docs.vuestorefront.io/guide/cookbook/setup.html)
 - [Installing on Linux/MacOS](https://docs.vuestorefront.io/guide/installation/linux-mac.html)
 - [Installing on Windows](https://docs.vuestorefront.io/guide/installation/windows.html)
+- [Installing theme](https://docs.vuestorefront.io/guide/installation/theme.html)
 - [How to install and integrate with Magento2](https://docs.vuestorefront.io/guide/installation/magento.html)
 - [Production setup](https://docs.vuestorefront.io/guide/installation/production-setup.html)
 

config/default.json

@@ -871,5 +871,17 @@
   },
   "varnish": {
     "enabled":false
-  }
+  },
+  "purgeConfig": [
+    "server.invalidateCacheKey",
+    "server.invalidateCacheForwardUrl",
+    "server.trace",
+    "redis",
+    "install",
+    "expireHeaders",
+    "fastly",
+    "nginx",
+    "varnish",
+    "cloudflare"
+  ]
 }

core/build/purge-config.js

@@ -0,0 +1,16 @@
+const omit = require('lodash/omit')
+
+/**
+ * clear config properties that shouldn't be visible on frontend
+ */
+module.exports = function loader(source) {
+  let config = JSON.parse(source);
+
+  const purgeConfig = (config.purgeConfig || []).slice()
+
+  config = omit(config, purgeConfig)
+
+  delete config['purgeConfig']
+
+  return JSON.stringify(config);
+}

core/build/theme-path.js

@@ -15,9 +15,7 @@ else {
   if(!fs.existsSync(themePath)) {
     console.error(`
       The theme you want to use does not exist.
-      Please use 'vsf init' or install manualy one of our official themes:
-      - https://github.com/DivanteLtd/vsf-capybara#--installation
-      - https://github.com/DivanteLtd/vsf-default#--installation
+      Please check theme installation: https://docs.vuestorefront.io/guide/installation/theme.html
     `)
     process.exit(1)
   }

core/build/webpack.base.config.ts

@@ -193,6 +193,10 @@ export default {
         test: /\.(graphqls|gql)$/,
         exclude: /node_modules/,
         loader: ['graphql-tag/loader']
+      },
+      {
+        test: /core\/build\/config\.json$/,
+        loader: path.resolve('core/build/purge-config.js')
       }
     ]
   }

core/filters/price.js

@@ -27,14 +27,14 @@ export function price (value, storeView) {
   }
   const _storeView = storeView || currentStoreView();
   if (!_storeView.i18n) {
-    return value;
+    return Number(value).toFixed(2)
   }
 
   const { defaultLocale, currencySign, currencyDecimal, currencyGroup, fractionDigits, priceFormat } = _storeView.i18n;
 
   const options = { minimumFractionDigits: fractionDigits, maximumFractionDigits: fractionDigits };
 
-  let localePrice = Math.abs(value.toLocaleString(defaultLocale, options));
+  let localePrice = Math.abs(value).toLocaleString(defaultLocale, options);
 
   if (currencyDecimal !== '' || currencyGroup !== '') {
     localePrice = replaceSeparators(localePrice, { decimal: currencyDecimal, group: currencyGroup }, getLocaleSeparators(defaultLocale));

core/i18n/index.ts

@@ -8,12 +8,13 @@ once('__VUE_EXTEND_I18N__', () => {
   Vue.use(VueI18n)
 })
 
-const loadedLanguages = ['en-US']
+const defaultLocale = config.i18n.defaultLocale || 'en-US'
+const loadedLanguages = [defaultLocale]
 const i18n = new VueI18n({
-  locale: config.i18n.bundleAllStoreviewLanguages ? config.i18n.defaultLocale : 'en-US', // set locale
-  fallbackLocale: 'en-US',
+  locale: defaultLocale, // set locale
+  fallbackLocale: defaultLocale,
   messages: config.i18n.bundleAllStoreviewLanguages ? require('./resource/i18n/multistoreLanguages.json') : {
-    'en-US': require('./resource/i18n/en-US.json')
+    [defaultLocale]: require(`./resource/i18n/${defaultLocale}.json`)
   }
 })
 

core/i18n/package.json

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

core/i18n/scripts/translation.preprocessor.js

@@ -17,7 +17,7 @@ function convertToObject (array) {
 
 module.exports = function (csvDirectories, config = null) {
   const currentLocales = currentBuildLocales()
-  const fallbackLocale = 'en-US'
+  const fallbackLocale = config.i18n.defaultLocale || 'en-US'
   let messages = {}
   let languages = []
 
@@ -43,7 +43,7 @@ module.exports = function (csvDirectories, config = null) {
 
   // create fallback
   console.debug(`Writing JSON file fallback: ${fallbackLocale}.json`)
-  fs.writeFileSync(path.join(__dirname, '../resource/i18n', `${fallbackLocale}.json`), JSON.stringify(messages[fallbackLocale]))
+  fs.writeFileSync(path.join(__dirname, '../resource/i18n', `${fallbackLocale}.json`), JSON.stringify(messages[fallbackLocale] || {}))
 
   // bundle all messages in one file
   if (config && config.i18n.bundleAllStoreviewLanguages) {

core/lib/multistore.ts

@@ -66,7 +66,10 @@ export async function prepareStoreView (storeCode: string): Promise<StoreView> {
   if (storeView.storeCode && config.storeViews.multistore === true && config.storeViews[storeView.storeCode]) {
     storeView = merge(storeView, getExtendedStoreviewConfig(config.storeViews[storeView.storeCode]))
   }
-  rootStore.state.user.current_storecode = storeView.storeCode
+
+  if (rootStore.state.user) {
+    rootStore.state.user.current_storecode = storeView.storeCode
+  }
 
   if (storeViewHasChanged) {
     storeView = coreHooksExecutors.beforeStoreViewChanged(storeView)

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

@@ -117,6 +117,7 @@ export class SearchAdapter {
         start: start,
         perPage: size,
         aggregations: resp.aggregations,
+        attributeMetadata: resp.attribute_metadata,
         suggestions: resp.suggest
       }
     } else {

core/mixins/onBottomScroll.js

@@ -14,7 +14,7 @@ const isBottomVisible = () => {
 }
 
 /**
- * By implementing this mixin add "onBottomScroll" mthod in component.
+ * By implementing this mixin add "onBottomScroll" method in component.
  * It will be invoked when view reach the bottom.
  */
 export default {

core/modules/breadcrumbs/helpers/index.ts

@@ -5,6 +5,7 @@ import { formatCategoryLink } from '@vue-storefront/core/modules/url/helpers'
 export function parseCategoryPath (categoryPath) {
   let routesArray = []
   for (let category of categoryPath) {
+    if (category.url_path === undefined || category.url_path === null) continue;
     routesArray.push({
       name: category.name,
       route_link: formatCategoryLink(category)

core/modules/cart/helpers/getProductConfiguration.ts

@@ -7,7 +7,7 @@ const ATTRIBUTES = ['color', 'size']
 const getProductConfiguration = (product: CartItem): ProductConfiguration => {
   const options = getProductOptions(product)
   const getAttributesFields = (attributeCode) =>
-    (options[attributeCode] || []).find(c => c.id === parseInt(product[attributeCode]))
+    (options[attributeCode] || []).find(c => String(c.id) === String(product[attributeCode]))
 
   if (!options) {
     return null

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

@@ -4,19 +4,17 @@ import * as types from './mutation-types'
 import RootState from '@vue-storefront/core/types/RootState'
 import CategoryState from './CategoryState'
 import { quickSearchByQuery } from '@vue-storefront/core/lib/search'
-import { buildFilterProductsQuery, isServer } from '@vue-storefront/core/helpers'
+import { buildFilterProductsQuery } from '@vue-storefront/core/helpers'
 import { router } from '@vue-storefront/core/app'
-import { currentStoreView, localizedDispatcherRoute, localizedDispatcherRouteName } from '@vue-storefront/core/lib/multistore'
+import { localizedDispatcherRoute } from '@vue-storefront/core/lib/multistore'
 import FilterVariant from '../../types/FilterVariant'
 import { CategoryService } from '@vue-storefront/core/data-resolver'
 import { changeFilterQuery } from '../../helpers/filterHelpers'
 import { products, entities } from 'config'
-import { configureProductAsync } from '@vue-storefront/core/modules/catalog/helpers'
 import { DataResolver } from 'core/data-resolver/types/DataResolver';
 import { Category } from '../../types/Category';
 import { _prepareCategoryPathIds } from '../../helpers/categoryHelpers';
 import { prefetchStockItems } from '../../helpers/cacheProductsHelper';
-import { preConfigureProduct } from '@vue-storefront/core/modules/catalog/helpers/search'
 import chunk from 'lodash-es/chunk'
 import omit from 'lodash-es/omit'
 import cloneDeep from 'lodash-es/cloneDeep'
@@ -121,43 +119,6 @@ const actions: ActionTree<CategoryState, RootState> = {
       }
     }
   },
-  /**
-   * Calculates products taxes
-   * Registers URLs
-   * Configures products
-   */
-  async processCategoryProducts ({ dispatch, rootState }, { products = [], filters = {} } = {}) {
-    dispatch('registerCategoryProductsMapping', products) // we don't need to wait for this
-    const configuredProducts = await dispatch('configureProducts', { products, filters })
-    return dispatch('tax/calculateTaxes', { products: configuredProducts }, { root: true })
-  },
-  /**
-   * Configure configurable products to have first available options selected
-   * so they can be added to cart/wishlist/compare without manual configuring
-   */
-  async configureProducts ({ rootState }, { products = [], filters = {}, populateRequestCacheTags = config.server.useOutputCacheTagging } = {}) {
-    return products.map(product => {
-      product = Object.assign({}, preConfigureProduct({ product, populateRequestCacheTags }))
-      const configuredProductVariant = configureProductAsync({ rootState, state: { current_configuration: {} } }, { product, configuration: filters, selectDefaultVariant: false, fallbackToDefaultWhenNoAvailable: true, setProductErorrs: false })
-      return Object.assign(product, omit(configuredProductVariant, ['visibility']))
-    })
-  },
-  async registerCategoryProductsMapping ({ dispatch }, products = []) {
-    const { storeCode, appendStoreCode } = currentStoreView()
-    await Promise.all(products.map(product => {
-      const { url_path, sku, slug, type_id } = product
-      return dispatch('url/registerMapping', {
-        url: localizedDispatcherRoute(url_path, storeCode),
-        routeData: {
-          params: {
-            parentSku: product.parentSku || product.sku,
-            slug
-          },
-          'name': localizedDispatcherRouteName(type_id + '-product', storeCode, appendStoreCode)
-        }
-      }, { root: true })
-    }))
-  },
   async findCategories (context, categorySearchOptions: DataResolver.CategorySearchOptions): Promise<Category[]> {
     return CategoryService.getCategories(categorySearchOptions)
   },
@@ -299,7 +260,9 @@ const actions: ActionTree<CategoryState, RootState> = {
         }, { root: true })
       }
     }
-  }
+  },
+  /** Below actions are not used from 1.12 and can be removed to reduce bundle */
+  ...require('./deprecatedActions').default
 }
 
 export default actions

core/modules/catalog-next/store/category/deprecatedActions.ts

@@ -0,0 +1,47 @@
+import { currentStoreView, localizedDispatcherRoute, localizedDispatcherRouteName } from '@vue-storefront/core/lib/multistore'
+import { preConfigureProduct } from '@vue-storefront/core/modules/catalog/helpers/search'
+import omit from 'lodash-es/omit'
+import config from 'config'
+const { configureProductAsync } = require('@vue-storefront/core/modules/catalog/helpers')
+
+const actions = {
+  /**
+   * Calculates products taxes
+   * Registers URLs
+   * Configures products
+   */
+  async processCategoryProducts ({ dispatch, rootState }, { products = [], filters = {} } = {}) {
+    dispatch('registerCategoryProductsMapping', products) // we don't need to wait for this
+    const configuredProducts = await dispatch('configureProducts', { products, filters })
+    return dispatch('tax/calculateTaxes', { products: configuredProducts }, { root: true })
+  },
+  /**
+   * Configure configurable products to have first available options selected
+   * so they can be added to cart/wishlist/compare without manual configuring
+   */
+  async configureProducts ({ rootState }, { products = [], filters = {}, populateRequestCacheTags = config.server.useOutputCacheTagging } = {}) {
+    return products.map(product => {
+      product = Object.assign({}, preConfigureProduct({ product, populateRequestCacheTags }))
+      const configuredProductVariant = configureProductAsync({ rootState, state: { current_configuration: {} } }, { product, configuration: filters, selectDefaultVariant: false, fallbackToDefaultWhenNoAvailable: true, setProductErorrs: false })
+      return Object.assign(product, omit(configuredProductVariant, ['visibility']))
+    })
+  },
+  async registerCategoryProductsMapping ({ dispatch }, products = []) {
+    const { storeCode, appendStoreCode } = currentStoreView()
+    await Promise.all(products.map(product => {
+      const { url_path, sku, slug, type_id } = product
+      return dispatch('url/registerMapping', {
+        url: localizedDispatcherRoute(url_path, storeCode),
+        routeData: {
+          params: {
+            parentSku: product.parentSku || product.sku,
+            slug
+          },
+          'name': localizedDispatcherRouteName(type_id + '-product', storeCode, appendStoreCode)
+        }
+      }, { root: true })
+    }))
+  }
+}
+
+export default actions

core/modules/catalog-next/store/category/getters.ts

@@ -45,7 +45,7 @@ const getters: GetterTree<CategoryState, RootState> = {
     }) || {}
   },
   getCurrentCategory: (state, getters, rootState, rootGetters) => {
-    return getters.getCategoryByParams(rootState.route.params)
+    return getters.getCategoryByParams({ ...rootGetters['url/getCurrentRoute'].params })
   },
   getAvailableFiltersFrom: (state, getters, rootState) => (aggregations) => {
     const filters = {}