Skip to content

Commit 970c704

Browse files
authored
Merge pull request #1397 from GetStream/develop
Next release
2 parents eedeafc + 25bd243 commit 970c704

File tree

155 files changed

+1044
-596
lines changed

Some content is hidden

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

155 files changed

+1044
-596
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ NEXT_RELEASE_CHANGELOG.md
33
artifacts
44
e2e/.env
55
*.log
6-
.DS_STORE
6+
.DS_STORE

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Official React Native SDK for Stream Chat
22

33
<p align="center">
4-
<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>
4+
<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>
55
</p>
66

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

1111
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
12-
[![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)
12+
[![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)
1313
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
1414

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

6969
## Git flow & Release process
7070

71-
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
71+
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
7272

7373
## We are hiring
7474

RELEASE_PROCESS.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ Please have in mind that the only line you have to add is the selected one. Gith
2121

2222
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:
2323

24-
### Reset master branch
24+
### Reset main branch
2525

26-
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.
26+
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.
2727

2828
### Revert unwanted commits
2929

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

3636
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.
3737

38-
### master & release candidates
38+
### main & release candidates
3939

40-
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
40+
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
4141
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
42-
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.
42+
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.
4343

4444
## Graduating release candidates to production
4545

4646
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
47-
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`
48-
is created from master to develop.
47+
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`
48+
is created from main to develop.
4949

docs/build/bundle.38535de9.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/build/bundle.38535de9.js.LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object-assign
88
* @overview es6-promise - a tiny implementation of Promises/A+.
99
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
1010
* @license Licensed under MIT license
11-
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
11+
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/main/LICENSE
1212
* @version v4.2.8+1e68dce6
1313
*/
1414

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

4848
/*! https://mths.be/regenerate v1.4.1 by @mathias | MIT license */

docs/v3/build/bundle.a39375a1.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/v3/build/bundle.a39375a1.js.LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object-assign
88
* @overview es6-promise - a tiny implementation of Promises/A+.
99
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
1010
* @license Licensed under MIT license
11-
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
11+
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/main/LICENSE
1212
* @version v4.2.8+1e68dce6
1313
*/
1414

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

4848
/*! clipboard-copy. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */

docusaurus/docs/reactnative/basics/translations.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ const { t, tDateTimeParser } = await streami18n.getTranslators();
392392
Allows you to register a custom translation, this will override a translation if one already exists for the given language code.
393393
The third parameter, which is optional, is a Day.js locale, which is structured the same as [dayjsLocaleConfigForLanguage](#dayjslocaleconfigforlanguage).
394394

395-
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.
395+
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.
396396

397397
```ts
398398
streami18n.registerTranslation('mr', {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Setter for value [`images`](../../../contexts/image_gallery_context.mdx#images).
22

3-
| Type |
4-
| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
5-
| `(messageWithImages: [MessageType](https://github.com/GetStream/stream-chat-react-native/blob/master/package/src/components/MessageList/hooks/useMessageList.ts)[]) => void` |
3+
| Type |
4+
| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
5+
| `(messageWithImages: [MessageType](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/MessageList/hooks/useMessageList.ts)[]) => void` |

docusaurus/docs/reactnative/common-content/contexts/overlay-context/set_blur_type.mdx

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)