Skip to content

Commit 91dddda

Browse files
intergalacticspacehighwayintergalacticspacehighway
committed
merge main
2 parents 406620e + 9f3108d commit 91dddda

75 files changed

Lines changed: 646 additions & 612 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.

‎package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"ansi-regex": "^5.0.0",
6969
"ansi-styles": "^4.2.1",
7070
"babel-plugin-minify-dead-code-elimination": "^0.5.2",
71-
"babel-plugin-syntax-hermes-parser": "0.36.1",
71+
"babel-plugin-syntax-hermes-parser": "0.37.0",
7272
"babel-plugin-transform-define": "^2.1.4",
7373
"babel-plugin-transform-flow-enums": "^0.0.2",
7474
"clang-format": "^1.8.0",
@@ -87,10 +87,10 @@
8787
"eslint-plugin-redundant-undefined": "^0.4.0",
8888
"eslint-plugin-relay": "^1.8.3",
8989
"fb-dotslash": "0.5.8",
90-
"flow-api-translator": "0.36.1",
90+
"flow-api-translator": "0.37.0",
9191
"flow-bin": "^0.322.0",
92-
"hermes-eslint": "0.36.1",
93-
"hermes-transform": "0.36.1",
92+
"hermes-eslint": "0.37.0",
93+
"hermes-transform": "0.37.0",
9494
"ini": "^5.0.0",
9595
"inquirer": "^7.1.0",
9696
"jest": "^29.7.0",
@@ -108,7 +108,6 @@
108108
"node-fetch": "^2.2.0",
109109
"nullthrows": "^1.1.1",
110110
"prettier": "3.9.4",
111-
"prettier-plugin-hermes-parser": "0.37.0",
112111
"react": "19.2.3",
113112
"react-test-renderer": "19.2.3",
114113
"rimraf": "^3.0.2",

