Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
diff --git a/build/src/start/platforms/android/AndroidAppIdResolver.js b/build/src/start/platforms/android/AndroidAppIdResolver.js
index f4b217c5d71fb62179160cdbf8e02276abd06a6d..74d58fee13c7dbb5144b6c77d6e12917dc62958d 100644
index eedb068830f3d5869bfc594671c254f48cd9ab8a..38b728b747bc8974ad8ab0fd38f271c771b0519a 100644
--- a/build/src/start/platforms/android/AndroidAppIdResolver.js
+++ b/build/src/start/platforms/android/AndroidAppIdResolver.js
@@ -31,7 +31,7 @@ class AndroidAppIdResolver extends _appIdResolver.AppIdResolver {
@@ -33,7 +33,7 @@ class AndroidAppIdResolver extends _AppIdResolver.AppIdResolver {
async resolveAppIdFromNativeAsync() {
const applicationIdFromGradle = await _configPlugins().AndroidConfig.Package.getApplicationIdAsync(this.projectRoot).catch(()=>null);
const applicationIdFromGradle = await _configplugins().AndroidConfig.Package.getApplicationIdAsync(this.projectRoot).catch(()=>null);
if (applicationIdFromGradle) {
- return applicationIdFromGradle;
+ return `${applicationIdFromGradle}.development`;
}
try {
var ref, ref1;
var _androidManifest_manifest_$, _androidManifest_manifest;
diff --git a/build/src/start/platforms/ios/AppleAppIdResolver.js b/build/src/start/platforms/ios/AppleAppIdResolver.js
index 06d6d1e11802ed88388444b10acd83834e079f50..c4409c566377897eacdb78aea4a8fd78d5aeca03 100644
index 96cc53df6109e3b62ede2e79bf4093598a24fa5b..9ec60b4477480128f28c5eb1394caf60e65d8072 100644
--- a/build/src/start/platforms/ios/AppleAppIdResolver.js
+++ b/build/src/start/platforms/ios/AppleAppIdResolver.js
@@ -50,7 +50,7 @@ class AppleAppIdResolver extends _appIdResolver.AppIdResolver {
@@ -52,7 +52,7 @@ class AppleAppIdResolver extends _AppIdResolver.AppIdResolver {
async resolveAppIdFromNativeAsync() {
// Check xcode project
try {
- const bundleId = _configPlugins().IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(this.projectRoot);
+ const bundleId = _configPlugins().IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(this.projectRoot, {'buildConfiguration': 'Debug'});
- const bundleId = _configplugins().IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(this.projectRoot);
+ const bundleId = _configplugins().IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(this.projectRoot, {'buildConfiguration': 'Debug'});
if (bundleId) {
return bundleId;
}
19 changes: 19 additions & 0 deletions .yarn/patches/@expo-metro-config-npm-54.0.14-88915da766.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/build/serializer/environmentVariableSerializerPlugin.js b/build/serializer/environmentVariableSerializerPlugin.js
index 3b13e076369a5a94ec3dc7fddb905b01e52d91e8..c42cdebf000b8bd53c5eb45bfbbb2f6492e20b1c 100644
--- a/build/serializer/environmentVariableSerializerPlugin.js
+++ b/build/serializer/environmentVariableSerializerPlugin.js
@@ -17,6 +17,14 @@ function getTransformEnvironment(url) {
function getAllExpoPublicEnvVars(inputEnv = process.env) {
// Create an object containing all environment variables that start with EXPO_PUBLIC_
const env = {};
+
+ if (inputEnv._ENV_VARS_FOR_APP) {
+ const keys = JSON.parse(inputEnv._ENV_VARS_FOR_APP);
+ for (const key of keys) {
+ env[key] = inputEnv[key];
+ }
+ }
+
for (const key in inputEnv) {
if (key.startsWith('EXPO_PUBLIC_')) {
// @ts-expect-error: TS doesn't know that the key starts with EXPO_PUBLIC_
13 changes: 0 additions & 13 deletions .yarn/patches/expo-dev-launcher-npm-4.0.27-c2ab5dd4a5.patch

This file was deleted.

17 changes: 17 additions & 0 deletions .yarn/patches/expo-modules-core-npm-3.0.29-7b93dc0961.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/ios/Core/ExpoBridgeModule.mm b/ios/Core/ExpoBridgeModule.mm
index 2ed1c00f47406e109750cc27ace7e0d88e42c00e..d14269aae847143318888ad3c848d707de95e691 100644
--- a/ios/Core/ExpoBridgeModule.mm
+++ b/ios/Core/ExpoBridgeModule.mm
@@ -45,9 +45,9 @@ - (void)setBridge:(RCTBridge *)bridge
_bridge = bridge;
_appContext.reactBridge = bridge;

-#if !__has_include(<ReactCommon/RCTRuntimeExecutor.h>)
- _appContext._runtime = [EXJavaScriptRuntimeManager runtimeFromBridge:bridge];
-#endif // React Native <0.74
+// #if !__has_include(<ReactCommon/RCTRuntimeExecutor.h>)
+// _appContext._runtime = [EXJavaScriptRuntimeManager runtimeFromBridge:bridge];
+// #endif // React Native <0.74
}

#if __has_include(<ReactCommon/RCTRuntimeExecutor.h>)
126 changes: 0 additions & 126 deletions .yarn/patches/expo-splash-screen-npm-0.27.5-f91e0b41df.patch

This file was deleted.

92 changes: 92 additions & 0 deletions .yarn/patches/react-native-npm-0.81.5-0a0008b930.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
index 9d663610a0546d4f801196217966ad9d184818af..1586d116b9fc4e86a39976de543489c6a23a1154 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
@@ -16868,7 +16868,7 @@ __DEV__ &&
shouldSuspendImpl = newShouldSuspendImpl;
};
var isomorphicReactPackageVersion = React.version;
- if ("19.1.0" !== isomorphicReactPackageVersion)
+ if ("19.1.2" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
index b3d1cfa09d76b50617b9032b15c82351a699638e..c17f99912028e52b9acfb01b9b9560bba8c03c16 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
@@ -10603,7 +10603,7 @@ function updateContainer(element, container, parentComponent, callback) {
return lane;
}
var isomorphicReactPackageVersion = React.version;
-if ("19.1.0" !== isomorphicReactPackageVersion)
+if ("19.1.2" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
index b317ca102b0b7d25c15819c61352019fef05561b..e5c3854d0d6de8c9181d6a50124fdc7e8ddc72ab 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
@@ -11245,7 +11245,7 @@ function updateContainer(element, container, parentComponent, callback) {
return lane;
}
var isomorphicReactPackageVersion = React.version;
-if ("19.1.0" !== isomorphicReactPackageVersion)
+if ("19.1.2" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index 203d0b441342487bfd8765b93044b291029614b2..1f2abc9651d3a4c809be6a03e8d9f7d6f7bd12bc 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -60,7 +60,7 @@ - (void)presentModalHostView:(RCTModalHostView *)modalHostView
modalHostView.onShow(nil);
}
};
- dispatch_async(dispatch_get_main_queue(), ^{
+
if (self->_presentationBlock) {
self->_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
} else {
@@ -68,7 +68,7 @@ - (void)presentModalHostView:(RCTModalHostView *)modalHostView
animated:animated
completion:completionBlock];
}
- });
+
}

- (void)dismissModalHostView:(RCTModalHostView *)modalHostView
@@ -80,7 +80,7 @@ - (void)dismissModalHostView:(RCTModalHostView *)modalHostView
[[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
}
};
- dispatch_async(dispatch_get_main_queue(), ^{
+
if (self->_dismissalBlock) {
self->_dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
} else if (viewController.presentingViewController) {
@@ -91,7 +91,7 @@ - (void)dismissModalHostView:(RCTModalHostView *)modalHostView
// This, somehow, invalidate the presenting view controller and the modal remains always visible.
completionBlock();
}
- });
+
}

- (RCTShadowView *)shadowView
diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec
index 326c6fa9089cf794c2dcf37084085bf3bef3f6a5..4aa7b70780af967ff607aada3419959a8be49670 100644
--- a/sdks/hermes-engine/hermes-engine.podspec
+++ b/sdks/hermes-engine/hermes-engine.podspec
@@ -77,7 +77,7 @@ Pod::Spec.new do |spec|
. "$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh"

CONFIG="Release"
- if echo $GCC_PREPROCESSOR_DEFINITIONS | grep -q "DEBUG=1"; then
+ if echo $GCC_PREPROCESSOR_DEFINITIONS | grep -q "HERMES_ENABLE_DEBUGGER=1"; then
CONFIG="Debug"
fi

26 changes: 0 additions & 26 deletions .yarn/patches/react-native-npm-0.81.5-d8232ef145.patch

This file was deleted.

8 changes: 4 additions & 4 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"lz-string": "^1.5.0",
"prettier": "^3.6.2",
"prism-react-renderer": "^2.4.1",
"react": "~19.1.2",
"react": "19.1.2",
"react-colorful": "^5.6.1",
"react-dom": "~19.1.2",
"react-dom": "19.1.2",
"react-live": "^4.1.8",
"three": "0.177.0"
},
Expand All @@ -71,8 +71,8 @@
"@linaria/core": "^3.0.0-beta.22",
"@linaria/webpack-loader": "^3.0.0-beta.22",
"@types/lz-string": "^1.5.0",
"@types/react": "~19.1.2",
"@types/react-dom": "~19.1.2",
"@types/react": "19.1.2",
"@types/react-dom": "19.1.2",
"@types/three": "0.177.0",
"babel-loader": "^10.0.0",
"css-loader": "^7.1.2",
Expand Down
Loading
Loading