Skip to content

Commit 4d264dd

Browse files
committed
Merge branch 'develop' into feat/native-multipart-upload
# Conflicts: # package/src/components/Attachment/__tests__/Attachment.test.tsx # package/src/components/Attachment/__tests__/Giphy.test.tsx
2 parents 340c2e0 + 11ece32 commit 4d264dd

199 files changed

Lines changed: 3448 additions & 2064 deletions

File tree

Some content is hidden

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

.github/workflows/check-pr.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ jobs:
2929
uses: ./.github/actions/install-and-build-sdk
3030
- name: Lint
3131
run: yarn lerna-workspaces run lint
32+
- name: Typecheck tests
33+
run: cd package && yarn test:typecheck
3234
- name: Test
3335
run: yarn test:coverage

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-304%20KB-blue)
13+
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-353%20KB-blue)
1414

1515
<img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/iphone_chat_art@3x.png?auto=format,enhance" width="50%" />
1616

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* global require */
2-
import rn, { FlatList, View } from 'react-native';
2+
import type { ReactNode } from 'react';
3+
import { FlatList, View } from 'react-native';
34

45
import mockRNCNetInfo from '@react-native-community/netinfo/jest/netinfo-mock.js';
56
import mockSafeAreaContext from 'react-native-safe-area-context/jest/mock';
@@ -36,12 +37,18 @@ registerNativeHandlers({
3637

3738
jest.mock('react-native-reanimated', () => {
3839
const RNReanimatedmock = require('react-native-reanimated/mock');
39-
return { ...RNReanimatedmock, runOnUI: (fn) => fn };
40+
return { ...RNReanimatedmock, runOnUI: (fn: () => unknown) => fn };
4041
});
4142

4243
jest.mock('@react-native-community/netinfo', () => mockRNCNetInfo);
4344

44-
const BottomSheetMock = ({ handleComponent, children }) => (
45+
const BottomSheetMock = ({
46+
handleComponent,
47+
children,
48+
}: {
49+
handleComponent: () => ReactNode;
50+
children: ReactNode;
51+
}) => (
4552
<View>
4653
{handleComponent()}
4754
{children}

package/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
setupFiles: ['./node_modules/react-native-gesture-handler/jestSetup.js'],
1010
setupFilesAfterEnv: [
1111
'@testing-library/jest-native/extend-expect',
12-
require.resolve('./jest-setup.js'),
12+
require.resolve('./jest-setup.tsx'),
1313
],
1414
testEnvironment: 'node',
1515
testPathIgnorePatterns: ['/node_modules/', '/examples/', '__snapshots__', '/lib/'],

package/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"prettier": "prettier --list-different '**/*.{js,ts,tsx,md,json}' eslint.config.mjs ../.prettierrc babel.config.js",
3838
"prettier-fix": "prettier --write '**/*.{js,ts,tsx,md,json}' eslint.config.mjs ../.prettierrc babel.config.js",
3939
"test:coverage": "yarn test:unit --coverage",
40+
"test:typecheck": "tsc --noEmit -p tsconfig.test.json",
4041
"test:unit": "TZ=UTC jest",
4142
"validate-translations": "node bin/validate-translations.js",
4243
"get-version": "echo $npm_package_version",
@@ -127,9 +128,10 @@
127128
"@shopify/flash-list": "^2.1.0",
128129
"@testing-library/jest-native": "^5.4.3",
129130
"@testing-library/react-native": "13.2.0",
131+
"@total-typescript/shoehorn": "^0.1.2",
130132
"@types/better-sqlite3": "^7.6.13",
131133
"@types/eslint": "9.6.1",
132-
"@types/jest": "^29.5.14",
134+
"@types/jest": "^30.0.0",
133135
"@types/linkify-it": "5.0.0",
134136
"@types/lodash": "4.17.16",
135137
"@types/mime-types": "2.1.4",
@@ -154,7 +156,7 @@
154156
"eslint-plugin-react-hooks": "^5.2.0",
155157
"eslint-plugin-react-native": "^5.0.0",
156158
"i18next-cli": "^1.31.0",
157-
"jest": "^30.0.0",
159+
"jest": "^30.3.0",
158160
"moment-timezone": "^0.6.0",
159161
"prettier": "^3.5.3",
160162
"react": "19.1.0",

0 commit comments

Comments
 (0)