Skip to content

Commit b911e26

Browse files
committed
Merge branch 'main' into improve-lineheight-calc-ios
2 parents 7bed2d9 + 0ade23d commit b911e26

187 files changed

Lines changed: 3469 additions & 2619 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.

.eslintrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,11 @@ module.exports = {
124124
],
125125
},
126126
},
127+
{
128+
files: ['**/*-itest{.fb,}.js'],
129+
rules: {
130+
'lint/no-react-native-imports': 'off',
131+
},
132+
},
127133
],
128134
};

.github/workflow-scripts/verifyReleaseOnNpm.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ module.exports.verifyReleaseOnNpm = async (
2323
retries = MAX_RETRIES,
2424
) => {
2525
const tag = version.includes('-rc.') ? 'next' : latest ? 'latest' : null;
26+
if (version.startsWith('v')) {
27+
version = version.slice(1);
28+
}
2629
await verifyPublishedPackage(REACT_NATIVE_NPM_PKG, version, tag, retries);
2730
};

.github/workflows/nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ jobs:
102102

103103
prebuild_apple_dependencies:
104104
uses: ./.github/workflows/prebuild-ios.yml
105+
secrets: inherit
105106

106107
build_hermesc_linux:
107108
runs-on: ubuntu-latest

.github/workflows/prebuild-ios.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Prebuild iOS
33
on:
44
workflow_call: # this directive allow us to call this workflow from other workflows
55

6+
67
jobs:
78
prepare_workspace:
89
name: Prepare workspace
@@ -119,6 +120,9 @@ jobs:
119120
fail-fast: false
120121
matrix:
121122
flavor: [Debug, Release]
123+
env:
124+
REACT_ORG_CODE_SIGNING_P12_CERT: ${{ secrets.REACT_ORG_CODE_SIGNING_P12_CERT }}
125+
REACT_ORG_CODE_SIGNING_P12_CERT_PWD: ${{ secrets.REACT_ORG_CODE_SIGNING_P12_CERT_PWD }}
122126
steps:
123127
- name: Checkout
124128
uses: actions/checkout@v4
@@ -146,9 +150,18 @@ jobs:
146150
pattern: prebuild-slice-${{ matrix.flavor }}-*
147151
path: packages/react-native/third-party/.build/Build/Products
148152
merge-multiple: true
153+
- name: Setup Keychain
154+
if: ${{ steps.restore-xcframework.outputs.cache-hit != 'true' && env.REACT_ORG_CODE_SIGNING_P12_CERT != '' }}
155+
uses: apple-actions/import-codesign-certs@v3 # https://github.com/marketplace/actions/import-code-signing-certificates
156+
with:
157+
p12-file-base64: ${{ secrets.REACT_ORG_CODE_SIGNING_P12_CERT }}
158+
p12-password: ${{ secrets.REACT_ORG_CODE_SIGNING_P12_CERT_PWD }}
149159
- name: Create XCFramework
150-
if: steps.restore-xcframework.outputs.cache-hit != 'true'
160+
if: ${{ steps.restore-xcframework.outputs.cache-hit != 'true' && env.REACT_ORG_CODE_SIGNING_P12_CERT == '' }}
151161
run: node scripts/releases/prepare-ios-prebuilds.js -c
162+
- name: Create and Sign XCFramework
163+
if: ${{ steps.restore-xcframework.outputs.cache-hit != 'true' && env.REACT_ORG_CODE_SIGNING_P12_CERT != '' }}
164+
run: node scripts/releases/prepare-ios-prebuilds.js -c -i "React Org"
152165
- name: Compress and Rename XCFramework
153166
if: steps.restore-xcframework.outputs.cache-hit != 'true'
154167
run: |

.github/workflows/publish-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ jobs:
9898
flavor: ${{ matrix.flavor }}
9999
prebuild_apple_dependencies:
100100
uses: ./.github/workflows/prebuild-ios.yml
101+
secrets: inherit
101102