‎packages/community-cli-plugin/src/utils/loadMetroConfig.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ function getCommunityCliDefaultConfig(
5858
return {
5959
resolver,
6060
serializer: {
61-
// We can include multiple copies of InitializeCore here because metro will
61+
// We can include multiple copies of setup-env here because Metro will
6262
// only add ones that are already part of the bundle
6363
getModulesRunBeforeMainModule: () => [
64-
require.resolve('react-native/Libraries/Core/InitializeCore', {
64+
require.resolve('react-native/setup-env', {
6565
paths: [ctx.root],
6666
}),
6767
...outOfTreePlatforms.map(platform =>
6868
require.resolve(
69-
`${ctx.platforms[platform].npmPackageName}/Libraries/Core/InitializeCore`,
69+
`${ctx.platforms[platform].npmPackageName}/setup-env`,
7070
{paths: [ctx.root]},
7171
),
7272
),

‎packages/eslint-plugin-react-native/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"utils.js"
2626
],
2727
"devDependencies": {
28-
"babel-plugin-syntax-hermes-parser": "0.36.1",
29-
"hermes-eslint": "0.36.1"
28+
"babel-plugin-syntax-hermes-parser": "0.37.0",
29+
"hermes-eslint": "0.37.0"
3030
},
3131
"engines": {
3232
"node": "^22.13.0 || ^24.3.0 || >= 26.0.0"

‎packages/eslint-plugin-specs/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
"@react-native/codegen": "0.87.0-main",
3636
"make-dir": "^2.1.0",
3737
"pirates": "^4.0.1",
38-
"babel-plugin-syntax-hermes-parser": "0.36.1",
38+
"babel-plugin-syntax-hermes-parser": "0.37.0",
3939
"source-map-support": "0.5.0"
4040
},
4141
"devDependencies": {
42-
"hermes-eslint": "0.36.1"
42+
"hermes-eslint": "0.37.0"
4343
},
4444
"engines": {
4545
"node": "^22.13.0 || ^24.3.0 || >= 26.0.0"

‎packages/metro-config/src/index.flow.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export function getDefaultConfig(projectRoot: string): ConfigT {
6161
serializer: {
6262
// NOTE: Overridden in community-cli-plugin
6363
getModulesRunBeforeMainModule: () => [
64-
require.resolve('react-native/Libraries/Core/InitializeCore'),
64+
require.resolve('react-native/setup-env'),
6565
],
6666
getPolyfills: () => require('@react-native/js-polyfills')(),
6767
isThirdPartyModule({path: modulePath}: Readonly<{path: string, ...}>) {

‎packages/react-native-babel-preset/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@babel/plugin-transform-typescript": "^7.25.2",
5757
"@babel/plugin-transform-unicode-regex": "^7.24.7",
5858
"@react-native/babel-plugin-codegen": "0.87.0-main",
59-
"babel-plugin-syntax-hermes-parser": "0.36.1",
59+
"babel-plugin-syntax-hermes-parser": "0.37.0",
6060
"babel-plugin-transform-flow-enums": "^0.0.2",
6161
"react-refresh": "^0.14.0"
6262
},

‎packages/react-native-babel-transformer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"dependencies": {
2929
"@babel/core": "^7.25.2",
3030
"@react-native/babel-preset": "0.87.0-main",
31-
"hermes-parser": "0.36.1",
31+
"hermes-parser": "0.37.0",
3232
"nullthrows": "^1.1.1"
3333
},
3434
"peerDependencies": {

‎packages/react-native-codegen/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"dependencies": {
3232
"@babel/core": "^7.25.2",
3333
"@babel/parser": "^7.29.0",
34-
"hermes-parser": "0.36.1",
34+
"hermes-parser": "0.37.0",
3535
"invariant": "^2.2.4",
3636
"nullthrows": "^1.1.1",
3737
"tinyglobby": "^0.2.15",
@@ -45,8 +45,8 @@
4545
"@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
4646
"@babel/plugin-transform-optional-chaining": "^7.24.8",
4747
"@babel/preset-env": "^7.25.3",
48-
"babel-plugin-syntax-hermes-parser": "0.36.1",
49-
"hermes-estree": "0.36.1",
48+
"babel-plugin-syntax-hermes-parser": "0.37.0",
49+
"hermes-estree": "0.37.0",
5050
"micromatch": "^4.0.4",
5151
"prettier": "3.9.4",
5252
"rimraf": "^3.0.2"

‎packages/react-native-codegen/scripts/oss/build.sh‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,20 @@ fi
2424
YARN_BINARY="${YARN_BINARY:-$YARN_OR_NPM}"
2525

2626
# mv command to use when copying files into the working directory
27-
EDEN_SAFE_MV="mv"
27+
SAFE_MV="mv"
28+
29+
# Detect if we are on a VirtioFS volume via Apple Virtualization.framework
30+
if [[ "$OSTYPE" == "darwin"* ]] && /sbin/mount | /usr/bin/awk -v dev="$(/bin/df -P "$CODEGEN_DIR" | /usr/bin/awk 'NR==2 {print $1}')" '$1 == dev && /AppleVirtIOFS/ { found=1 } END { exit !found }'; then
31+
SAFE_MV="/bin/cp -R -X"
32+
fi
2833

2934
if [ -x "$(command -v eden)" ]; then
3035
pushd "$THIS_DIR"
3136

3237
# Detect if we are in an EdenFS checkout with `eden info` (we ignore the output as it creates noise on CI/IDE logs)
3338
# Also be sure to use /bin/cp in case users have GNU coreutils installed which is incompatible with -X
3439
if [[ "$OSTYPE" == "darwin"* ]] && eden info 2>/dev/null; then
35-
EDEN_SAFE_MV="/bin/cp -R -X"
40+
SAFE_MV="/bin/cp -R -X"
3641
fi
3742

3843
popd >/dev/null
@@ -71,7 +76,7 @@ else
7176

7277
popd >/dev/null
7378

74-
$EDEN_SAFE_MV "$TMP_DIR/lib" "$CODEGEN_DIR"
75-
$EDEN_SAFE_MV "$TMP_DIR/node_modules" "$CODEGEN_DIR"
79+
$SAFE_MV "$TMP_DIR/lib" "$CODEGEN_DIR"
80+
$SAFE_MV "$TMP_DIR/node_modules" "$CODEGEN_DIR"
7681
rm -rf "$TMP_DIR"
7782
fi

‎packages/react-native/Libraries/Network/RCTNetworking.mm‎

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#import <React/RCTUtils.h>
1616

1717
#import <React/RCTHTTPRequestHandler.h>
18-
#import <react/featureflags/ReactNativeFeatureFlags.h>
1918

2019
#import "RCTInspectorNetworkReporter.h"
2120
#import "RCTNetworkPlugins.h"
@@ -452,9 +451,7 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
452451
__weak RCTNetworkTask *weakTask = task;
453452
return ^{
454453
[weakTask cancel];
455-
if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
456-
[RCTInspectorNetworkReporter reportRequestFailed:devToolsRequestId cancelled:YES];
457-
}
454+
[RCTInspectorNetworkReporter reportRequestFailed:devToolsRequestId cancelled:YES];
458455
if (cancellationBlock) {
459456
cancellationBlock();
460457
}
@@ -574,19 +571,17 @@ - (void)sendData:(NSData *)data
574571
}
575572
}
576573

577-
if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
578-
id responseDataForPreview;
579-
if ([responseType isEqualToString:@"blob"]) {
580-
responseDataForPreview = data;
581-
} else if ([responseData isKindOfClass:[NSString class]]) {
582-
responseDataForPreview = responseData;
583-
}
584-
bool base64Encoded = [responseType isEqualToString:@"base64"] || [responseType isEqualToString:@"blob"];
585-
586-
[RCTInspectorNetworkReporter maybeStoreResponseBody:task.devToolsRequestId
587-
data:responseDataForPreview
588-
base64Encoded:base64Encoded];
574+
id responseDataForPreview;
575+
if ([responseType isEqualToString:@"blob"]) {
576+
responseDataForPreview = data;
577+
} else if ([responseData isKindOfClass:[NSString class]]) {
578+
responseDataForPreview = responseData;
589579
}
580+
bool base64Encoded = [responseType isEqualToString:@"base64"] || [responseType isEqualToString:@"blob"];
581+
582+
[RCTInspectorNetworkReporter maybeStoreResponseBody:task.devToolsRequestId
583+
data:responseDataForPreview
584+
base64Encoded:base64Encoded];
590585

591586
[self sendEventWithName:@"didReceiveNetworkData" body:@[ task.requestID, responseData ]];
592587
}
@@ -620,12 +615,10 @@ - (void)sendRequest:(NSURLRequest *)request
620615
id responseURL = response.URL ? response.URL.absoluteString : [NSNull null];
621616
NSArray<id> *responseJSON = @[ task.requestID, @(status), headers, responseURL ];
622617

623-
if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
624-
[RCTInspectorNetworkReporter reportResponseStart:task.devToolsRequestId
625-
response:response
626-
statusCode:status
627-
headers:headers];
628-
}
618+
[RCTInspectorNetworkReporter reportResponseStart:task.devToolsRequestId
619+
response:response
620+
statusCode:status
621+
headers:headers];
629622
[weakSelf sendEventWithName:@"didReceiveNetworkResponse" body:responseJSON];
630623
};
631624

@@ -660,10 +653,8 @@ - (void)sendRequest:(NSURLRequest *)request
660653
@(total)
661654
];
662655

663-
if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
664-
[RCTInspectorNetworkReporter reportDataReceived:task.devToolsRequestId data:data];
665-
[RCTInspectorNetworkReporter maybeStoreResponseBodyIncremental:task.devToolsRequestId data:responseString];
666-
}
656+
[RCTInspectorNetworkReporter reportDataReceived:task.devToolsRequestId data:data];
657+
[RCTInspectorNetworkReporter maybeStoreResponseBodyIncremental:task.devToolsRequestId data:responseString];
667658
[weakSelf sendEventWithName:@"didReceiveNetworkIncrementalData" body:responseJSON];
668659
};
669660
} else {
@@ -700,12 +691,10 @@ - (void)sendRequest:(NSURLRequest *)request
700691
NSArray *responseJSON =
701692
@[ task.requestID, RCTNullIfNil(error.localizedDescription), error.code == kCFURLErrorTimedOut ? @YES : @NO ];
702693

703-
if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
704-
if (error != nullptr) {
705-
[RCTInspectorNetworkReporter reportRequestFailed:task.devToolsRequestId cancelled:NO];
706-
} else {
707-
[RCTInspectorNetworkReporter reportResponseEnd:task.devToolsRequestId encodedDataLength:data.length];
708-
}
694+
if (error != nullptr) {
695+
[RCTInspectorNetworkReporter reportRequestFailed:task.devToolsRequestId cancelled:NO];
696+
} else {
697+
[RCTInspectorNetworkReporter reportResponseEnd:task.devToolsRequestId encodedDataLength:data.length];
709698
}
710699
[strongSelf sendEventWithName:@"didCompleteNetworkResponse" body:responseJSON];
711700
[strongSelf->_tasksByRequestID removeObjectForKey:task.requestID];
@@ -723,12 +712,10 @@ - (void)sendRequest:(NSURLRequest *)request
723712
}
724713
_tasksByRequestID[task.requestID] = task;
725714
responseSender(@[ task.requestID ]);
726-
if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
727-
[RCTInspectorNetworkReporter reportRequestStart:task.devToolsRequestId
728-
request:request
729-
encodedDataLength:task.response.expectedContentLength];
730-
[RCTInspectorNetworkReporter reportConnectionTiming:task.devToolsRequestId request:task.request];
731-
}
715+
[RCTInspectorNetworkReporter reportRequestStart:task.devToolsRequestId
716+
request:request
717+
encodedDataLength:task.response.expectedContentLength];
718+
[RCTInspectorNetworkReporter reportConnectionTiming:task.devToolsRequestId request:task.request];
732719
}
733720

734721
[task start];

0 commit comments

Comments
 (0)