Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.77] Integrate 0.77.0-rc.4 #14233

Open
wants to merge 3 commits into
base: 0.77-stable
Choose a base branch
from
Open

[0.77] Integrate 0.77.0-rc.4 #14233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bed7c8
integrate rn 0.77.0-rc.4
TatianaKapos Dec 26, 2024
a7663fd
Change files
TatianaKapos Dec 26, 2024
e689cf5
remove overrides
TatianaKapos Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/@office-iss-react-native-win32-54518aeb-1856-43ab-8f0a-27ebc3785768.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate rn 0.77.0-rc.4",
"packageName": "@office-iss/react-native-win32",
"email": "email not defined",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/react-native-windows-03c284bd-e659-4d5e-b32b-9759cb464330.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate rn 0.77.0-rc.4",
"packageName": "react-native-windows",
"email": "email not defined",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32-tester/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.77.0-rc.0",
"baseVersion": "0.77.0-rc.4",
"overrides": [
{
"type": "patch",
Expand Down
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "0.77.0-preview.1",
"react": "18.0.0",
"react-native": "0.77.0-rc.0"
"react-native": "0.77.0-rc.4"
},
"devDependencies": {
"@office-iss/react-native-win32": "0.77.0-preview.1",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-platform-override": "^1.9.49",
"typescript": "5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.77.0-rc.0",
"baseVersion": "0.77.0-rc.4",
"overrides": [
{
"type": "derived",
Expand Down
18 changes: 9 additions & 9 deletions packages/@office-iss/react-native-win32/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"@react-native-community/cli-platform-android": "15.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.77.0-rc.0",
"@react-native/codegen": "0.77.0-rc.0",
"@react-native/community-cli-plugin": "0.77.0-rc.0",
"@react-native/gradle-plugin": "0.77.0-rc.0",
"@react-native/js-polyfills": "0.77.0-rc.0",
"@react-native/normalize-colors": "0.77.0-rc.0",
"@react-native/virtualized-lists": "0.77.0-rc.0",
"@react-native/assets-registry": "0.77.0-rc.4",
"@react-native/codegen": "0.77.0-rc.4",
"@react-native/community-cli-plugin": "0.77.0-rc.4",
"@react-native/gradle-plugin": "0.77.0-rc.4",
"@react-native/js-polyfills": "0.77.0-rc.4",
"@react-native/normalize-colors": "0.77.0-rc.4",
"@react-native/virtualized-lists": "0.77.0-rc.4",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -90,14 +90,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "18.3.1",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-platform-override": "^1.9.49",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^18.2.0",
"react-native": "0.77.0-rc.0"
"react-native": "0.77.0-rc.4"
},
"beachball": {
"defaultNpmTag": "preview",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native-windows/automation-channel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"just-scripts": "^1.3.2",
"prettier": "2.8.8",
"react": "18.3.1",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1",
"typescript": "5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native-windows/tester/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win/**"
],
"baseVersion": "0.77.0-rc.0",
"baseVersion": "0.77.0-rc.4",
"overrides": [
{
"type": "derived",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native-windows/tester/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "18.0.0",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1",
"react-native-xaml": "^0.0.78"
},
Expand All @@ -32,7 +32,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-platform-override": "^1.9.49",
"react-native-windows": "0.77.0-preview.1",
"typescript": "5.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"baseVersion": "0.77.0-rc.0",
"baseVersion": "0.77.0-rc.4",
"overrides": [
{
"type": "patch",
"file": "package.json",
"baseFile": "package.json",
"baseHash": "a2df0199b474665c8ff426fc712615c798c67a62"
"baseHash": "68d841d7be590262b6a02c7bd15ce57eb3a7be21"
}
]
}
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"@definitelytyped/dtslint": "^0.0.127",
"@jest/create-cache-key-function": "^29.6.3",
"@pkgjs/parseargs": "^0.11.0",
"@react-native/metro-babel-transformer": "0.77.0-rc.0",
"@react-native/metro-config": "0.77.0-rc.0",
"@react-native/metro-babel-transformer": "0.77.0-rc.4",
"@react-native/metro-config": "0.77.0-rc.4",
"@tsconfig/node18": "1.0.1",
"@types/react": "^18.2.6",
"@typescript-eslint/parser": "^7.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/tester/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"baseVersion": "0.77.0-rc.0",
"baseVersion": "0.77.0-rc.4",
"overrides": [
{
"type": "copy",
Expand Down Expand Up @@ -621,7 +621,7 @@
"type": "patch",
"file": "package.json",
"baseFile": "packages/rn-tester/package.json",
"baseHash": "428a339cc04f619ec6c00f2037332440d6d97326",
"baseHash": "468a273cb010ad1ab893a95fe4fb33cd1dc5affc",
"issue": 13228
}
]
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native/tester/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"e2e-test-ios": "./scripts/maestro-test-ios.sh"
},
"dependencies": {
"@react-native/popup-menu-android": "0.77.0-rc.0",
"@react-native/popup-menu-android": "0.77.0-rc.4",
"flow-enums-runtime": "^0.0.6",
"invariant": "^2.2.4",
"nullthrows": "^1.1.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-test-app-fabric/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1",
"react-native-xaml": "^0.0.78"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/integration-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@typescript-eslint/parser": "^7.1.1",
"chai": "^4.2.0",
"react": "^18.2.0",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-app-fabric/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-apps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-custom-component/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dependencies": {
"@types/react": "^18.2.6",
"react": "^18.2.0",
"react-native": "0.77.0-rc.0",
"react-native": "0.77.0-rc.4",
"react-native-windows": "0.77.0-preview.1"
},
"devDependencies": {
Expand Down
74 changes: 39 additions & 35 deletions vnext/ReactCommon/TEMP_UntilReactCommonUpdate/react/runtime/ReactInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,47 +235,51 @@ std::string simpleBasename(const std::string& path) {
*/
void ReactInstance::loadScript(
std::unique_ptr<const JSBigString> script,
const std::string& sourceURL) {
const std::string& sourceURL,
std::function<void(jsi::Runtime& runtime)>&& completion) {
auto buffer = std::make_shared<BigStringBuffer>(std::move(script));
std::string scriptName = simpleBasename(sourceURL);

runtimeScheduler_->scheduleWork(
[this,
scriptName,
sourceURL,
buffer = std::move(buffer),
weakBufferedRuntimeExecuter = std::weak_ptr<BufferedRuntimeExecutor>(
bufferedRuntimeExecutor_)](jsi::Runtime& runtime) {
SystraceSection s("ReactInstance::loadScript");
bool hasLogger(ReactMarker::logTaggedMarkerBridgelessImpl);
if (hasLogger) {
ReactMarker::logTaggedMarkerBridgeless(
ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
}
runtimeScheduler_->scheduleWork([this,
scriptName,
sourceURL,
buffer = std::move(buffer),
weakBufferedRuntimeExecuter =
std::weak_ptr<BufferedRuntimeExecutor>(
bufferedRuntimeExecutor_),
completion](jsi::Runtime& runtime) {
SystraceSection s("ReactInstance::loadScript");
bool hasLogger(ReactMarker::logTaggedMarkerBridgelessImpl);
if (hasLogger) {
ReactMarker::logTaggedMarkerBridgeless(
ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
}

runtime.evaluateJavaScript(buffer, sourceURL);
runtime.evaluateJavaScript(buffer, sourceURL);

/**
* TODO(T183610671): We need a safe/reliable way to enable the js
* pipeline from javascript. Remove this after we figure that out, or
* after we just remove the js pipeline.
*/
if (!jsErrorHandler_->hasHandledFatalError()) {
jsErrorHandler_->setRuntimeReady();
}
/**
* TODO(T183610671): We need a safe/reliable way to enable the js
* pipeline from javascript. Remove this after we figure that out, or
* after we just remove the js pipeline.
*/
if (!jsErrorHandler_->hasHandledFatalError()) {
jsErrorHandler_->setRuntimeReady();
}

if (hasLogger) {
ReactMarker::logTaggedMarkerBridgeless(
ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
ReactMarker::logMarkerBridgeless(
ReactMarker::INIT_REACT_RUNTIME_STOP);
ReactMarker::logMarkerBridgeless(ReactMarker::APP_STARTUP_STOP);
}
if (auto strongBufferedRuntimeExecuter =
weakBufferedRuntimeExecuter.lock()) {
strongBufferedRuntimeExecuter->flush();
}
});
if (hasLogger) {
ReactMarker::logTaggedMarkerBridgeless(
ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
ReactMarker::logMarkerBridgeless(ReactMarker::INIT_REACT_RUNTIME_STOP);
ReactMarker::logMarkerBridgeless(ReactMarker::APP_STARTUP_STOP);
}
if (auto strongBufferedRuntimeExecuter =
weakBufferedRuntimeExecuter.lock()) {
strongBufferedRuntimeExecuter->flush();
}
if (completion) {
completion(runtime);
}
});
}

/*
Expand Down
28 changes: 2 additions & 26 deletions vnext/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.77.0-rc.0",
"baseVersion": "0.77.0-rc.4",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -190,7 +190,7 @@
"type": "patch",
"file": "ReactCommon/TEMP_UntilReactCommonUpdate/react/runtime/ReactInstance.cpp",
"baseFile": "packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp",
"baseHash": "240a49c5f5bd67f35e79dcbe9a9c6e7f6e6e2a32",
"baseHash": "9bfade3d6a2e2df231bae88267cf1d9e59451533",
"issue": 13172
},
{
Expand Down Expand Up @@ -258,24 +258,6 @@
"baseFile": "packages/react-native/Libraries/Alert/Alert.js",
"baseHash": "173b99e6ae120f14176cf3425877728787d3feed"
},
{
"type": "derived",
"file": "src-win/Libraries/Animated/NativeAnimatedAllowlist.windows.js",
"baseFile": "packages/react-native/Libraries/Animated/NativeAnimatedAllowlist.js",
"baseHash": "337dfc9001bc8967ca8c5da7f09ddde463d29b54"
},
{
"type": "derived",
"file": "src-win/Libraries/Animated/nodes/AnimatedProps.windows.js",
"baseFile": "packages/react-native/Libraries/Animated/nodes/AnimatedProps.js",
"baseHash": "9157901b6382c2a936010d0d34ec4f33a8baf70b"
},
{
"type": "derived",
"file": "src-win/Libraries/Animated/nodes/AnimatedStyle.windows.js",
"baseFile": "packages/react-native/Libraries/Animated/nodes/AnimatedStyle.js",
"baseHash": "477711c8194a5ea843ec907c2d97fbed83b94028"
},
{
"type": "platform",
"file": "src-win/Libraries/AppTheme/AppTheme.js"
Expand Down Expand Up @@ -630,12 +612,6 @@
"baseFile": "packages/react-native/Libraries/Utilities/Platform.android.js",
"baseHash": "33f07d6fddb5290d05c8d4cc490312e3af88c70b"
},
{
"type": "derived",
"file": "src-win/src/private/animated/useAnimatedPropsMemo.windows.js",
"baseFile": "packages/react-native/src/private/animated/useAnimatedPropsMemo.js",
"baseHash": "b1c052ae3653d5771b75aa96afc49cddd794f1bd"
},
{
"type": "copy",
"file": "src-win/src/private/debugging/ReactDevToolsSettingsManager.windows.js",
Expand Down
Loading
Loading