102103
build_hermesc_linux:
103104
runs-on: ubuntu-latest

.github/workflows/test-all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ jobs:
118118

119119
prebuild_apple_dependencies:
120120
uses: ./.github/workflows/prebuild-ios.yml
121+
secrets: inherit
121122

122123
test_ios_rntester_ruby_3_2_0:
123124
runs-on: macos-13

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## v0.79.0-rc.1
4+
5+
### Changed
6+
7+
- Update Metro to ^0.82.0 ([8421b8a872](https://github.com/facebook/react-native/commit/8421b8a8723633da9806e2db37a43add5de8761c) by [@robhogan](https://github.com/robhogan))
8+
9+
### Fixed
10+
11+
#### iOS specific
12+
13+
- Fixed: extraModulesForBridge callback not called when New Architecture enabled ([c0a5c2c3cb](https://github.com/facebook/react-native/commit/c0a5c2c3cb883dc68e98d2720b194df17d0b9ee7) by Bruno Aybar)
14+
- Enable back the opt-out from the New Architecture ([9abdd619da](https://github.com/facebook/react-native/commit/9abdd619da110dbe227c387179a449623395c7b2) by [@cipolleschi](https://github.com/cipolleschi))
15+
- Add missing loadFromSource method in the DefaultRNFactoryDelegate ([7739615e0d](https://github.com/facebook/react-native/commit/7739615e0d614a93f297b70ef0947dddf3d1ba6e) by [@cipolleschi](https://github.com/cipolleschi))
16+
317
## v0.79.0-rc.0
418

519
### Breaking

flow-typed/environment/node.js

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,7 +2381,11 @@ declare class readline$Interface extends events$EventEmitter {
23812381
close(): void;
23822382
pause(): void;
23832383
prompt(preserveCursor?: boolean): void;
2384-
question(query: string, callback: (answer: string) => void): void;
2384+
question(
2385+
query: string,
2386+
optionsOrCallback: {|signal?: AbortSignal|} | ((answer: string) => void),
2387+
callback?: (answer: string) => void,
2388+
): void;
23852389
resume(): void;
23862390
setPrompt(prompt: string): void;
23872391
write(
@@ -2399,29 +2403,38 @@ declare class readline$Interface extends events$EventEmitter {
23992403

24002404
declare module 'readline' {
24012405
declare var Interface: typeof readline$Interface;
2402-
declare function clearLine(stream: stream$Stream, dir: -1 | 1 | 0): void;
2403-
declare function clearScreenDown(stream: stream$Stream): void;
2406+
declare function clearLine(
2407+
stream: stream$Stream,
2408+
dir: -1 | 1 | 0,
2409+
callback?: () => void,
2410+
): void;
2411+
declare function clearScreenDown(
2412+
stream: stream$Stream,
2413+
callback?: () => void,
2414+
): void;
24042415
declare function createInterface(opts: {
2405-
input: stream$Readable,
2406-
output?: ?stream$Stream,
24072416
completer?: readline$InterfaceCompleter,
2408-
terminal?: boolean,
2417+
crlfDelay?: number,
2418+
escapeCodeTimeout?: number,
24092419
historySize?: number,
2420+
input: stream$Readable,
2421+
output?: ?stream$Stream,
24102422
prompt?: string,
2411-
crlfDelay?: number,
24122423
removeHistoryDuplicates?: boolean,
2413-
escapeCodeTimeout?: number,
2424+
terminal?: boolean,
24142425
...
24152426
}): readline$Interface;
24162427
declare function cursorTo(
24172428
stream: stream$Stream,
24182429
x?: number,
24192430
y?: number,
2431+
callback?: () => void,
24202432
): void;
24212433
declare function moveCursor(
24222434
stream: stream$Stream,
24232435
dx: number,
24242436
dy: number,
2437+
callback?: () => void,
24252438
): void;
24262439
declare function emitKeypressEvents(
24272440
stream: stream$Stream,

flow-typed/npm/babel-traverse_v7.x.x.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,6 +1016,7 @@ declare module '@babel/traverse' {
10161016
isTSDeclareFunction(opts?: Opts): boolean;
10171017
isTSDeclareMethod(opts?: Opts): boolean;
10181018
isTSEntityName(opts?: Opts): boolean;
1019+
isTSEnumBody(opts?: Opts): boolean;
10191020
isTSEnumDeclaration(opts?: Opts): boolean;
10201021
isTSEnumMember(opts?: Opts): boolean;
10211022
isTSExportAssignment(opts?: Opts): boolean;
@@ -1053,6 +1054,7 @@ declare module '@babel/traverse' {
10531054
isTSSatisfiesExpression(opts?: Opts): boolean;
10541055
isTSStringKeyword(opts?: Opts): boolean;
10551056
isTSSymbolKeyword(opts?: Opts): boolean;
1057+
isTSTemplateLiteralType(opts?: Opts): boolean;
10561058
isTSThisType(opts?: Opts): boolean;
10571059
isTSTupleType(opts?: Opts): boolean;
10581060
isTSType(opts?: Opts): boolean;
@@ -1333,6 +1335,7 @@ declare module '@babel/traverse' {
13331335
assertTSDeclareFunction(opts?: Opts): void;
13341336
assertTSDeclareMethod(opts?: Opts): void;
13351337
assertTSEntityName(opts?: Opts): void;
1338+
assertTSEnumBody(opts?: Opts): void;
13361339
assertTSEnumDeclaration(opts?: Opts): void;
13371340
assertTSEnumMember(opts?: Opts): void;
13381341
assertTSExportAssignment(opts?: Opts): void;
@@ -1370,6 +1373,7 @@ declare module '@babel/traverse' {
13701373
assertTSSatisfiesExpression(opts?: Opts): void;
13711374
assertTSStringKeyword(opts?: Opts): void;
13721375
assertTSSymbolKeyword(opts?: Opts): void;
1376+
assertTSTemplateLiteralType(opts?: Opts): void;
13731377
assertTSThisType(opts?: Opts): void;
13741378
assertTSTupleType(opts?: Opts): void;
13751379
assertTSType(opts?: Opts): void;
@@ -1739,6 +1743,7 @@ declare module '@babel/traverse' {
17391743
TSDeclareFunction?: VisitNode<BabelNodeTSDeclareFunction, TState>,
17401744
TSDeclareMethod?: VisitNode<BabelNodeTSDeclareMethod, TState>,
17411745
TSEntityName?: VisitNode<BabelNodeTSEntityName, TState>,
1746+
TSEnumBody?: VisitNode<BabelNodeTSEnumBody, TState>,
17421747
TSEnumDeclaration?: VisitNode<BabelNodeTSEnumDeclaration, TState>,
17431748
TSEnumMember?: VisitNode<BabelNodeTSEnumMember, TState>,
17441749
TSExportAssignment?: VisitNode<BabelNodeTSExportAssignment, TState>,
@@ -1791,6 +1796,7 @@ declare module '@babel/traverse' {
17911796
TSSatisfiesExpression?: VisitNode<BabelNodeTSSatisfiesExpression, TState>,
17921797
TSStringKeyword?: VisitNode<BabelNodeTSStringKeyword, TState>,
17931798
TSSymbolKeyword?: VisitNode<BabelNodeTSSymbolKeyword, TState>,
1799+
TSTemplateLiteralType?: VisitNode<BabelNodeTSTemplateLiteralType, TState>,
17941800
TSThisType?: VisitNode<BabelNodeTSThisType, TState>,
17951801
TSTupleType?: VisitNode<BabelNodeTSTupleType, TState>,
17961802
TSType?: VisitNode<BabelNodeTSType, TState>,

0 commit comments

Comments
 (0)