Merge pull request #4547 from DivanteLtd/hotfix/v1.12.1

Hotfix/v1.12.1

Author: Tomasz Kostuch

CHANGELOG.md

@@ -5,6 +5,22 @@ 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.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

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

@@ -34,7 +34,7 @@ export function price (value, storeView) {
 
   const options = { minimumFractionDigits: fractionDigits, maximumFractionDigits: fractionDigits };
 
-  let localePrice = Math.abs(Number(value).toLocaleString(defaultLocale, options)).toFixed(2);
+  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.12.0",
+  "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) {