Skip to content

Commit

Permalink
chore: rename master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
emmenko committed Feb 2, 2021
1 parent c617983 commit 1d0fada
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
]
],
"access": "restricted",
"baseBranch": "master"
"baseBranch": "main"
}
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Main workflow

# The event triggers are configured as following:
# - on branch master, trigger the workflow on every push
# - on branch main, trigger the workflow on every push
# - on any pull request, trigger the workflow
# This is to avoid running the workflow twice on pull requests.
on:
push:
branches:
- master
- main
pull_request:

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
branches:
- master
- main

jobs:
release:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Publishing canary releases to npm registry
if: steps.changesets.outputs.published != 'true'
run: |
git checkout master
git checkout main
yarn changeset version --snapshot canary
yarn changeset publish --tag canary
env:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
All new changes are now documented in `CHANGELOG.md` files in each package's directory and in [GitHub Releases](https://github.com/commercetools/ui-kit/releases).

> If you're looking for the changelog until `v10.18.6`, see [Archived Changelog](https://github.com/commercetools/ui-kit/blob/master/ARCHIVED_CHANGELOG.md).
> If you're looking for the changelog until `v10.18.6`, see [Archived Changelog](https://github.com/commercetools/ui-kit/blob/main/ARCHIVED_CHANGELOG.md).
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,17 @@ The command will promote the version published on `next` to the `latest` npm dis

## Canary releases

On `master` branch, we automatically publish **canary** releases from CI to the `canary` distribution channel, _after_ the build runs successfully.
On `main` branch, we automatically publish **canary** releases from CI to the `canary` distribution channel, _after_ the build runs successfully.

Canary releases are useful to test early changes that should not be released yet to `next` or `latest`. They are automatically triggered and released after a Pull Request is merged to `master`, unless the commit message contains `[skip publish]`.
Canary releases are useful to test early changes that should not be released yet to `next` or `latest`. They are automatically triggered and released after a Pull Request is merged to `main`.

Note that canary releases **will not create git tags and version bump commits**.

## Publishing documentation website

