Skip to content

Commit 454ff4b

Browse files
tsirlucastsirlucas
committed
Merge branch 'master' into fix-confirmation-popups-android
2 parents 93e830c + 557baf5 commit 454ff4b

File tree

428 files changed

+18745
-24895
lines changed

Some content is hidden

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

428 files changed

+18745
-24895
lines changed

‎.eslintignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ dist/
55
vendor/
66
*.md
77
src/components/docs/
8-
lib/
8+
lib/
9+
docusaurus/

‎.eslintrc.json‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
"browser": true,
44
"es6": true
55
},
6-
"extends": [
7-
"eslint:recommended",
8-
"plugin:react/recommended",
9-
"plugin:jest/recommended"
10-
],
6+
"extends": ["eslint:recommended", "plugin:react/recommended", "plugin:jest/recommended"],
117
"parser": "babel-eslint",
128
"parserOptions": {
139
"ecmaFeatures": {
@@ -51,10 +47,7 @@
5147
"react/prop-types": 0,
5248
"require-await": 2,
5349
"semi": [1, "always"],
54-
"sort-destructure-keys/sort-destructure-keys": [
55-
2,
56-
{ "caseSensitive": false }
57-
],
50+
"sort-destructure-keys/sort-destructure-keys": [2, { "caseSensitive": false }],
5851
"sort-imports": [
5952
"error",
6053
{
@@ -65,11 +58,7 @@
6558
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
6659
}
6760
],
68-
"sort-keys": [
69-
"error",
70-
"asc",
71-
{ "caseSensitive": false, "minKeys": 2, "natural": false }
72-
],
61+
"sort-keys": ["error", "asc", { "caseSensitive": false, "minKeys": 2, "natural": false }],
7362
"valid-typeof": 2
7463
},
7564
"settings": {
@@ -107,7 +96,7 @@
10796
"plugin:jest/recommended",
10897
"plugin:prettier/recommended",
10998
"plugin:react/recommended",
110-
"prettier/@typescript-eslint"
99+
"prettier"
111100
],
112101
"files": ["**/*.ts", "**/*.tsx"],
113102
"parser": "@typescript-eslint/parser",
@@ -168,10 +157,7 @@
168157
"react/prop-types": 0,
169158
"require-await": 2,
170159
"semi": [1, "always"],
171-
"sort-destructure-keys/sort-destructure-keys": [
172-
2,
173-
{ "caseSensitive": false }
174-
],
160+
"sort-destructure-keys/sort-destructure-keys": [2, { "caseSensitive": false }],
175161
"sort-imports": [
176162
"error",
177163
{
@@ -182,11 +168,7 @@
182168
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
183169
}
184170
],
185-
"sort-keys": [
186-
"error",
187-
"asc",
188-
{ "caseSensitive": false, "minKeys": 2, "natural": false }
189-
],
171+
"sort-keys": ["error", "asc", { "caseSensitive": false, "minKeys": 2, "natural": false }],
190172
"typescript-sort-keys/interface": [
191173
"error",
192174
"asc",

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ assignees: vishalnarkhede
1010
<!--
1111
PLEASE READ THIS BEFORE PROCEEDING:
1212
13-
Did you check cookbook? - https://github.com/GetStream/stream-chat-react-native/blob/master/docs/cookbook.md
13+
Did you check cookbook? - https://github.com/GetStream/stream-chat-react-native/wiki/Cookbook-v3.0
1414
1515
If you are looking for an answer to "how to implement/do ... using xx component?" question, cookbook would be a nice place to start. We are constantly trying to update cookbook with different examples of use-cases/customisations of components. If you can't find an answer there, please leave a comment here - https://github.com/GetStream/stream-chat-react-native/issues/184 and I will try to add/include a sample code or example as soon as possible to cookbook. This way it can help the other devs who are looking for same answer. Also if you have some feedback regarding cookbook, please don't hesitate to comment there.
1616

‎.github/workflows/docusaurus.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: docusaurus
2+
3+
on:
4+
push:
5+
branches:
6+
- docusaurus # default branch name for each repo that docs should be push from
7+
paths:
8+
- docusaurus/**
9+
jobs:
10+
push_docusaurus:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: push
15+
uses: GetStream/push-stream-chat-docusaurus-action@main
16+
env:
17+
DOCUSAURUS_GH_TOKEN: ${{ secrets.DOCUSAURUS_GH_TOKEN }}

‎.github/workflows/build.yml‎ renamed to ‎.github/workflows/legacy-sample-distribution.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
name: build
1+
name: legacy-sample-distribution
22

33
on:
44
push:
55
branches:
66
- master
7+
paths-ignore:
8+
- docusaurus/**
79
jobs:
8-
build_and_deploy_ios:
10+
build_and_deploy_ios_firebase:
911
runs-on: [macos-latest]
1012
steps:
1113
- uses: actions/checkout@v2
@@ -24,16 +26,16 @@ jobs:
2426
yarn;
2527
cd ios
2628
pod install
27-
- name: Build and release
29+
- name: Build and release Firebase
2830
env:
2931
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
3032
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
3133
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
3234
run: |
3335
cd examples/SampleApp/ios
34-
bundle exec fastlane distribute
36+
bundle exec fastlane deploy_to_firebase
3537
36-
build_and_deploy_android:
38+
build_and_deploy_android_firebase:
3739
runs-on: ubuntu-latest
3840
steps:
3941
- uses: actions/checkout@v2

‎.github/workflows/sample-distribution.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: sample-distribution
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths-ignore:
8+
- docusaurus/**
9+
jobs:
10+
build_and_deploy_ios_testflight_qa:
11+
runs-on: [macos-latest]
12+
steps:
13+
- uses: actions/checkout@v2
14+
with:
15+
token: ${{ secrets.VERSION_BUMP_TOKEN }}
16+
- name: Install RubyGems
17+
run: |
18+
cd examples/SampleApp/ios
19+
bundle update --bundler
20+
- name: RN setup
21+
run: |
22+
yarn;
23+
cd native-package
24+
yarn;
25+
cd ../examples/SampleApp
26+
yarn;
27+
cd ios
28+
pod install
29+
- name: Build and release Testflight QA
30+
env:
31+
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
32+
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
33+
APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
34+
APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
35+
APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
36+
run: |
37+
cd examples/SampleApp/ios
38+
bundle exec fastlane deploy_to_testflight_qa
39+
40+
build_and_deploy_android_s3:
41+
runs-on: ubuntu-latest
42+
steps:
43+
- uses: actions/checkout@v2
44+
- uses: actions/setup-java@v1
45+
with:
46+
java-version: 1.8
47+
- name: RN setup
48+
run: |
49+
yarn add global react-native-cli;
50+
yarn;
51+
cd native-package
52+
yarn;
53+
cd ../examples/SampleApp
54+
yarn;
55+
- name: Build
56+
run: |
57+
cd examples/SampleApp
58+
mkdir android/app/src/main/assets
59+
mkdir tmp
60+
yarn react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest tmp
61+
cd android
62+
rm -rf $HOME/.gradle/caches/ && ./gradlew assembleRelease
63+
64+
- name: Configure AWS credentials
65+
uses: aws-actions/configure-aws-credentials@v1
66+
with:
67+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
68+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
69+
aws-region: us-east-1
70+
- name: Upload APK
71+
run: |
72+
cp examples/SampleApp/android/app/build/outputs/apk/release/app-release.apk rn-sample-app.apk
73+
aws s3 cp rn-sample-app.apk s3://${{ secrets.AWS_S3_BUCKET }} --sse AES256

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ yarn-error.log
1010
.DS_Store
1111
dist/
1212
lib/
13+
# lib/ ignores metro-dev-helpers/lib so:
14+
!metro-dev-helpers/lib
1315
.env*
1416
examples/SampleApp/ios/vendor/
1517
vendor

‎.husky/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

‎.husky/pre-commit‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
dotgit/hooks/pre-commit-format.sh && dotgit/hooks/pre-commit-reject-binaries.py

‎.prettierrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"arrowParens": "always",
33
"jsxSingleQuote": true,
4+
"printWidth": 100,
45
"singleQuote": true,
56
"tabWidth": 2,
67
"trailingComma": "all"

0 commit comments

Comments
 (0)