Skip to content

Commit ec288ba

Browse files
committed
chore: resolve conflicts from develop
2 parents c9064d6 + bb40124 commit ec288ba

File tree

69 files changed

+4069
-2398
lines changed

Some content is hidden

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

69 files changed

+4069
-2398
lines changed

.github/workflows/changelog-preview.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@ on:
99
jobs:
1010
generate_changelog_preview:
1111
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
node-version: [ 24.x ]
1215
steps:
16+
- name: Use Node.js ${{ matrix.node-version }}
17+
uses: actions/setup-node@v4
18+
with:
19+
node-version: ${{ matrix.node-version }}
1320
- uses: actions/checkout@v2
1421
with:
1522
ref: develop
@@ -45,7 +52,7 @@ jobs:
4552
4653
echo "Changelog file ready! Setting up outputs"
4754
CHANGELOG_PREVIEW=$(cat NEXT_RELEASE_CHANGELOG.md)
48-
55+
4956
CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW//'%'/'%25'}"
5057
CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW_ESCAPED//$'\n'/'%0A'}"
5158
CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW_ESCAPED//$'\r'/'%0D'}"

.github/workflows/check-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
node-version: [22.x]
16+
node-version: [24.x]
1717
steps:
1818
- uses: actions/checkout@v3
1919
with:

.github/workflows/next-release.yml

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

.github/workflows/release.yml

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,60 @@ on:
44
push:
55
branches:
66
- main
7+
- develop
8+
9+
permissions:
10+
id-token: write # for OIDC / npm provenance if you use it
11+
actions: write # if you dispatch other workflows
12+
contents: write # commits / tags / merge-back
713

814
jobs:
9-
publish-release:
15+
publish:
1016
runs-on: ubuntu-latest
1117
strategy:
1218
matrix:
13-
node-version: [22.x]
19+
node-version: [24.x]
20+
1421
steps:
1522
- uses: actions/checkout@v2
1623
with:
17-
# pulls all commits (needed for semantic release to correctly version)
18-
fetch-depth: '0'
19-
# pulls all tags (needed for semantic release to correctly version)
20-
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
24+
fetch-depth: "0"
25+
26+
- name: Fetch tags
27+
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
28+
2129
- name: Use Node.js ${{ matrix.node-version }}
2230
uses: actions/setup-node@v4
2331
with:
2432
node-version: ${{ matrix.node-version }}
25-
registry-url: 'https://registry.npmjs.org'
33+
registry-url: "https://registry.npmjs.org"
34+
2635
- name: Prepare git
2736
run: |
28-
git config --global user.name 'stream-ci-bot'
37+
git config --global user.name 'stream-ci-bot'
2938
git config --global user.email '[email protected]'
39+
3040
- name: Install && Build - SDK and Sample App
3141
uses: ./.github/actions/install-and-build-sdk
42+
3243
- name: Lint
3344
run: yarn lerna-workspaces run lint
34-
- name: Publish Release
45+
46+
- name: Test
47+
if: github.ref == 'refs/heads/develop'
48+
run: yarn test:coverage
49+
50+
- name: Publish Next Release (develop)
51+
if: github.ref == 'refs/heads/develop'
52+
run: |
53+
GITHUB_SHORT_SHA="$(git rev-parse --short $GITHUB_SHA)" yarn release-next
54+
55+
- name: Publish Release (main)
56+
if: github.ref == 'refs/heads/main'
3557
run: yarn release
36-
env:
37-
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
38-
- name: Merge back changes
58+
59+
- name: Merge back changes (main -> develop)
60+
if: github.ref == 'refs/heads/main'
3961
run: |
4062
git stash
4163
git checkout develop

.github/workflows/sample-distribution.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,18 @@ jobs:
1515
build_and_deploy_ios_testflight_qa:
1616
name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/develop' }}
1717
runs-on: [macos-15]
18+
strategy:
19+
matrix:
20+
node-version: [ 24.x ]
1821
steps:
1922
- name: Connect Bot
2023
uses: webfactory/[email protected]
2124
with:
2225
ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
26+
- name: Use Node.js ${{ matrix.node-version }}
27+
uses: actions/setup-node@v4
28+
with:
29+
node-version: ${{ matrix.node-version }}
2330
- uses: actions/checkout@v3
2431
- uses: maxim-lobanov/setup-xcode@v1
2532
with:
@@ -53,7 +60,14 @@ jobs:
5360
build_and_deploy_android_s3:
5461
name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/develop' }}
5562
runs-on: ubuntu-latest
63+
strategy:
64+
matrix:
65+
node-version: [ 24.x ]
5666
steps:
67+
- name: Use Node.js ${{ matrix.node-version }}
68+
uses: actions/setup-node@v4
69+
with:
70+
node-version: ${{ matrix.node-version }}
5771
- uses: actions/checkout@v2
5872
- uses: actions/setup-java@v3
5973
with:

