Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
patzick committed May 27, 2019
2 parents 00bacf0 + 6d1eaf7 commit 0fb6736
Show file tree
Hide file tree
Showing 12 changed files with 731 additions and 522 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Load custom fonts without webfont.js - @jahvi (#2944)
- Added some structured data to product page - @cewald (#2910)

## [1.9.1] - 2019.05.27

### Fixed
- Remove security vulnerabilities by updating project dependencies - @patzick (#2942)
- Fix Configurable Products not accessible in CSR when children visibility is set to "not visible individually" - @revlis-x (#2933)
- ProductTile placeholders are visible on SSR - @patzick (#2939)

## [1.9.0] - 2019.05.06

### Added
Expand All @@ -98,6 +105,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update to babel 7 - @lukeromanowicz (#2554)

### Fixed
- For first time setup of the SSR Cache, a local cache-version.json file is required. The path has been removed from .gitignore and a template has been added. - @rio-vps
- Gallery low quality image in offline mode when high quality already cached - @patzick (#2557)
- Payment issue when no address set - @szafran89 (#2593)
- Search component result message when search term is less than 3 letters - @robwozniak (#2561)
Expand All @@ -123,7 +131,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Offline orders with out of stock products don't stack anymore and get canceled after going back to online - @lukeromanowicz (#2740)
- Build ServiceWorker on Docker - @patzick (#2793)
- Product image load after comming back to online - @patzick (#2573)
- Insufficent validation for city field in checkout address - @lromanowicz (#2653)
- Insufficent validation for city field in checkout address - @lromanowicz (#2653)
- Incorrect hover activity on the 'filter by categories' in the search view on mobile - @idodidodi (#2783)
- Unit tests written in JavaScript now support async/await functions and dynamic import - @michaelKurowski, @lukeromanowicz (#2851)

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -696,10 +696,10 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
</a>
</td>
<td align="center" valign="middle">
<a href="">
<a href="https://zero1.co.uk/">
<img
src=""
alt=""
src="https://divante.co/partners/Vue-Storefront/zero-1_logo.png"
alt="Zero1"
height="40"
>
</a>
Expand Down
3 changes: 3 additions & 0 deletions core/build/cache-version.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{

}
2 changes: 1 addition & 1 deletion core/modules/catalog/store/product/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ const actions: ActionTree<ProductState, RootState> = {
}
if (configuration) {
let selectedVariant = configureProductAsync(context, { product: product, configuration: configuration, selectDefaultVariant: false })
Object.assign(product, selectedVariant)
Object.assign(product, omit(selectedVariant, ['visibility']))
}
if (product.url_path) {
rootStore.dispatch('url/registerMapping', {
Expand Down
2 changes: 1 addition & 1 deletion core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"jsonfile": "^4.0.0",
"memory-fs": "^0.4.1",
"mkdirp": "^0.5.1",
"node-sass": "^4.9.3",
"node-sass": "^4.12.0",
"phantomjs-prebuilt": "^2.1.10",
"postcss-flexbugs-fixes": "^3.3.1",
"postcss-loader": "^2.1.5",
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/basics/graphql.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# GraphQL Action Plan

Starting with Vue Storefront 1.4.0 (currently on develop branch), we're supporting two ways of getting data from the backend:
Starting with Vue Storefront 1.4.0, we're supporting two ways of getting data from the backend:

- existing `api` mode, which is using ElasticSearch DSL as a query language
- new `graphql` mode, which is using GraphQL queries.
Expand Down
6 changes: 6 additions & 0 deletions docs/guide/basics/recipes.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ In a case of
See the discussion in [#137](https://github.com/DivanteLtd/vue-storefront/issues/137).
Please also check the [Database tool](https://github.com/DivanteLtd/vue-storefront/blob/master/docs/guide/data/database-tool.md)

## HTTP 400 / CORS errors when trying to retrieve detailed product information from API

If all the other requests work without any issues then it's highly possible that your products have too many attributes. All of them are included in ElasticSearch query sent via GET request which might become too long. Try to limit amount of attributes that are indexed and later used for this product view.

This answer is valid until [this issue is resolved](https://github.com/DivanteLtd/vue-storefront/issues/2167).

## What's the recommended way to use git on custom development

One of the options is to do kind of a fork, or just get the whole repo to your git service. Then, if you want to do some VS updates, you probably need to just pull the changes from our origins. Another option will be available as soon as we manage to separate the core as an npm module.
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"docs:build": "vuepress build"
},
"dependencies": {
"vuepress": "^0.14.2"
"vuepress": "^0.14.11"
}
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "2.9.0",
"lerna": "3.14.1",
"version": "1.10.0-rc.1",
"npmClient": "yarn",
"useWorkspaces": true,
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,21 +125,21 @@
"html-webpack-plugin": "^3.2.0",
"inquirer": "^3.3.0",
"is-windows": "^1.0.1",
"jest": "^24.7.1",
"jest": "^24.8.0",
"jest-serializer-vue": "^2.0.2",
"jsonfile": "^4.0.0",
"lerna": "^3.13.1",
"lerna": "^3.14.1",
"mkdirp": "^0.5.1",
"node-sass": "^4.9.3",
"node-sass": "^4.12.0",
"phantomjs-prebuilt": "^2.1.10",
"postcss-flexbugs-fixes": "^3.3.1",
"postcss-loader": "^2.1.5",
"postcss-flexbugs-fixes": "^4.1.0",
"postcss-loader": "^3.0.0",
"print-message": "^2.1.0",
"rimraf": "^2.6.0",
"sass-loader": "^7.1.0",
"shelljs": "^0.8.1",
"sw-precache-webpack-plugin": "^0.11.5",
"ts-jest": "^24.0.0",
"ts-jest": "^24.0.2",
"ts-loader": "^5.3.0",
"typescript": "^3.1.6",
"url-loader": "^1.1.2",
Expand All @@ -150,7 +150,7 @@
"vue-ssr-webpack-plugin": "^3.0.0",
"vue-template-compiler": "^2.6.6",
"webpack": "^4.25.1",
"webpack-bundle-analyzer": "^3.0.3",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.1.2",
"webpack-dev-middleware": "^3.4.0",
"webpack-hot-middleware": "^2.24.3",
Expand Down
3 changes: 1 addition & 2 deletions src/themes/default/components/core/ProductTile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,13 @@
<script>
import rootStore from '@vue-storefront/core/store'
import { ProductTile } from '@vue-storefront/core/modules/catalog/components/ProductTile.ts'
import { isServer } from '@vue-storefront/core/helpers'
import config from 'config'
export default {
mixins: [ProductTile],
data () {
return {
imageLoaded: isServer
imageLoaded: false
}
},
props: {
Expand Down
Loading

0 comments on commit 0fb6736

Please sign in to comment.