Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit 84993c7

Browse files
authored
Merge pull request #2534 from DivanteLtd/hotfix/v1.8.3
Hotfix/v1.8.3
2 parents 40840ec + d092681 commit 84993c7

File tree

245 files changed

+2398
-1551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+2398
-1551
lines changed

CHANGELOG.md

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,52 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.8.3] - 2019.03.03
8+
9+
### Added
10+
- New reactive helper to check online state. Usage: `import { onlineHelper } from '@vue-storefront/core/helpers'` and then `onlineHelper.isOnline` - @patzick (#2510)
11+
- Cart count config, allows you to display the item count instead of a sum of the item quantities - @pauluse (#2483)
12+
- Video support in Product Gallery component. - @rain2o (#2433)
13+
14+
### Fixed
15+
- Problem with placing second order (unbinding payment methods after first order) - @patzick (#2195, #2503)
16+
- Remaking order on user orders page - @patzick (#2480)
17+
- Images blinking on category page - @pkarw (#2523)
18+
- state.ts not bound in the module-template - @pkarw (#2496)
19+
- Validation in the Myprofile section for postcode field - @pkarw (#1317)
20+
- Non-integer qty of product added to the cart - @pkarw (#2517)
21+
22+
### Changed / Improved
23+
- Fixed an issue where the correct image for a product configuration wasn't set on the product page image carousel. Also added the fix on the productcarousel in the zoom component - @DaanKouters (#2419)
24+
- Way of creating VS Modules was changed to use factory method instead of explict object creation. - @filrak (#2434)
25+
- Added clear filters button on desktop also and only show if filters are applied - @DaanKouters (#2342)
26+
- Improved docs at contributing.md and configuration.md (spelling etc.) - @ruthgeridema (#2421, #2422, #2423, #2425, #2426)
27+
- Fixed design issue of Country label on Edge 17 & Firefox - @ananth-iyer (#2390, #2399)
28+
- Wishlist and compare items are loaded from local cache only once, instead of every time when module component is rendered - @patzick (#2431)
29+
- Country field is filled by first counry from the list in cart in paymen section - @RakowskiPrzemyslaw (#2428)
30+
- Improved product quantity change component in product and cart - @patzick (#2398, #2437)
31+
- Updated to Vue 2.6.6 - @filrak (#2456)
32+
- Null sidebar menu data on static page fixed - @filrak (#2449, #2441)
33+
- Fix cannot edit previous steps in checkout - @filrak, @patzick (#2438)
34+
- Fixed route guard ssr problem - @vue-kacper (#2364)
35+
- Fix links in footer to static pages bug - @filrak (#2452)
36+
- Fix links at docs, Basics/Configuration file explained - @daksamit (#2490)
37+
- Improve images loading on category page, corrected alt view and blinking problem - @patzick (#2465)
38+
- Improve tsconfig for better IDE paths support - @patzick, @filrak (#2474)
39+
- fix breadcrumbs changing too early - @filrak, @pkarw (#2469, #2529)
40+
- improved product gallery load view, shows correct image on reload - @patzick (#2481, #2482, #2488, #2501)
41+
- Fix an issue where the index.html template within a theme is ignored - @EnthrallRecords (#2489)
42+
- Added async sidebar component with async off-screen components error handling and fetch retrying after coming back online - @filrak (#2408, #2451)
43+
- Inconsistent filters behaviour - clear filters on page load - @patzick (#2435)
44+
- fix price is never below 0 and user can't add 0 or below 0 products to cart - @RakowskiPrzemyslaw (#2437)
45+
- Check for placing single order in case of error in any payment module - @patzick (#2409)
46+
- Display prices in products added in offline mode. - @patzick (#2450)
47+
- Updated cypress dependency for e2e tests - @lukeromanowicz (#2518)
48+
- Improved styles on recommendation filters, product tile and numeric input - @patzick (#2458)
49+
50+
### Deprecated / Removed
51+
- `@vue-storefront/store` package deprecated - @filrak
52+
753
## [1.8.2] - 2019.02.11
854
- Fixed docker-compose configuration for network_mode and TS build config - @lukeromanowicz (#2415)
955

@@ -50,7 +96,7 @@ Additional migration tips are available [here](https://github.com/DivanteLtd/vue
5096
- Improve sortBy mobile view - @martaradziszewska (#2251)
5197
- Slide animations to menu, search, wishlist and minicart components - @Aekal (#2256)
5298
- Fixed wishlist store module to not be lazy loaded - @vue-kacper (#2249)
53-
- Share webpack typescript config with docker container - @lukeromanowicz (#2269)
99+
- Share webpack typescript config with Docker container - @lukeromanowicz (#2269)
54100
- After checkout create logged-in cart for logged-in users if using order Direct Backend Sync - @grimasod (#2302)
55101
- Output cache clearing supports versioning - @igloczek (#2333, #2359)
56102
- Cash on delivery + Shipping addresses fixed for virtual products - @pkarw (#2366)

CONTRIBUTING.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Before you type an issue please read about out [release lifecycle](https://docs.
99

1010
# Branches
1111

12+
You should fork the project or create a branch for new features.
1213
The main branches used by the core team are:
1314

1415
- master - where we store the stable release of the app (that can be deployed to our demo instances),
@@ -19,7 +20,7 @@ Please use "develop" or "RC" for development purposes as the "master" can be mer
1920

2021
## Issue reporting guidelines:
2122

22-
Always define type of issue:
23+
Always define the type of issue:
2324
* Bug report
2425
* Feature request
2526

@@ -29,20 +30,22 @@ All requests regarding support with implementation or application setup should b
2930
**Tag your issues properly**. If you found a bug tag it with `bug` label. If you're requesting new feature tag it with `feature request` label.
3031

3132
## Git flow
33+
We're introducing TypeScript to Vue Storefront core, so You can use it where it's appropriate - but please be pragmatic.
34+
Here are some thoughts on how to use TS features in Vue Storefront: [TypeScript Action Plan](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/TypeScript%20Action%20Plan.md).
3235

3336
## Pull request Checklist
3437

35-
Here’s how to submit a pull request. <b>Pull request that dont meet this requirements will not be merged.</b>
38+
Here’s how to submit a pull request. <b>Pull request that don't meet these requirements will not be merged.</b>
3639

3740
**ALWAYS** use [Pull Request template](https://github.com/DivanteLtd/vue-storefront/blob/master/PULL_REQUEST_TEMPLATE.md) it's automatically added to each PR.
38-
1. Fork the repository and clone it locally fro the 'develop' branch. Make sure its up to date with current `develop` branch
41+
1. Fork the repository and clone it locally fro the 'develop' branch. Make sure it's up to date with current `develop` branch
3942
2. Create a branch for your edits. Use the following branch naming conventions:
4043
* bugfix/task-title
4144
* feature/task-name
4245
3. Use Pull Request template and fill as much fields as possible to describe your solution.
4346
4. Reference any relevant issues or supporting documentation in your PR (ex. “Issue: 39. Issue title.”).
44-
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)
45-
6. If you are removing/renaming something or changing it's behavior also include it in [upgrade notes](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Upgrade%20notes.md)
47+
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)
48+
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)
4649
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.
4750
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 [email protected]. We will work with you to verify and fix it as soon as possible.
4851
(https://github.com/DivanteLtd/vue-storefront/blob/master/README.md#documentation--table-of-contents))

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The project is in the **production ready** phase.
1515

1616
**Important note to developers:** From 1.0RC we started using [develop](https://github.com/DivanteLtd/vue-storefront/tree/develop) branch for nightly builds (contains all new features) and [master](https://github.com/DivanteLtd/vue-storefront/tree/master) branch for stable. Please make sure you're working on right branch. Please take a look at [Contributing guidelines](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md).
1717

18-
If you're new and need some guidance feel free to reach anyone from core team on our slack:
18+
If you're new and need some guidance feel free to reach anyone from the core team on our slack:
1919
- `@Filip Rakowski` (frontend, architecture and best practices related stuff)
2020
- `@pkarw` (integrations and backend related stuff)
2121
- `@ptomczyk` (frontend related stuff)
@@ -28,7 +28,7 @@ Want to invest some time in building the future of eCommerce? we are looking for
2828

2929
See the ideas behind Vue Storefront [here](https://www.slideshare.net/FilipRakowski/vue-storefront-basics)
3030

31-
**Read [contribution rules](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md) before making any pull request. Pull request that don't meet this requirements will not be merged**
31+
**Read [contribution rules](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md) before making any pull request. Pull request that doesn't meet these requirements will not be merged**
3232

3333
## See it in action
3434

@@ -74,13 +74,13 @@ If you have any questions or ideas feel free to join our slack: https://vuestore
7474
[Here](https://github.com/DivanteLtd/vue-storefront/milestones) you can find the accepted roadmap for current milestone and what you can expect with next release.
7575

7676
#### Roadmap planning
77-
[Here](https://github.com/DivanteLtd/vue-storefront/projects/3) you can vote for feature requests and see which ones were accepted. The most upvoted ones will be added to next milestones. You can also join the slack channel `#roadmap-planning` where we discuss the next milestones.
77+
[Here](https://github.com/DivanteLtd/vue-storefront/projects/3) you can vote for feature requests and see which ones were accepted. The most upvoted ones will be added to the next milestones. You can also join the slack channel `#roadmap-planning` where we discuss the next milestones.
7878

7979
The process of adding new features to the roadmap looks like this:
8080
1. You create an issue and label it as `feature request`.
8181
2. One of VS Core team verifies the feature request and if the explanation is clear, it is added to the `Roadmap` project so it's visible in the board.
8282
3. Now people can vote for this feature to be added into next milestone with `thumb up` emoji.
83-
4. Feature requests with biggest popularity will be added into next milestones.
83+
4. Feature requests with the biggest popularity will be added into next milestones.
8484

8585
We are planning 1-2 milestones ahead. Our milestones are based on requirements from community, partners and production implementations.
8686

@@ -171,7 +171,7 @@ Check [Vue Storefront Awesome](https://github.com/frqnck/awesome-vue-storefront)
171171

172172
## The business challenges
173173

174-
Vue Storefront was created to solve a set of key business challenges from the world of shopping experience. Our goal for the application is to provide the solution with:
174+
Vue Storefront was created to solve a set of key business challenges from the world of the shopping experience. Our goal for the application is to provide the solution with:
175175

176176
- The ultrafast front-end for the store - with the PWA approach we can now render the catalog of products within milliseconds;
177177
- The endurance for traffic overloads on the store;
@@ -193,7 +193,7 @@ Besides a big improvement for the shopping experience, we also want to create a
193193

194194
## The design
195195

196-
The application is prepared to be fully customized in design through theming system.
196+
The application is prepared to be fully customized in design through the theming system.
197197
With the current version we work on raw, basic template of typical eCommerce for a fashion industry.
198198
In the project we used [Material Icons](https://github.com/google/material-design-icons).
199199

@@ -206,7 +206,7 @@ Here you can read more about the process of [designing PWA for eCommerce](https:
206206
The design is available in open source in the Figma file format under the URL https://www.figma.com/file/VKyqbHFI55TKIKcQlFLiVpVF/Vue-Storefront-Open-Source.
207207

208208
## Other platforms
209-
Vue Storefront is platform agnostic which means it can be connected to virtually any CMS. Please take a look at [Pimcore bridge](https://github.com/DivanteLtd/coreshop-vsbridge) to give you an idea on how other platforms can be connected. Any support for integrating Prestashop, Shopify ... - much appreciated.
209+
Vue Storefront is platform agnostic which means it can be connected to virtually any CMS. Please take a look at [Pimcore bridge](https://github.com/DivanteLtd/coreshop-vsbridge) to give you an idea of how other platforms can be connected. Any support for integrating Prestashop, Shopify ... - much appreciated.
210210

211211
## The license
212212

@@ -220,7 +220,7 @@ If you have discovered a 🐜 or have a feature suggestion, feel free to create
220220

221221
## Workshops
222222

223-
If you like our project and would like to learn more on how to create Progressive Web Apps you can ask us for dedicated workshop at your office! Conducted by Vue Storefront core contributors! All the profits are used for supporting Vue Storefront development. [Learn more](https://products.divante.co/vuestorefront/)
223+
If you like our project and would like to learn more on how to create Progressive Web Apps you can ask us for a dedicated workshop at your office! Conducted by Vue Storefront core contributors! All the profits are used for supporting Vue Storefront development. [Learn more](https://products.divante.co/vuestorefront/)
224224

225225
## Support us!
226226

@@ -626,7 +626,7 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
626626
</tbody>
627627
</table>
628628

629-
Partners are encouraged to support the project by various ways - mostly by contributing the source code, marketing activities, evangelizing and of course - implementing the production projects. We do support our partners by dedicated contact channels, workshops and by sharing the leads from merchants interested in implementations.
629+
Partners are encouraged to support the project in various ways - mostly by contributing the source code, marketing activities, evangelizing and of course - implementing the production projects. We do support our partners by dedicated contact channels, workshops and by sharing the leads from merchants interested in implementations.
630630

631631
If you like to become our Partner just let us know via [email protected].
632632

config/default.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@
235235
"setConfigurableProductOptions": true,
236236
"askBeforeRemoveProduct": true,
237237
"displayItemDiscounts": true,
238+
"minicartCountType": "quantities",
238239
"create_endpoint": "http://localhost:8080/api/cart/create?token={{token}}",
239240
"updateitem_endpoint": "http://localhost:8080/api/cart/update?token={{token}}&cartId={{cartId}}",
240241
"deleteitem_endpoint": "http://localhost:8080/api/cart/delete?token={{token}}&cartId={{cartId}}",

core/app.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import * as corePlugins from '@vue-storefront/core/compatibility/plugins'
2929

3030
import { once } from '@vue-storefront/core/helpers'
3131
import { takeOverConsole } from '@vue-storefront/core/helpers/log'
32-
import store from '@vue-storefront/store'
32+
import store from '@vue-storefront/core/store'
3333

3434
import { enabledModules } from './modules-entry'
3535

36-
// Will be depreciated in 1.8
36+
// Will be deprecated in 1.8
3737
import { registerExtensions } from '@vue-storefront/core/compatibility/lib/extensions'
3838
import { registerExtensions as extensions } from 'src/extensions'
3939

@@ -65,7 +65,7 @@ const createApp = async (ssrContext, config): Promise<{app: Vue, router: VueRou
6565
// sync router with vuex 'router' store
6666
sync(store, router)
6767
// TODO: Don't mutate the state directly, use mutation instead
68-
store.state.version = '1.7.0'
68+
store.state.version = '1.8.3'
6969
store.state.config = config
7070
store.state.__DEMO_MODE__ = (config.demomode === true) ? true : false
7171
if(ssrContext) Vue.prototype.$ssrRequestContext = ssrContext

core/build/dev-server.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ module.exports = function setupDevServer (app, cb) {
1515
let bundle
1616
let template
1717

18-
// modify client config to work with hot middleware
18+
// Modify client config to work with hot middleware
1919
clientConfig.entry.app = ['webpack-hot-middleware/client', ...clientConfig.entry.app]
2020
clientConfig.output.filename = '[name].js'
2121
clientConfig.plugins.push(
2222
new webpack.HotModuleReplacementPlugin(),
2323
new webpack.NoEmitOnErrorsPlugin()
2424
)
2525

26-
// dev middleware
26+
// Dev middleware
2727
const clientCompiler = webpack(clientConfig)
2828
const devMiddleware = require('webpack-dev-middleware')(clientCompiler, {
2929
publicPath: clientConfig.output.publicPath,
@@ -44,7 +44,7 @@ module.exports = function setupDevServer (app, cb) {
4444
}
4545
})
4646

47-
// hot middleware
47+
// Hot middleware
4848
app.use(require('webpack-hot-middleware')(clientCompiler))
4949

5050
// watch and update server renderer
@@ -57,7 +57,7 @@ module.exports = function setupDevServer (app, cb) {
5757
stats.errors.forEach(err => console.error(err))
5858
stats.warnings.forEach(err => console.warn(err))
5959

60-
// read bundle generated by vue-ssr-webpack-plugin
60+
// Read bundle generated by vue-ssr-webpack-plugin
6161
const bundlePath = path.join(serverConfig.output.path, 'vue-ssr-bundle.json')
6262
bundle = JSON.parse(mfs.readFileSync(bundlePath, 'utf-8'))
6363
if (template) {

core/build/webpack.base.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import themeRoot from './theme-path';
1919
const themeResources = themeRoot + '/resource'
2020
const themeCSS = themeRoot + '/css'
2121
const themeApp = themeRoot + '/App.vue'
22-
const themedIndex = path.join(themeRoot, 'index.template.html')
22+
const themedIndex = path.join(themeRoot, '/templates/index.template.html')
2323
const themedIndexMinimal = path.join(themeRoot, '/templates/index.minimal.template.html')
2424
const themedIndexBasic = path.join(themeRoot, '/templates/index.basic.template.html')
2525
const themedIndexAmp = path.join(themeRoot, '/templates/index.amp.template.html')
@@ -110,7 +110,7 @@ export default {
110110
'theme/resource': themeResources,
111111

112112
// Backward compatible
113-
'@vue-storefront/store/lib/multistore' : path.resolve(__dirname, '../lib/multistore.ts'),
113+
'@vue-storefront/core/store/lib/multistore' : path.resolve(__dirname, '../lib/multistore.ts'),
114114
}
115115
},
116116
module: {

core/build/webpack.prod.sw.config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ module.exports = merge(base, {
7979
urlPattern: "/dist/(.*)",
8080
handler: "fastest"
8181
},{
82-
urlPattern: "/*/*", /** this is new product url format */
82+
urlPattern: "/*/*", /** this is new product URL format */
8383
handler: "networkFirst"
8484
},
8585
{
86-
urlPattern: "/*/*/*", /** this is new product url format */
86+
urlPattern: "/*/*/*", /** this is new product URL format */
8787
handler: "networkFirst"
8888
},
8989
{
90-
urlPattern: "/*", /** this is new category url format */
90+
urlPattern: "/*", /** this is new category URL format */
9191
handler: "networkFirst"
9292
}],
9393
"importScripts": ['/dist/core-service-worker.js'] /* custom logic */

core/client-entry.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import union from 'lodash-es/union'
44

55
import { createApp } from '@vue-storefront/core/app'
66
import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus/index'
7-
import rootStore from '@vue-storefront/store'
7+
import rootStore from '@vue-storefront/core/store'
88

99
import buildTimeConfig from 'config'
1010
import { execute } from '@vue-storefront/core/lib/sync/task'
11-
import UniversalStorage from '@vue-storefront/store/lib/storage'
11+
import UniversalStorage from '@vue-storefront/core/store/lib/storage'
1212
import i18n from '@vue-storefront/i18n'
1313
import { prepareStoreView, storeCodeFromRoute, currentStoreView, localizedRoute } from '@vue-storefront/core/lib/multistore'
1414
import { onNetworkStatusChange } from '@vue-storefront/core/modules/offline-order/helpers/onNetworkStatusChange'

core/compatibility/components/Breadcrumbs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default {
88
},
99
activeRoute: {
1010
type: String,
11-
required: true
11+
default: ''
1212
}
1313
}
1414
}

0 commit comments

Comments
 (0)