The documentation is currently built with [Storybook](https://storybook.js.org) and is hosted on [Vercel](https://vercel.com).

By default, only _Deploy Previews_ (Pull Requests) are deployed to [Vercel](https://vercel.com). The _Production_ website is deployed from the branch `master`.
By default, only _Deploy Previews_ (Pull Requests) are deployed to [Vercel](https://vercel.com). The _Production_ website is deployed from the branch `main`.

## Translations (i18n)

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<h2 align="center">🎹 commercetools UI Kit 💅</h2>

<p align="center">
<a href="https://github.com/commercetools/ui-kit"><img alt="Logo" src="https://raw.githubusercontent.com/commercetools/ui-kit/master/logo.png" /></a><br /><br />
<a href="https://github.com/commercetools/ui-kit"><img alt="Logo" src="https://raw.githubusercontent.com/commercetools/ui-kit/main/logo.png" /></a><br /><br />
</p>

<p align="center">
<a href="https://www.npmjs.com/package/@commercetools-frontend/ui-kit"><img src="https://badgen.net/npm/v/@commercetools-frontend/ui-kit" alt="Latest release (latest dist-tag)" /></a> <a href="https://www.npmjs.com/package/@commercetools-frontend/ui-kit"><img src="https://badgen.net/npm/v/@commercetools-frontend/ui-kit/next" alt="Latest release (next dist-tag)" /></a> <a href="https://circleci.com/gh/commercetools/ui-kit"><img src="https://circleci.com/gh/commercetools/ui-kit.svg?style=shield&circle-token=477a5b4b825bc5a09b933d15054b99e57e3cbe73" alt="CI status" /></a> <a href="https://percy.io/commercetools-GmbH/merchant-center-application-kit"><img src="https://percy.io/static/images/percy-badge.svg" alt="This project is using Percy.io for visual regression testing" /></a>
<a href="https://bundlephobia.com/result?p=@commercetools-frontend/ui-kit"><img src="https://badgen.net/bundlephobia/minzip/@commercetools-frontend/ui-kit" alt="Minified + GZipped size" /></a> <a href="https://github.com/commercetools/ui-kit/blob/master/LICENSE"><img src="https://badgen.net/github/license/commercetools/ui-kit" alt="GitHub license" /></a>
<a href="https://bundlephobia.com/result?p=@commercetools-frontend/ui-kit"><img src="https://badgen.net/bundlephobia/minzip/@commercetools-frontend/ui-kit" alt="Minified + GZipped size" /></a> <a href="https://github.com/commercetools/ui-kit/blob/main/LICENSE"><img src="https://badgen.net/github/license/commercetools/ui-kit" alt="GitHub license" /></a>
</p>
<p align="center">
<i>✨ Component library based on our design system 🛠</i>
Expand All @@ -32,7 +32,7 @@ import { AngleDownIcon } from '@commercetools-uikit/icons';

# Using presets

If you plan to use more components, you can also use some of the [preset packages](https://github.com/commercetools/ui-kit/tree/master/presets) that group multiple packages together. This is useful to reduce the number of dependencies and imports.
If you plan to use more components, you can also use some of the [preset packages](https://github.com/commercetools/ui-kit/tree/main/presets) that group multiple packages together. This is useful to reduce the number of dependencies and imports.

For example:

Expand Down Expand Up @@ -123,4 +123,4 @@ import { customProperties } from '@commercetools-uikit/design-system';
const primary = customProperties.colorPrimary;
```

> Please look at the [`custom-properties.js`](https://github.com/commercetools/ui-kit/blob/master/design-system/materials/custom-properties.js) itself to inspect which variables are available.
> Please look at the [`custom-properties.js`](https://github.com/commercetools/ui-kit/blob/main/design-system/materials/custom-properties.js) itself to inspect which variables are available.
2 changes: 1 addition & 1 deletion jest.bundle.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ module.exports = {
transform: {
'^.+\\.[t|j]sx?$': 'babel-jest',
},
watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-master'],
watchPlugins: ['jest-watch-typeahead/filename'],
};
2 changes: 1 addition & 1 deletion jest.stylelint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ module.exports = {
'.story.js',
],
testMatch: ['<rootDir>/**/*.js'],
watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-master'],
watchPlugins: ['jest-watch-typeahead/filename'],
};
2 changes: 1 addition & 1 deletion jest.test.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ module.exports = {
'^.+\\.js?$': 'babel-jest',
'^.+\\.tsx?$': 'ts-jest',
},
watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-master'],
watchPlugins: ['jest-watch-typeahead/filename'],
};
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
"jest-runner-stylelint": "2.3.7",
"jest-silent-reporter": "0.4.0",
"jest-validate": "26.6.2",
"jest-watch-master": "1.0.0",
"jest-watch-typeahead": "0.6.1",
"lerna": "3.22.1",
"lint-staged": "10.5.3",
Expand Down
7 changes: 0 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10004,13 +10004,6 @@ [email protected], jest-validate@^26.6.2:
leven "^3.1.0"
pretty-format "^26.6.2"

[email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/jest-watch-master/-/jest-watch-master-1.0.0.tgz#b00e18879b281ec2477ebb98a485a3e13baa9497"
integrity sha512-k5cGkA9uHkPkBkLyOC6BWjhmqQay0Bm/yQdERNN3myaeSJhfSpjQ0YtLjanpNajv6WljrNjPx+5orPgiZhpkDw==
dependencies:
chalk "^2.0.0"

[email protected]:
version "0.6.1"
resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.6.1.tgz#45221b86bb6710b7e97baaa1640ae24a07785e63"
Expand Down

1 comment on commit 1d0fada

@vercel
Copy link

@vercel vercel bot commented on 1d0fada Feb 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.