Skip to content

Commit dbbfafc

Browse files
authored
Merge pull request facebook#1944 from Saadnajmi/tip
Merge up to September 20th
2 parents 0fae3ab + d94f6d8 commit dbbfafc

File tree

3,961 files changed

+156232
-90575
lines changed

Some content is hidden

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

3,961 files changed

+156232
-90575
lines changed

.ado/apple-pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
xcode_scheme: 'RNTester'
7878
xcode_configuration: 'Debug'
7979
xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
80-
xcode_actions: 'build test'
80+
xcode_actions: 'build' # https://github.com/facebook/react-native/issues/39719 Tests fail on RNTester with `RCT_NEW_ARCH_ENABLED`
8181
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
8282
new_arch_enabled: '1'
8383
use_hermes: '0'
@@ -97,7 +97,7 @@ jobs:
9797
xcode_scheme: 'RNTester-macOS'
9898
xcode_configuration: 'Debug'
9999
xcode_destination: 'platform=macOS,arch=x86_64'
100-
xcode_actions: 'build test'
100+
xcode_actions: 'build' # https://github.com/facebook/react-native/issues/39719 Tests fail on RNTester with `RCT_NEW_ARCH_ENABLED`
101101
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
102102
new_arch_enabled: '1'
103103
use_hermes: '0'
@@ -158,7 +158,7 @@ jobs:
158158
# xcode_scheme: 'RNTester'
159159
# xcode_configuration: 'Debug'
160160
# xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
161-
# xcode_actions: 'build test'
161+
# xcode_actions: 'build' # https://github.com/facebook/react-native/issues/39719 Tests fail on RNTester with `RCT_NEW_ARCH_ENABLED`
162162
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
163163
# new_arch_enabled: '1'
164164
# use_hermes: '1'
@@ -178,7 +178,7 @@ jobs:
178178
# xcode_scheme: 'RNTester-macOS'
179179
# xcode_configuration: 'Debug'
180180
# xcode_destination: 'platform=macOS,arch=x86_64'
181-
# xcode_actions: 'build test'
181+
# xcode_actions: 'build' # https://github.com/facebook/react-native/issues/39719 Tests fail on RNTester with `RCT_NEW_ARCH_ENABLED`
182182
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
183183
# new_arch_enabled: '1'
184184
# use_hermes: '1'

.ado/templates/apple-job-javascript.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,8 @@ steps:
2121
inputs:
2222
script: 'yarn test-ci'
2323

24-
- script: 'yarn flow-check-ios'
25-
displayName: 'yarn flow-check-ios'
26-
27-
- script: 'yarn flow-check-macos'
28-
displayName: 'yarn flow-check-macos'
29-
30-
- script: 'yarn flow-check-android'
31-
displayName: 'yarn flow-check-android'
24+
- script: 'yarn flow-check'
25+
displayName: 'yarn flow-check'
3226

3327
- script: 'yarn lint'
3428
displayName: 'yarn lint'

.ado/templates/apple-job-react-native.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ parameters:
44
xcode_configuration: ''
55
xcode_scheme: ''
66
xcode_actions: ''
7-
# xcode_destination: ''
7+
xcode_destination: ''
88
xcode_extraArgs: ''
9-
slice_name: ''
109
xcode_version: ''
1110
new_arch_enabled: ''
1211
use_hermes: ''
@@ -61,7 +60,8 @@ steps:
6160
sdk: ${{ parameters.xcode_sdk }}
6261
xcWorkspacePath: packages/rn-tester/RNTesterPods.xcworkspace
6362
scheme: ${{ parameters.xcode_scheme }}
64-
xcodeVersion: default
63+
xcodeVersion: specifyPath
64+
xcodeDeveloperDir: ${{ parameters.xcode_version }}
6565
signingOption: auto
6666
packageApp: false
6767
teamId: '$(XCodeSigningMicrosoftTeamID)'

.ado/templates/apple-tools-setup.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,5 @@ steps:
33
inputs:
44
versionSpec: '18.x'
55

6-
- task: UseRubyVersion@0
7-
inputs:
8-
versionSpec: '>= 2.7'
9-
106
- script: 'brew bundle --file .ado/Brewfile'
117
displayName: 'brew bundle'

.ado/variables/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
variables:
2-
VmImageApple: internal-macos12
3-
slice_name: 'Xcode_14.2'
4-
xcode_version: '/Applications/Xcode_14.2.app'
2+
VmImageApple: macOS-13
3+
slice_name: 'Xcode_15.0'
4+
xcode_version: '/Applications/Xcode_15.0.app'

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"presets": [
3-
"module:metro-react-native-babel-preset"
3+
"module:@react-native/babel-preset"
44
],
55
"plugins": [
66
"babel-plugin-transform-flow-enums"

.circleci/DockerTests.md

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

.circleci/Dockerfiles/Dockerfile.android

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

0 commit comments

Comments
 (0)