Skip to content

Commit

Permalink
Update to react 3 and messages 1
Browse files Browse the repository at this point in the history
  • Loading branch information
Bruno Dias authored and salesfelipe committed Jun 7, 2019
1 parent 1b03eae commit 66c43b6
Show file tree
Hide file tree
Showing 39 changed files with 610 additions and 393 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ node_modules/
!Icon
/.eslintrc
/react/*.js.map
.DS_Store
*.orig
123 changes: 123 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,46 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Changed

- Get changes made at version `v0.27.3`.

## [0.27.3] - 2019-06-07

### Fix

- Fix `country` fallback on add new address.

## [1.8.2] - 2019-05-20

### Changed

- Get changes made at version `v0.27.2`.

## [0.27.2] - 2019-05-20

### Fixed

- Logout modal title french translation.

## [1.8.1] - 2019-05-08

### Changed

- Get changes made at version `v0.27.1`.

## [0.27.1] - 2019-05-08

### Fixed

- Logout button using anchor tag to keep compatibility with current customisations.

## [1.8.0] - 2019-05-07

### Changed

- Get changes made at version `v0.27.0`.

## [0.27.0] - 2019-05-07

### Fixed
Expand All @@ -35,42 +57,120 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- Manage password feature.

## [1.7.2] - 2019-05-02

### Fixed

- Logout button

## [1.7.1] - 2019-04-26

### Added

- Allow any app to plugged in into `my-account` abstract interfaces.

## [1.7.0] - 2019-04-26

### Added

- Support to CSS override.

## [1.6.1] - 2019-04-25

### Changed

- Get changes made at version `v0.26.1`.

## [0.26.1] - 2019-04-25

### Changed

- Loaders to be consistent with the new api of the `SkeletonPiece` component.

## [1.6.0] - 2019-04-24

### Changed

- Get changes made at version `v0.26.0`.

## [1.5.0] - 2019-04-16

### Changed

- Support plugins architecture in `my-account-pages` and `my-account-links`

## [0.26.0] - 2019-04-22

### Added

- `logout` feature.

## [1.4.5] - 2019-04-08

### Changed

- Get changes made at version `v0.25.2`.

## [0.25.2] - 2019-04-08

### Fixed

- The word 'contrasenya' to 'contrassenya'.

## [1.4.4] - 2019-03-22

### Fixed

- `render-runtime` import.

## [1.4.3] - 2019-03-21

### Changed

- Get changes made at version `v0.25.1`.

## [0.25.1] - 2019-03-21

### Changed

- Instead of using `import react-router-dom` changed to `import vtex.my-account-commons`.

## [1.4.2] - 2019-03-15

### Fix

- Delete node/ directory

## [1.4.1] - 2019-03-15

### Changed

- Get changes made at version `v0.25.0`.

## [0.25.0] - 2019-03-15

### Changed

- Returning to the `returnUrl` if it is present on the url.

## [1.4.0] - 2019-03-13

### Changed

- Get changes made at version `v0.24.0`.

## [0.24.0] - 2019-03-13

### Added

- Italian translation.

## [1.3.2] - 2019-02-26

### Changed

- Add changes from versions `v0.23.2` and `v0.23.1`

## [0.23.2] - 2019-02-26

### Fixed
Expand All @@ -83,6 +183,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- Add missing required prop, resulting in a error in address form

## [1.3.1] - 2019-02-19

### Changed

- Get changes made between versions `v0.20.0` and `v0.23.0`.

## [1.3.0] - 2019-01-22

## [1.2.0] - 2019-01-22

## [1.1.0] - 2019-01-18

### Changed

- Update React builder to 3.x.
- Bump vtex.styleguide to 9.x.

## [1.0.0] - 2018-12-28

### Changed

- New builders are in town! Add messages and store builders.

## [0.23.0] - 2019-02-12

### Added
Expand Down
71 changes: 71 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Contributing

In this document, we'll describe how we are dealing with the development of two major versions.

### Development

The major 0 follows the default flow. Open feature branches from master, and open PRs to it. Publish new versions of major 0 in your feature branch. After released, merge it to master.

### Upgrading major 1

Now it's time to update the `1.x` branch. There's always two commits ahead of branch master: one with the update and another with the release commit. We will always keep it short to two commits. Let's see how.

Run:

```
git checkout master
git pull # make sure your master branch is update to date
git checkout 1.x
git rebase master
```

##### Resolving conflicts

**File:** `manifest.json`

Keep the version from branch `1.x`, example: between `0.3.4` and `1.2.1`, keep `1.2.1`. That will help when bumping a new version.

**File:** `CHANGELOG.md`

Keep both changes on the first and second commit. Add some missing line breaks where needed.

##### Rewriting commits

Run

```
git rebase -i HEAD~2
```

Fixup the lastest commit with the upgrade commit. This will merge the release commit with the upgrade commit into one.

**Sanity check**: Make sure you have only one commit ahead of master.

#### Updating the changelog

Add to the Unreleased section, something like:

```md
### Changed
- Get changes made at version `v0.3.0`.
```

And run:

```
git add .
git commit --amend --no-edit
```

This will merge this changelog changes to the upgrade commit.

#### Release

First, since we are doing a rebase here, force push the branch to remote.

```
git push origin 1.x -f
```

Then, use releasy as usual to release a new patch and push it again.

Loading

0 comments on commit 66c43b6

Please sign in to comment.