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

Commit

Permalink
Merge pull request #3932 from DivanteLtd/develop
Browse files Browse the repository at this point in the history
Release v1.11
  • Loading branch information
andrzejewsky authored Dec 20, 2019
2 parents 09c39c8 + 91192f0 commit f3c218d
Show file tree
Hide file tree
Showing 699 changed files with 34,278 additions and 13,268 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
core/build/*.js
node_modules
packages/module/*.js
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module.exports = {
root: true,
env: { browser: true, jest: true },
globals: { fetchMock: true },
parser: 'vue-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser',
Expand Down
13 changes: 6 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
### Related issues
### Related Issues
<!-- Put related issue number which this PR is closing. For example #123 -->

closes #

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



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

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

- [ ] 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`
- [ ] 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`
- [ ] 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`

### Upgrade Notes and Changelog

- [x] No upgrade steps required (100% backward compatibility and no breaking changes)
- [ ] 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
- [ ] 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

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

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

- [ ] I read and followed [contribution rules](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md)
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ core/resource/i18n/ru-RU.json

#unit testing
/test/unit/coverage
/static
12 changes: 12 additions & 0 deletions .huskyrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const tasks = arr => arr.join(' && ')

module.exports = {
'hooks': {
'pre-commit': tasks([
'lint-staged'
]),
'pre-push': tasks([
'yarn test:unit'
])
}
}
4 changes: 4 additions & 0 deletions .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
"*.{js,vue,ts}": "eslint",
"**/i18n/*.csv": ["node ./core/scripts/utils/sort-translations.js", "git add"]
}
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,12 @@ jobs:
- yarn build
node_js: "10"

- <<: *build
node_js: '8'

- &unit
stage: Test
script: yarn test:unit
name: "NodeJS 10 unit tests"
node_js: "10"

- <<: *unit
name: "NodeJS 8 unit tests"
node_js: "8"

- &installer
script: yarn installer:ci
Expand All @@ -39,7 +33,4 @@ jobs:
addons:
chrome: stable

- <<: *installer
name: "NodeJS 8 installer test"
node_js: "8"

399 changes: 378 additions & 21 deletions CHANGELOG.md

Large diffs are not rendered by default.

28 changes: 13 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# How to Contribute

Already a JS/Vue.js developer? Pick an issue, push a PR and instantly become a member of the vue-storefront contributors community.
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.
We've marked some issues as "Easy first pick" to make it easier for newcomers to begin!

Thank you for your interest in, and engagement!

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

# Branches

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

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)!

## Issue reporting guidelines:
## Issue Reporting Guidelines

Always define the type of issue:
* Bug report
* Feature request

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

**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.
**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.

## Git flow
We're introducing TypeScript to Vue Storefront core, so You can use it where it's appropriate - but please be pragmatic.
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).
## Git Flow

## Pull request Checklist
We're introducing TypeScript to Vue Storefront core, so you can use it where it's appropriate - but please be pragmatic.
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).

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

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

## Acceptance criteria
## Acceptance Criteria

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

0 comments on commit f3c218d

Please sign in to comment.