.github/workflows/sdk-size-metrics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- uses: actions/setup-node@v4
3131
with:
32-
node-version: 22.x
32+
node-version: 24.x
3333
cache: 'yarn'
3434

3535
- name: Run SDK Size Metrics

.yarnrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ nmHoistingLimits: workspaces
22

33
nodeLinker: node-modules
44

5+
npmPublishProvenance: true
6+
57
yarnPath: .yarn/releases/yarn-1.22.22.cjs

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
1111
[![Build Status](https://github.com/GetStream/stream-chat-react-native/actions/workflows/release.yml/badge.svg)](https://github.com/GetStream/stream-chat-react-native/actions)
1212
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
13-
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-292%20KB-blue)
13+
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-304%20KB-blue)
1414

1515
<img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/[email protected]?auto=format,enhance" width="50%" />
1616

examples/ExpoMessaging/app/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import React from 'react';
12
import { Alert, Image, Pressable, StyleSheet, View } from 'react-native';
23
import { ChannelList, SqliteClient } from 'stream-chat-expo';
34
import { useCallback, useContext, useMemo } from 'react';

examples/ExpoMessaging/yarn.lock

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4272,6 +4272,22 @@ jsonwebtoken@^9.0.2:
42724272
ms "^2.1.1"
42734273
semver "^7.5.4"
42744274

4275+
jsonwebtoken@^9.0.3:
4276+
version "9.0.3"
4277+
resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz#6cd57ab01e9b0ac07cb847d53d3c9b6ee31f7ae2"
4278+
integrity sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==
4279+
dependencies:
4280+
jws "^4.0.1"
4281+
lodash.includes "^4.3.0"
4282+
lodash.isboolean "^3.0.3"
4283+
lodash.isinteger "^4.0.4"
4284+
lodash.isnumber "^3.0.3"
4285+
lodash.isplainobject "^4.0.6"
4286+
lodash.isstring "^4.0.1"
4287+
lodash.once "^4.0.0"
4288+
ms "^2.1.1"
4289+
semver "^7.5.4"
4290+
42754291
jwa@^1.4.1:
42764292
version "1.4.2"
42774293
resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.2.tgz#16011ac6db48de7b102777e57897901520eec7b9"
@@ -4281,6 +4297,15 @@ jwa@^1.4.1:
42814297
ecdsa-sig-formatter "1.0.11"
42824298
safe-buffer "^5.0.1"
42834299

4300+
jwa@^2.0.1:
4301+
version "2.0.1"
4302+
resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.1.tgz#bf8176d1ad0cd72e0f3f58338595a13e110bc804"
4303+
integrity sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==
4304+
dependencies:
4305+
buffer-equal-constant-time "^1.0.1"
4306+
ecdsa-sig-formatter "1.0.11"
4307+
safe-buffer "^5.0.1"
4308+
42844309
jws@^3.2.2:
42854310
version "3.2.2"
42864311
resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
@@ -4289,6 +4314,14 @@ jws@^3.2.2:
42894314
jwa "^1.4.1"
42904315
safe-buffer "^5.0.1"
42914316

4317+
jws@^4.0.1:
4318+
version "4.0.1"
4319+
resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.1.tgz#07edc1be8fac20e677b283ece261498bd38f0690"
4320+
integrity sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==
4321+
dependencies:
4322+
jwa "^2.0.1"
4323+
safe-buffer "^5.0.1"
4324+
42924325
kleur@^3.0.3:
42934326
version "3.0.3"
42944327
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -6019,18 +6052,18 @@ [email protected]:
60196052
version "0.0.0"
60206053
uid ""
60216054

6022-
stream-chat@^9.23.0:
6023-
version "9.23.0"
6024-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-9.23.0.tgz#e7e5cf729861597e7198907c1cab22a57d68a2fc"
6025-
integrity sha512-UW112HYsLnYb4RMIXBtAouNQCCe0weVzNivjezsw+JKK1b/TX0JLBi+wK25mBUEO+coOGKfXiye6IB3gao8ipw==
6055+
stream-chat@^9.27.2:
6056+
version "9.27.2"
6057+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-9.27.2.tgz#5b41173e513f3606c47c93f391693b589e663968"
6058+
integrity sha512-OdALDzg8lO8CAdl8deydJ1+O4wJ7mM9dPLeCwDppq/OQ4aFIS9X38P+IdXPcOCsgSS97UoVUuxD2/excC5PEeg==
60266059
dependencies:
60276060
"@types/jsonwebtoken" "^9.0.8"
60286061
"@types/ws" "^8.5.14"
60296062
axios "^1.12.2"
60306063
base64-js "^1.5.1"
60316064
form-data "^4.0.4"
60326065
isomorphic-ws "^5.0.0"
6033-
jsonwebtoken "^9.0.2"
6066+
jsonwebtoken "^9.0.3"
60346067
linkifyjs "^4.3.2"
60356068
ws "^8.18.1"
60366069

0 commit comments

Comments
 (0)