Skip to content

Commit ff65417

Browse files
rickhanloniirickhanlonii
committed
Fix xplat sync to ignore @generated header (#29738)
Use some clever git diffing to ignore lines that only change the `@generated` header. We can't do this for the version string because the version string can be embedded in lines with other changes, but this header is always on one line. DiffTrain build for commit 8c3697a.
1 parent d65bbb1 commit ff65417

File tree

14 files changed

+36
-36
lines changed

14 files changed

+36
-36
lines changed

‎compiled-rn/VERSION_NATIVE_FB‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.0.0-native-fb-4dcdf21325-20240603
1+
19.0.0-native-fb-8c3697a849-20240603

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<62c8680cf31ef07b7ed3df40fe102c9d>>
10+
* @generated SignedSource<<541692cf1bc59cd64caffff194a452bf>>
1111
*/
1212

1313
'use strict';
@@ -23580,7 +23580,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
2358023580
return root;
2358123581
}
2358223582

23583-
var ReactVersion = '19.0.0-rc-4dcdf21325-20240603';
23583+
var ReactVersion = '19.0.0-native-fb-8c3697a849-20240603';
2358423584

2358523585
/*
2358623586
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-prod.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<e6b59fba9be6108cbc75d7081b610de8>>
10+
* @generated SignedSource<<7c1c48b982f399ca3d477a5db6b7cce5>>
1111
*/
1212

1313
"use strict";
@@ -9336,7 +9336,7 @@ var devToolsConfig$jscomp$inline_1048 = {
93369336
throw Error("TestRenderer does not support findFiberByHostInstance()");
93379337
},
93389338
bundleType: 0,
9339-
version: "19.0.0-rc-4dcdf21325-20240603",
9339+
version: "19.0.0-native-fb-8c3697a849-20240603",
93409340
rendererPackageName: "react-test-renderer"
93419341
};
93429342
var internals$jscomp$inline_1235 = {
@@ -9367,7 +9367,7 @@ var internals$jscomp$inline_1235 = {
93679367
scheduleRoot: null,
93689368
setRefreshHandler: null,
93699369
getCurrentFiber: null,
9370-
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
9370+
reconcilerVersion: "19.0.0-native-fb-8c3697a849-20240603"
93719371
};
93729372
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
93739373
var hook$jscomp$inline_1236 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-profiling.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<daf03fcd6f4e293c4ab45089c1f4028f>>
10+
* @generated SignedSource<<04f22af19b5d69329964e1ad0c4ba6ad>>
1111
*/
1212

1313
"use strict";
@@ -9958,7 +9958,7 @@ var devToolsConfig$jscomp$inline_1131 = {
99589958
throw Error("TestRenderer does not support findFiberByHostInstance()");
99599959
},
99609960
bundleType: 0,
9961-
version: "19.0.0-rc-4dcdf21325-20240603",
9961+
version: "19.0.0-native-fb-8c3697a849-20240603",
99629962
rendererPackageName: "react-test-renderer"
99639963
};
99649964
(function (internals) {
@@ -10002,7 +10002,7 @@ var devToolsConfig$jscomp$inline_1131 = {
1000210002
scheduleRoot: null,
1000310003
setRefreshHandler: null,
1000410004
getCurrentFiber: null,
10005-
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
10005+
reconcilerVersion: "19.0.0-native-fb-8c3697a849-20240603"
1000610006
});
1000710007
exports._Scheduler = Scheduler;
1000810008
exports.act = act;

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<80e5654d5bcee490f8b82858a39deb72>>
10+
* @generated SignedSource<<351f164504cedf0a07224cfafbff8eb7>>
1111
*/
1212

1313
'use strict';
@@ -24,7 +24,7 @@ if (
2424
}
2525
var dynamicFlagsUntyped = require('ReactNativeInternalFeatureFlags');
2626

27-
var ReactVersion = '19.0.0-rc-4dcdf21325-20240603';
27+
var ReactVersion = '19.0.0-native-fb-8c3697a849-20240603';
2828

2929
// Re-export dynamic flags from the internal module.
3030
var dynamicFlags = dynamicFlagsUntyped; // We destructure each value before re-exporting to avoid a dynamic look-up on

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-prod.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<5be66c43f7ee14c4db368994ff23c746>>
10+
* @generated SignedSource<<c45f6c08e7e3b99ca471c275712c8016>>
1111
*/
1212

1313
"use strict";
@@ -604,4 +604,4 @@ exports.useSyncExternalStore = function (
604604
exports.useTransition = function () {
605605
return ReactSharedInternals.H.useTransition();
606606
};
607-
exports.version = "19.0.0-rc-4dcdf21325-20240603";
607+
exports.version = "19.0.0-native-fb-8c3697a849-20240603";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-profiling.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<d558055b1bf1cb23ea1cbbe1161d6b20>>
10+
* @generated SignedSource<<e069b0fa181e72e1c07c0c08349c96b4>>
1111
*/
1212

1313
"use strict";
@@ -608,7 +608,7 @@ exports.useSyncExternalStore = function (
608608
exports.useTransition = function () {
609609
return ReactSharedInternals.H.useTransition();
610610
};
611-
exports.version = "19.0.0-rc-4dcdf21325-20240603";
611+
exports.version = "19.0.0-native-fb-8c3697a849-20240603";
612612
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
613613
"function" ===
614614
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4dcdf21325028d7ae9bb3c2172dbbe9647a744ac
1+
8c3697a849b7e9ceeb47642ba61c270b7e6dd176

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<6a66b8c413b6165609d63823eefc4896>>
10+
* @generated SignedSource<<fd6fef0cda92bfcc5ea1200d09158ef5>>
1111
*/
1212

1313
'use strict';
@@ -26315,7 +26315,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
2631526315
return root;
2631626316
}
2631726317

26318-
var ReactVersion = '19.0.0-rc-4dcdf21325-20240603';
26318+
var ReactVersion = '19.0.0-rc-8c3697a849-20240603';
2631926319

2632026320
/*
2632126321
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<6781ca8ee23bc89f6eb4711796427e5e>>
10+
* @generated SignedSource<<131003d9241223842aaf41612ed74b03>>
1111
*/
1212

1313
"use strict";
@@ -10589,7 +10589,7 @@ var roots = new Map(),
1058910589
devToolsConfig$jscomp$inline_1125 = {
1059010590
findFiberByHostInstance: getInstanceFromNode,
1059110591
bundleType: 0,
10592-
version: "19.0.0-rc-4dcdf21325-20240603",
10592+
version: "19.0.0-rc-8c3697a849-20240603",
1059310593
rendererPackageName: "react-native-renderer",
1059410594
rendererConfig: {
1059510595
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -10632,7 +10632,7 @@ var internals$jscomp$inline_1351 = {
1063210632
scheduleRoot: null,
1063310633
setRefreshHandler: null,
1063410634
getCurrentFiber: null,
10635-
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
10635+
reconcilerVersion: "19.0.0-rc-8c3697a849-20240603"
1063610636
};
1063710637
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1063810638
var hook$jscomp$inline_1352 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

0 commit comments

Comments
 (0)