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

Commit f3c218d

Browse files
authored
Merge pull request #3932 from DivanteLtd/develop
Release v1.11
2 parents 09c39c8 + 91192f0 commit f3c218d

File tree

699 files changed

+34278
-13268
lines changed

Some content is hidden

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

699 files changed

+34278
-13268
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
core/build/*.js
22
node_modules
3+
packages/module/*.js

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module.exports = {
22
root: true,
33
env: { browser: true, jest: true },
4+
globals: { fetchMock: true },
45
parser: 'vue-eslint-parser',
56
parserOptions: {
67
parser: '@typescript-eslint/parser',

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
### Related issues
1+
### Related Issues
22
<!-- Put related issue number which this PR is closing. For example #123 -->
33

44
closes #
55

6-
### Short description and why it's useful
6+
### Short Description and Why It's Useful
77
<!-- describe in a few words what is this Pull Request changing and why it's useful -->
88

99

1010

11-
### Screenshots of visual changes before/after (if there are any)
11+
### Screenshots of Visual Changes before/after (if There Are Any)
1212
<!-- if you made any changes in the UI layer please provide before/after screenshots -->
1313

14-
### Which environment this relates to
14+
### Which Environment This Relates To
1515
Check your case. In case of any doubts please read about [Release Cycle](https://docs.vuestorefront.io/guide/basics/release-cycle.html)
1616

1717
- [ ] Test version (https://test.storefrontcloud.io) - this is a new feature or improvement for Vue Storefront. I've created branch from `develop` branch and want to merge it back to `develop`
1818
- [ ] RC version (https://next.storefrontcloud.io) - this is a stabilisation fix for Release Candidate of Vue Storefront. I've created branch from `release` branch and want to merge it back to `release`
1919
- [ ] Stable version (https://demo.storefrontcloud.io) - this is an important fix for current stable version. I've created branch from `hotfix` or `master` branch and want to merge it back to `hotfix`
2020

2121
### Upgrade Notes and Changelog
22-
2322
- [x] No upgrade steps required (100% backward compatibility and no breaking changes)
24-
- [ ] I've updated the [Upgrade notes](https://github.com/DivanteLtd/vue-storefront/blob/develop/docs/guide/upgrade-notes/README.md) and [Changelog](https://github.com/DivanteLtd/vue-storefront/blob/develop/CHANGELOG.md) on how to port existing VS sites with this new feature
23+
- [ ] I've updated the [Upgrade notes](https://github.com/DivanteLtd/vue-storefront/blob/develop/docs/guide/upgrade-notes/README.md) and [Changelog](https://github.com/DivanteLtd/vue-storefront/blob/develop/CHANGELOG.md) on how to port existing Vue Storefront sites with this new feature
2524

2625
**IMPORTANT NOTICE** - Remember to update `CHANGELOG.md` with description of your change
2726

28-
### Contribution and currently important rules acceptance
27+
### Contribution and Currently Important Rules Acceptance
2928
<!-- Please get familiar with following info -->
3029

3130
- [ ] I read and followed [contribution rules](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md)

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ core/resource/i18n/ru-RU.json
3333

3434
#unit testing
3535
/test/unit/coverage
36+
/static

.huskyrc.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const tasks = arr => arr.join(' && ')
2+
3+
module.exports = {
4+
'hooks': {
5+
'pre-commit': tasks([
6+
'lint-staged'
7+
]),
8+
'pre-push': tasks([
9+
'yarn test:unit'
10+
])
11+
}
12+
}

.lintstagedrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
"*.{js,vue,ts}": "eslint",
3+
"**/i18n/*.csv": ["node ./core/scripts/utils/sort-translations.js", "git add"]
4+
}

.travis.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,12 @@ jobs:
1818
- yarn build
1919
node_js: "10"
2020

21-
- <<: *build
22-
node_js: '8'
23-
2421
- &unit
2522
stage: Test
2623
script: yarn test:unit
2724
name: "NodeJS 10 unit tests"
2825
node_js: "10"
2926

30-
- <<: *unit
31-
name: "NodeJS 8 unit tests"
32-
node_js: "8"
3327

3428
- &installer
3529
script: yarn installer:ci
@@ -39,7 +33,4 @@ jobs:
3933
addons:
4034
chrome: stable
4135

42-
- <<: *installer
43-
name: "NodeJS 8 installer test"
44-
node_js: "8"
4536

CHANGELOG.md

Lines changed: 378 additions & 21 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# How to Contribute
22

3-
Already a JS/Vue.js developer? Pick an issue, push a PR and instantly become a member of the vue-storefront contributors community.
3+
Already a JavaScript/Vue.js developer? Pick an issue, push a pull request (PR) and instantly become a member of the vue-storefront contributors community.
44
We've marked some issues as "Easy first pick" to make it easier for newcomers to begin!
55

66
Thank you for your interest in, and engagement!
77

8-
Before you type an issue please read about out [release lifecycle](https://docs.vuestorefront.io/guide/basics/release-cycle.html)
8+
Before you type an issue please read about out [release lifecycle](https://docs.vuestorefront.io/guide/basics/release-cycle.html).
99

1010
# Branches
1111

@@ -18,41 +18,39 @@ The main branches used by the core team are:
1818

1919
Please use "develop" or "RC" for development purposes as the "master" can be merged just as the new release is coming out (about once a month)!
2020

21-
## Issue reporting guidelines:
21+
## Issue Reporting Guidelines
2222

2323
Always define the type of issue:
2424
* Bug report
2525
* Feature request
2626

27-
While writing issues, be as specific as possible
28-
All requests regarding support with implementation or application setup should be sent to [email protected]
27+
While writing issues, be as specific as possible. All requests regarding support with implementation or application setup should be sent to [email protected].
2928

30-
**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.
29+
**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.
3130

32-
## 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).
31+
## Git Flow
3532

36-
## Pull request Checklist
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 TypeScript features in Vue Storefront: [TypeScript Action Plan](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/TypeScript%20Action%20Plan.md).
3735

38-
Here’s how to submit a pull request. <b>Pull request that don't meet these requirements will not be merged.</b>
36+
## Pull Request Checklist
3937

4038
**ALWAYS** use [Pull Request template](https://github.com/DivanteLtd/vue-storefront/blob/master/PULL_REQUEST_TEMPLATE.md) it's automatically added to each PR.
41-
1. Fork the repository and clone it locally fro the 'develop' branch. Make sure it's up to date with current `develop` branch
39+
1. Fork the repository and clone it locally from the 'develop' branch. Make sure it's up to date with current `develop` branch
4240
2. Create a branch for your edits. Use the following branch naming conventions:
4341
* bugfix/task-title
4442
* feature/task-name
4543
3. Use Pull Request template and fill as much fields as possible to describe your solution.
4644
4. Reference any relevant issues or supporting documentation in your PR (ex. “Issue: 39. Issue title.”).
4745
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)
4846
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)
49-
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.
47+
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.
5048
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.
5149
(https://github.com/DivanteLtd/vue-storefront/blob/master/README.md#documentation--table-of-contents))
5250

53-
## Acceptance criteria
51+
## Acceptance Criteria
5452

5553
Your pull request will be merged after meeting following criteria:
5654
- Everything from "Pull Request Checklist"
57-
- PR is proposed to appropriate branch
55+
- PR is proposed to appropriate branch
5856
- There are at least two approvals from core team members

0 commit comments

Comments
 (0)