Skip to content

Commit d58e6cc

Browse files
committed
Merge branch 'main' into @jpiasecki/fix-event-order-android-2
2 parents 7856646 + 08b5853 commit d58e6cc

File tree

324 files changed

+25382
-22575
lines changed

Some content is hidden

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

324 files changed

+25382
-22575
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# .git-blame-ignore-revs
2+
# Reformatted iOS codebase
3+
9cf4245740e01f216850da999a7e630da53c7ea6

.github/workflows/android-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
steps:
2323
- name: checkout
2424
uses: actions/checkout@v2
25-
- name: Use Node.js 14
25+
- name: Use Node.js 16
2626
uses: actions/setup-node@v2
2727
with:
28-
node-version: 14
28+
node-version: 16
2929
cache: 'yarn'
3030
- name: Install node dependencies
3131
working-directory: ${{ matrix.working-directory }}

.github/workflows/ios-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
steps:
2323
- name: checkout
2424
uses: actions/checkout@v2
25-
- name: Use Node.js 14
25+
- name: Use Node.js 16
2626
uses: actions/setup-node@v2
2727
with:
28-
node-version: 14
28+
node-version: 16
2929
cache: 'yarn'
3030
- name: Install node dependencies
3131
working-directory: ${{ matrix.working-directory }}

.github/workflows/static-example-apps-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
steps:
2020
- name: checkout
2121
uses: actions/checkout@v2
22-
- name: Use Node.js 14
22+
- name: Use Node.js 16
2323
uses: actions/setup-node@v2
2424
with:
25-
node-version: 14
25+
node-version: 16
2626
cache: 'yarn'
2727
- name: Install root node dependencies
2828
run: yarn

.github/workflows/static-root-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717
- name: checkout
1818
uses: actions/checkout@v2
19-
- name: Use Node.js 14
19+
- name: Use Node.js 16
2020
uses: actions/setup-node@v2
2121
with:
22-
node-version: 14
22+
node-version: 16
2323
cache: 'yarn'
2424
- name: Install node dependencies
2525
run: yarn

FabricExample/.buckconfig

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

FabricExample/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module.exports = {
22
root: true,
3-
extends: '@react-native-community',
3+
extends: '@react-native',
44
};

FabricExample/.flowconfig

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

FabricExample/.gitignore

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,15 @@ local.properties
3131
*.iml
3232
*.hprof
3333
.cxx/
34+
*.keystore
35+
!debug.keystore
3436

3537
# node.js
3638
#
3739
node_modules/
3840
npm-debug.log
3941
yarn-error.log
4042

41-
# BUCK
42-
buck-out/
43-
\.buckd/
44-
*.keystore
45-
!debug.keystore
46-
4743
# fastlane
4844
#
4945
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
@@ -62,3 +58,9 @@ buck-out/
6258
# Ruby / CocoaPods
6359
/ios/Pods/
6460
/vendor/bundle/
61+
62+
# Temporary files created by Metro to check the health of the file watcher
63+
.metro-health-check*
64+
65+
# testing
66+
/coverage

FabricExample/Gemfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
source 'https://rubygems.org'
22

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby '2.7.5'
5-
6-
gem 'cocoapods', '~> 1.11', '>= 1.11.2'
4+
ruby ">= 2.6.10"
5+
gem 'cocoapods', '~> 1.12'

FabricExample/__tests__/App-test.js

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

ci/e2e/__tests__/App-test.js renamed to FabricExample/__tests__/App-test.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import 'react-native';
66
import React from 'react';
77
import App from '../App';
88

9+
// Note: import explicitly to use the types shiped with jest.
10+
import { it } from '@jest/globals';
11+
912
// Note: test renderer must be required after react-native.
1013
import renderer from 'react-test-renderer';
1114

FabricExample/_ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

FabricExample/android/app/_BUCK

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

0 commit comments

Comments
 (0)