Skip to content

Commit

Permalink
Merge branch 'main' into @patricronge/add-searchview-clear-prop
Browse files Browse the repository at this point in the history
  • Loading branch information
tboba committed Oct 3, 2023
2 parents 7eb2c95 + bfe5534 commit 65d25e0
Show file tree
Hide file tree
Showing 564 changed files with 37,342 additions and 37,822 deletions.
14 changes: 9 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ module.exports = {
'plugin:import/warnings',
'plugin:react/recommended',
'prettier',
'prettier/react',
'prettier/standard',
],

plugins: ['react-native', 'react-hooks'],
Expand All @@ -19,10 +17,13 @@ module.exports = {
'import/core-modules': [
'react-native-screens',
'react-native-screens/native-stack',
'react-native-screens/createNativeStackNavigator',
'react-native-screens/reanimated',
],
'import/ignore': ['node_modules/react-native/index\\.js$'],
'import/ignore': [
'node_modules/react-native/index\\.js$',
'react-native/Libraries/Utilities/codegenNativeComponent.*',
'react-native/Libraries/Types/CodegenTypes.*'
],
'import/resolver': {
node: {
paths: ['src'],
Expand All @@ -48,17 +49,20 @@ module.exports = {
{
files: ['*.{ts,tsx}'],
parser: '@typescript-eslint/parser',
parserOptions: {
project: ['./tsconfig.json'],
},
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:import/typescript',
'prettier/@typescript-eslint',
],
settings: {
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.tsx'],
},
},
rules: {
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/array-type': 'error',
'@typescript-eslint/consistent-type-assertions': [
'error',
Expand Down
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: software-mansion
5 changes: 3 additions & 2 deletions .github/workflows/android-build-test-fabric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
WORKING_DIRECTORY: FabricTestExample
concurrency:
Expand All @@ -25,10 +26,10 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: Use Node.js 14
- name: Use Node.js 18
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: 'FabricTestExample/yarn.lock'
- name: Install node dependencies
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/android-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
WORKING_DIRECTORY: TestsExample
concurrency:
Expand All @@ -23,10 +24,10 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: Use Node.js 14
- name: Use Node.js 18
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: 'TestsExample/yarn.lock'
- name: Install node dependencies
Expand Down
34 changes: 23 additions & 11 deletions .github/workflows/android-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,48 @@ on:
jobs:
test:
runs-on: macos-12
timeout-minutes: 40
timeout-minutes: 60
env:
WORKING_DIRECTORY: Example
concurrency:
group: android-e2e-${{ github.ref }}
cancel-in-progress: true
steps:
- name: checkout
uses: actions/checkout@v2
- name: Use Node.js 14
uses: actions/setup-node@v2
- name: Checkout
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
node-version: 14
java-version: '17'
distribution: 'zulu'
cache: 'gradle'
- name: Use Node.js 18
uses: actions/setup-node@v3
with:
node-version: 18
cache: 'yarn'
- name: Install root node dependencies
run: yarn
run: yarn install
- name: Install node dependencies
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn
run: yarn install
- name: Build app
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn build-e2e-android
- name: Run emulator and tests
uses: reactivecircus/android-emulator-runner@v2
uses: reactivecircus/android-emulator-runner@v2.28.0
with:
working-directory: ${{ env.WORKING_DIRECTORY }}
api-level: 29
api-level: 31
target: default
profile: pixel_2
ram-size: '4096M'
disk-size: '10G'
disable-animations: false
avd-name: e2e_emulator
arch: x86_64
script: yarn test-e2e-android
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: android-fail-screen-shoots
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/ios-build-test-fabric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,30 @@ on:
- 'ios/**'
- 'common/**'
- 'src/fabric/**'
- 'FabricExample/**'
- 'FabricTestExample/**'
push:
branches:
- main
workflow_dispatch:
jobs:
build:
runs-on: macos-12
timeout-minutes: 60
env:
WORKING_DIRECTORY: FabricExample
WORKING_DIRECTORY: FabricTestExample
concurrency:
group: ios-fabric-${{ github.ref }}
cancel-in-progress: true
steps:
- name: checkout
uses: actions/checkout@v2

- name: Use Node.js 14
- name: Use Node.js 18
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: 'FabricExample/yarn.lock'
cache-dependency-path: 'FabricTestExample/yarn.lock'

- name: Install node dependencies
working-directory: ${{ env.WORKING_DIRECTORY }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/ios-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
jobs:
build:
runs-on: macos-12
timeout-minutes: 60
env:
WORKING_DIRECTORY: TestsExample
concurrency:
Expand All @@ -25,10 +26,10 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: Use Node.js 14
- name: Use Node.js 18
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: 'TestsExample/yarn.lock'
- name: Install node dependencies
Expand All @@ -43,7 +44,7 @@ jobs:
id: remove_pods
name: Remove pods
working-directory: ${{ env.WORKING_DIRECTORY }}/ios
run: rm -fr build Pods Podfile.lock
run: rm -fr build Pods Podfile.lock
- if: steps.remove_pods.outcome == 'success'
id: reinstall_pods
name: Reinstall pods
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ios-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ on:
workflow_dispatch:
jobs:
test:
runs-on: macos-latest
timeout-minutes: 40
runs-on: macos-12
timeout-minutes: 60
env:
WORKING_DIRECTORY: Example
concurrency:
group: ios-e2e-${{ github.ref }}
cancel-in-progress: true
steps:
- name: checkout
uses: actions/checkout@v2
- name: Use Node.js 14
uses: actions/setup-node@v2
uses: actions/checkout@v3
- name: Use Node.js 18
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
cache: 'yarn'
- name: Get Xcode version
run: xcodebuild -version
Expand All @@ -48,7 +48,7 @@ jobs:
- name: Test app
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn test-e2e-ios
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: ios-fail-screen-shoots
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: Use Node.js 14
- name: Use Node.js 18
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 18
cache: 'yarn'
- name: Install node dependencies
run: yarn
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/tv-os-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
jobs:
build:
runs-on: macos-12
timeout-minutes: 60
env:
WORKING_DIRECTORY: TVOSExample
concurrency:
Expand All @@ -25,10 +26,10 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: Use Node.js 14
- name: Use Node.js 18
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: 'TVOSExample/yarn.lock'
- name: Install node dependencies
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ lib/
# CMake cache
.cxx/

android/.settings

5 changes: 4 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
module.exports = {
arrowParens: 'avoid',
bracketSameLine: true,
bracketSpacing: true,
singleQuote: true,
jsxBracketSameLine: true,
trailingComma: 'es5',
};
6 changes: 0 additions & 6 deletions Example/.buckconfig

This file was deleted.

2 changes: 2 additions & 0 deletions Example/.bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BUNDLE_PATH: "vendor/bundle"
BUNDLE_FORCE_RUBY_PLATFORM: 1
Loading

0 comments on commit 65d25e0

Please sign in to comment.