Skip to content

Commit

Permalink
chore: rename master to main (GetStream#1364)
Browse files Browse the repository at this point in the history
  • Loading branch information
madsroskar authored May 24, 2022
1 parent bb976c6 commit 5e8abee
Show file tree
Hide file tree
Showing 130 changed files with 386 additions and 386 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Changelog preview
on:
pull_request:
branches:
- master
- main
types: [opened, synchronize]

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
branches:
- develop
- master
- main
- 'v[0-9]+.[0-9]+.[0-9]+*beta*'
types: [opened, synchronize]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docusaurus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: docusaurus
on:
push:
branches:
- master # default branch name for each repo that docs should be push from
- main # default branch name for each repo that docs should be push from
- develop
paths:
- docusaurus/**
Expand All @@ -15,6 +15,6 @@ jobs:
- name: push
uses: GetStream/push-stream-chat-docusaurus-action@main
with:
target-branch: ${{ github.ref == 'refs/heads/master' && 'production' || 'staging' }}
target-branch: ${{ github.ref == 'refs/heads/main' && 'production' || 'staging' }}
env:
DOCUSAURUS_GH_TOKEN: ${{ secrets.DOCUSAURUS_GH_TOKEN }}
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:
publish-release:
Expand Down Expand Up @@ -42,5 +42,5 @@ jobs:
git stash
git checkout develop
git pull origin develop
git merge master -m "chore: merge back release [skip ci]"
git merge main -m "chore: merge back release [skip ci]"
git push origin develop
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Official React Native SDK for Stream Chat

<p align="center">
<a href="https://getstream.io/chat/react-native-chat/tutorial/"><img src="https://github.com/GetStream/stream-chat-react-native/blob/master/screenshots/readme/cover.png" alt="react native chat" width="100%" /></a>
<a href="https://getstream.io/chat/react-native-chat/tutorial/"><img src="https://github.com/GetStream/stream-chat-react-native/blob/main/screenshots/readme/cover.png" alt="react native chat" width="100%" /></a>
</p>

> The official React Native and Expo components for Stream Chat, a service for
> building chat applications.

[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
[![Build Status](https://github.com/GetStream/stream-chat-react-native/workflows/test/badge.svg?branch=master)](https://github.com/GetStream/stream-chat-react-native/actions)
[![Build Status](https://github.com/GetStream/stream-chat-react-native/workflows/test/badge.svg?branch=main)](https://github.com/GetStream/stream-chat-react-native/actions)
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)

<img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/[email protected]?auto=format,enhance" width="50%" />
Expand Down Expand Up @@ -68,7 +68,7 @@ We welcome code changes that improve this library or fix a problem, and please m

## Git flow & Release process

We enforce conventional commits and have an automated releasing process using workspaces and semantic-release. Read our [git flow & release process guide](https://github.com/GetStream/stream-chat-react-native/blob/master/RELEASE_PROCESS.md) for more information
We enforce conventional commits and have an automated releasing process using workspaces and semantic-release. Read our [git flow & release process guide](https://github.com/GetStream/stream-chat-react-native/blob/main/RELEASE_PROCESS.md) for more information

## We are hiring

Expand Down
14 changes: 7 additions & 7 deletions RELEASE_PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Please have in mind that the only line you have to add is the selected one. Gith

If you've released something you were not supposed to and want to remove that release from npm, remove the git tag and then rollback the changes, you have a few options:

### Reset master branch
### Reset main branch

Cleanest way is to just reset the master branch and remove the last few commits, so the ideal is just do reset and force-push.
Cleanest way is to just reset the main branch and remove the last few commits, so the ideal is just do reset and force-push.

### Revert unwanted commits

Expand All @@ -35,15 +35,15 @@ If you want some of the newest commits but want to remove older ones you can jus

All pull requests should point to the `develop` branch. Everytime it is updated, a new `next` version is created and released to npm using the latest commit sha.

### master & release candidates
### main & release candidates

Everytime we want to push things to master, we should create a pull request from develop to master. When that PR is opened/updated, a comment will be
Everytime we want to push things to main, we should create a pull request from develop to main. When that PR is opened/updated, a comment will be
added/updated containing the changelog that will be generated by merging that PR. This is useful for knowing whats going to be released if we decide to
press the merge button. By doing that, a release candidate tag is created and flagged with the `rc` tag on npm. Also, a `merge back pull request` is created from master to develop.
press the merge button. By doing that, a release candidate tag is created and flagged with the `rc` tag on npm. Also, a `merge back pull request` is created from main to develop.

## Graduating release candidates to production

Once the release candidate is well tested and approved, the manual release workflow can be triggered through the Github actions UI. It should always be pointed
to master and it will `graduate the latest release candidate` to an actual release, flagging it with the `latest` tag on npm. Also, a `merge back pull request`
is created from master to develop.
to main and it will `graduate the latest release candidate` to an actual release, flagging it with the `latest` tag on npm. Also, a `merge back pull request`
is created from main to develop.

2 changes: 1 addition & 1 deletion docs/build/bundle.38535de9.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/build/bundle.38535de9.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object-assign
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/main/LICENSE
* @version v4.2.8+1e68dce6
*/

Expand Down Expand Up @@ -42,7 +42,7 @@ object-assign
/*!
* regjsgen 0.5.2
* Copyright 2014-2020 Benjamin Tan <https://ofcr.se/>
* Available under the MIT license <https://github.com/bnjmnt4n/regjsgen/blob/master/LICENSE-MIT.txt>
* Available under the MIT license <https://github.com/bnjmnt4n/regjsgen/blob/main/LICENSE-MIT.txt>
*/

/*! https://mths.be/regenerate v1.4.1 by @mathias | MIT license */
Expand Down
2 changes: 1 addition & 1 deletion docs/v3/build/bundle.a39375a1.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/v3/build/bundle.a39375a1.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object-assign
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/main/LICENSE
* @version v4.2.8+1e68dce6
*/

Expand Down Expand Up @@ -42,7 +42,7 @@ object-assign
/*!
* regjsgen 0.5.2
* Copyright 2014-2020 Benjamin Tan <https://ofcr.se/>
* Available under the MIT license <https://github.com/bnjmnt4n/regjsgen/blob/master/LICENSE-MIT.txt>
* Available under the MIT license <https://github.com/bnjmnt4n/regjsgen/blob/main/LICENSE-MIT.txt>
*/

/*! clipboard-copy. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
Expand Down
2 changes: 1 addition & 1 deletion docusaurus/docs/reactnative/basics/translations.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ const { t, tDateTimeParser } = await streami18n.getTranslators();
Allows you to register a custom translation, this will override a translation if one already exists for the given language code.
The third parameter, which is optional, is a Day.js locale, which is structured the same as [dayjsLocaleConfigForLanguage](#dayjslocaleconfigforlanguage).

It is suggested you look at the [`enTranslations` json file](https://github.com/GetStream/stream-chat-react-native/tree/master/src/i18n) exported from `stream-chat-react-native` for a current list of used translation keys.
It is suggested you look at the [`enTranslations` json file](https://github.com/GetStream/stream-chat-react-native/tree/main/src/i18n) exported from `stream-chat-react-native` for a current list of used translation keys.

```ts
streami18n.registerTranslation('mr', {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Setter for value [`images`](../../../contexts/image_gallery_context.mdx#images).

| Type |
| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `(messageWithImages: [MessageType](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/MessageList/hooks/useMessageList.ts)[]) => void` |
| Type |
| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `(messageWithImages: [MessageType](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/MessageList/hooks/useMessageList.ts)[]) => void` |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rendered when the channel list is empty and not loading via the [ListEmptyComponent](https://reactnative.dev/docs/flatlist#listemptycomponent) prop on the FlatList.

| Type | Default |
| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [EmptyStateIndicator](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/Indicators/EmptyStateIndicator.tsx) |
| Type | Default |
| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
| component | [EmptyStateIndicator](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/Indicators/EmptyStateIndicator.tsx) |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rendered when [`loadingNextPage` from `ChannelsContext`](../../../../contexts/channels_context.mdx#loadingnextpage) is true via the [`ListFooterComponent`](https://reactnative.dev/docs/flatlist#listfootercomponent) prop on the FlatList.

| Type | Default |
| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [ChannelListFooterLoadingIndicator](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/ChannelList/ChannelListFooterLoadingIndicator.tsx) |
| Type | Default |
| --------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [ChannelListFooterLoadingIndicator](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/ChannelList/ChannelListFooterLoadingIndicator.tsx) |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rendered when [`error` from `ChannelsContext`](../../../../contexts/channels_context.mdx#error) is true.

| Type | Default |
| --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [ChannelListHeaderErrorIndicator](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/ChannelList/ChannelListHeaderErrorIndicator.tsx) |
| Type | Default |
| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [ChannelListHeaderErrorIndicator](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/ChannelList/ChannelListHeaderErrorIndicator.tsx) |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rendered when [`isOnline` from `ChatContext`](../../../../contexts/chat_context.mdx#isonline) is false.

| Type | Default |
| --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [ChannelListHeaderNetworkDownIndicator](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/ChannelList/ChannelListHeaderNetworkDownIndicator.tsx) |
| Type | Default |
| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [ChannelListHeaderNetworkDownIndicator](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/ChannelList/ChannelListHeaderNetworkDownIndicator.tsx) |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rendered when [`error` from `ChannelsContext`](../../../../contexts/channels_context.mdx#error) is true, and the channel list is empty and not loading.

| Type | Default |
| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
| component | [LoadingErrorIndicator](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/Indicators/LoadingErrorIndicator.tsx) |
| Type | Default |
| --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [LoadingErrorIndicator](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/Indicators/LoadingErrorIndicator.tsx) |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rendered when the channel list is empty and loading via the [ListEmptyComponent](https://reactnative.dev/docs/flatlist#listemptycomponent) prop on the FlatList.

| Type | Default |
| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [ChannelListLoadingIndicator](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/ChannelList/ChannelListLoadingIndicator.tsx) |
| Type | Default |
| --------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [ChannelListLoadingIndicator](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/ChannelList/ChannelListLoadingIndicator.tsx) |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Row item rendered in the [`LoadingIndicator`](#loadingindicator).

| Type | Default |
| --------- | ----------------------------------------------------------------------------------------------------------------------------- |
| component | [Skeleton](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/ChannelList/Skeleton.tsx) |
| Type | Default |
| --------- | --------------------------------------------------------------------------------------------------------------------------- |
| component | [Skeleton](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/ChannelList/Skeleton.tsx) |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Component to render additional actions on attachment. e.g., send, shuffle, cancel in case of giphy.

| Type | Default |
| --------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [AttachmentActions](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/Attachment/AttachmentActions.tsx) |
| Type | Default |
| --------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
| component | [AttachmentActions](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/Attachment/AttachmentActions.tsx) |
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Component to render sticky date header within enclosed MessageList component.

| Type | Default |
| --------- | --------------------------------------------------------------------------------------------------------------------------------- |
| component | [DateHeader](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/MessageList/DateHeader.tsx) |
| Type | Default |
| --------- | ------------------------------------------------------------------------------------------------------------------------------- |
| component | [DateHeader](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/MessageList/DateHeader.tsx) |
Loading

0 comments on commit 5e8abee

Please sign in to comment.