Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix xplat sync to ignore @generated header (#29738)

Browse Source 
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 https://github.com/facebook/react/commit/8c3697a849b7e9ceeb47642ba61c270b7e6dd176.
This commit is contained in:
rickhanlonii
2024-06-03 20:45:29 +00:00
parent d65bbb1c43
commit ff65417809
14 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiled-rn/VERSION_NATIVE_FB
+1 -1
View File
@@ -1 +1 @@
19.0.0-native-fb-4dcdf21325-20240603
19.0.0-native-fb-8c3697a849-20240603
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-dev.js
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<62c8680cf31ef07b7ed3df40fe102c9d>>
* @generated SignedSource<<541692cf1bc59cd64caffff194a452bf>>
*/
'use strict';
@@ -23580,7 +23580,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
return root;
}
var ReactVersion = '19.0.0-rc-4dcdf21325-20240603';
var ReactVersion = '19.0.0-native-fb-8c3697a849-20240603';
/*
* 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
Vendored
+3 -3
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<e6b59fba9be6108cbc75d7081b610de8>>
* @generated SignedSource<<7c1c48b982f399ca3d477a5db6b7cce5>>
*/
"use strict";
@@ -9336,7 +9336,7 @@ var devToolsConfig$jscomp$inline_1048 = {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "19.0.0-rc-4dcdf21325-20240603",
version: "19.0.0-native-fb-8c3697a849-20240603",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1235 = {
@@ -9367,7 +9367,7 @@ var internals$jscomp$inline_1235 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
reconcilerVersion: "19.0.0-native-fb-8c3697a849-20240603"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
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
Vendored
+3 -3
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<daf03fcd6f4e293c4ab45089c1f4028f>>
* @generated SignedSource<<04f22af19b5d69329964e1ad0c4ba6ad>>
*/
"use strict";
@@ -9958,7 +9958,7 @@ var devToolsConfig$jscomp$inline_1131 = {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "19.0.0-rc-4dcdf21325-20240603",
version: "19.0.0-native-fb-8c3697a849-20240603",
rendererPackageName: "react-test-renderer"
};
(function (internals) {
@@ -10002,7 +10002,7 @@ var devToolsConfig$jscomp$inline_1131 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
reconcilerVersion: "19.0.0-native-fb-8c3697a849-20240603"
});
exports._Scheduler = Scheduler;
exports.act = act;
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-dev.js
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<80e5654d5bcee490f8b82858a39deb72>>
* @generated SignedSource<<351f164504cedf0a07224cfafbff8eb7>>
*/
'use strict';
@@ -24,7 +24,7 @@ if (
}
var dynamicFlagsUntyped = require('ReactNativeInternalFeatureFlags');
var ReactVersion = '19.0.0-rc-4dcdf21325-20240603';
var ReactVersion = '19.0.0-native-fb-8c3697a849-20240603';
// Re-export dynamic flags from the internal module.
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
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<5be66c43f7ee14c4db368994ff23c746>>
* @generated SignedSource<<c45f6c08e7e3b99ca471c275712c8016>>
*/
"use strict";
@@ -604,4 +604,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-rc-4dcdf21325-20240603";
exports.version = "19.0.0-native-fb-8c3697a849-20240603";
compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-profiling.js
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<d558055b1bf1cb23ea1cbbe1161d6b20>>
* @generated SignedSource<<e069b0fa181e72e1c07c0c08349c96b4>>
*/
"use strict";
@@ -608,7 +608,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-rc-4dcdf21325-20240603";
exports.version = "19.0.0-native-fb-8c3697a849-20240603";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION
+1 -1
View File
@@ -1 +1 @@
4dcdf21325028d7ae9bb3c2172dbbe9647a744ac
8c3697a849b7e9ceeb47642ba61c270b7e6dd176
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
+2 -2
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<6a66b8c413b6165609d63823eefc4896>>
* @generated SignedSource<<fd6fef0cda92bfcc5ea1200d09158ef5>>
*/
'use strict';
@@ -26315,7 +26315,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
return root;
}
var ReactVersion = '19.0.0-rc-4dcdf21325-20240603';
var ReactVersion = '19.0.0-rc-8c3697a849-20240603';
/*
* 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
+3 -3
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<6781ca8ee23bc89f6eb4711796427e5e>>
* @generated SignedSource<<131003d9241223842aaf41612ed74b03>>
*/
"use strict";
@@ -10589,7 +10589,7 @@ var roots = new Map(),
devToolsConfig$jscomp$inline_1125 = {
findFiberByHostInstance: getInstanceFromNode,
bundleType: 0,
version: "19.0.0-rc-4dcdf21325-20240603",
version: "19.0.0-rc-8c3697a849-20240603",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -10632,7 +10632,7 @@ var internals$jscomp$inline_1351 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
reconcilerVersion: "19.0.0-rc-8c3697a849-20240603"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1352 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
+3 -3
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<c81b0721ccc711222273f3e978c9b2ae>>
* @generated SignedSource<<b49f8f045f925ddf3e26fb3679b00009>>
*/
"use strict";
@@ -11295,7 +11295,7 @@ var roots = new Map(),
devToolsConfig$jscomp$inline_1206 = {
findFiberByHostInstance: getInstanceFromNode,
bundleType: 0,
version: "19.0.0-rc-4dcdf21325-20240603",
version: "19.0.0-rc-8c3697a849-20240603",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -11351,7 +11351,7 @@ var roots = new Map(),
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
reconcilerVersion: "19.0.0-rc-8c3697a849-20240603"
});
exports.createPortal = function (children, containerTag) {
return createPortal$1(
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
+2 -2
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<ca38199eed8055f6da4f69faeec1eb7e>>
* @generated SignedSource<<f3f9e666515054a01290ebfd32ddd598>>
*/
'use strict';
@@ -26671,7 +26671,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
return root;
}
var ReactVersion = '19.0.0-rc-4dcdf21325-20240603';
var ReactVersion = '19.0.0-rc-8c3697a849-20240603';
/*
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
+5 -5
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<dd1a318972389581f9a7719415f6fd57>>
* @generated SignedSource<<8304ec69da52da1f302f15279fc3a1af>>
*/
"use strict";
@@ -10734,11 +10734,11 @@ function traverseOwnerTreeUp(hierarchy, instance) {
traverseOwnerTreeUp(hierarchy, instance);
}
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-rc-4dcdf21325-20240603" !== isomorphicReactPackageVersion)
if ("19.0.0-rc-8c3697a849-20240603" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-native-renderer: 19.0.0-rc-4dcdf21325-20240603\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-native-renderer: 19.0.0-rc-8c3697a849-20240603\nLearn more: https://react.dev/warnings/version-mismatch")
);
if (
"function" !==
@@ -10788,7 +10788,7 @@ var roots = new Map(),
devToolsConfig$jscomp$inline_1193 = {
findFiberByHostInstance: getInstanceFromTag,
bundleType: 0,
version: "19.0.0-rc-4dcdf21325-20240603",
version: "19.0.0-rc-8c3697a849-20240603",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -10831,7 +10831,7 @@ var internals$jscomp$inline_1440 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
reconcilerVersion: "19.0.0-rc-8c3697a849-20240603"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1441 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
+5 -5
View File
@@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<79d63d232af9d2b0eeb05167dc0ca08e>>
* @generated SignedSource<<09b3e9c6c39d43beb65be5fbd1963ee5>>
*/
"use strict";
@@ -11441,11 +11441,11 @@ function traverseOwnerTreeUp(hierarchy, instance) {
traverseOwnerTreeUp(hierarchy, instance);
}
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-rc-4dcdf21325-20240603" !== isomorphicReactPackageVersion)
if ("19.0.0-rc-8c3697a849-20240603" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-native-renderer: 19.0.0-rc-4dcdf21325-20240603\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-native-renderer: 19.0.0-rc-8c3697a849-20240603\nLearn more: https://react.dev/warnings/version-mismatch")
);
if (
"function" !==
@@ -11495,7 +11495,7 @@ var roots = new Map(),
devToolsConfig$jscomp$inline_1274 = {
findFiberByHostInstance: getInstanceFromTag,
bundleType: 0,
version: "19.0.0-rc-4dcdf21325-20240603",
version: "19.0.0-rc-8c3697a849-20240603",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -11551,7 +11551,7 @@ var roots = new Map(),
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-rc-4dcdf21325-20240603"
reconcilerVersion: "19.0.0-rc-8c3697a849-20240603"
});
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
computeComponentStackForErrorReporting: function (reactTag) {