expo-updates 0.10.8 → 0.10.12

package/CHANGELOG.md

@@ -10,11 +10,32 @@
 
 ### 💡 Others
 
+## 0.10.12 — 2021-11-04
+
+### 🐛 Bug fixes
+
+- Workaround for bridge being initialized twice on startup. ([#15019](https://github.com/expo/expo/pull/15019) by [@kudo](https://github.com/kudo))
+
+## 0.10.11 — 2021-11-02
+
+### 🐛 Bug fixes
+
+- Fix handling of unexpectedly missing assets on iOS. ([#15008](https://github.com/expo/expo/pull/15008) by [@esamelson](https://github.com/esamelson))
+
+## 0.10.10 — 2021-11-02
+
+_This version does not introduce any user-facing changes._
+
+## 0.10.9 — 2021-10-29
+
+_This version does not introduce any user-facing changes._
+
 ## 0.10.8 — 2021-10-29
 
 ### 🐛 Bug fixes
 
 - Fix Android app.manifest not generated from [#14938](https://github.com/expo/expo/pull/14938) regression. ([#14953](https://github.com/expo/expo/pull/14953) by [@kudo](https://github.com/kudo))
+- Fix iOS app.manifest generation error in `eas build --local` mode. ([#14956](https://github.com/expo/expo/pull/14956) by [@kudo](https://github.com/kudo))
 
 ## 0.10.7 — 2021-10-29
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.10.8'
+version = '0.10.12'
 
 apply from: "../scripts/create-manifest-android.gradle"
 
@@ -59,7 +59,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 31
-    versionName '0.10.8'
+    versionName '0.10.12'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     // uncomment below to export the database schema when making changes

package/ios/EXUpdates/AppLauncher/EXUpdatesAppLauncherNoDatabase.m

@@ -3,6 +3,7 @@
 #import <EXUpdates/EXUpdatesAsset.h>
 #import <EXUpdates/EXUpdatesAppLauncherNoDatabase.h>
 #import <EXUpdates/EXUpdatesEmbeddedAppLoader.h>
+#import <EXUpdates/EXUpdatesUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -30,7 +31,7 @@ static NSString * const EXUpdatesErrorLogFile = @"expo-error.log";
 
       NSMutableDictionary *assetFilesMap = [NSMutableDictionary new];
       for (EXUpdatesAsset *asset in _launchedUpdate.assets) {
-        NSURL *localUrl = [[NSBundle mainBundle] URLForResource:asset.mainBundleFilename withExtension:asset.type];
+        NSURL *localUrl = [EXUpdatesUtils urlForBundledAsset:asset];
         if (localUrl && asset.key) {
           assetFilesMap[asset.key] = localUrl.absoluteString;
         }

package/ios/EXUpdates/AppLauncher/EXUpdatesAppLauncherWithDatabase.m

@@ -261,7 +261,13 @@ static NSString * const EXUpdatesAppLauncherErrorDomain = @"AppLauncher";
 
     if (matchingAsset && matchingAsset.mainBundleFilename) {
       dispatch_async([EXUpdatesFileDownloader assetFilesQueue], ^{
-        NSString *bundlePath = [[NSBundle mainBundle] pathForResource:matchingAsset.mainBundleFilename ofType:matchingAsset.type];
+        NSString *bundlePath = [EXUpdatesUtils pathForBundledAsset:matchingAsset];
+        if (bundlePath == nil) {
+          dispatch_async(self->_launcherQueue, ^{
+            completion(NO, [NSError errorWithDomain:EXUpdatesAppLauncherErrorDomain code:1013 userInfo:@{NSLocalizedDescriptionKey: @"Asset bundlePath was unexpectedly nil"}]);
+          });
+          return;
+        }
         NSError *error;
         BOOL success = [NSFileManager.defaultManager copyItemAtPath:bundlePath toPath:[assetLocalUrl path] error:&error];
         dispatch_async(self->_launcherQueue, ^{
@@ -271,7 +277,7 @@ static NSString * const EXUpdatesAppLauncherErrorDomain = @"AppLauncher";
       return;
     }
   }
-  
+
   completion(NO, nil);
 }
 

package/ios/EXUpdates/AppLoader/EXUpdatesEmbeddedAppLoader.m

@@ -2,6 +2,7 @@
 
 #import <EXUpdates/EXUpdatesFileDownloader.h>
 #import <EXUpdates/EXUpdatesEmbeddedAppLoader.h>
+#import <EXUpdates/EXUpdatesUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -101,9 +102,7 @@ static NSString * const EXUpdatesEmbeddedAppLoaderErrorDomain = @"EXUpdatesEmbed
       });
     } else {
       NSAssert(asset.mainBundleFilename, @"embedded asset mainBundleFilename must be nonnull");
-      NSString *bundlePath = asset.mainBundleDir
-        ? [[NSBundle mainBundle] pathForResource:asset.mainBundleFilename ofType:asset.type inDirectory:asset.mainBundleDir]
-        : [[NSBundle mainBundle] pathForResource:asset.mainBundleFilename ofType:asset.type];
+      NSString *bundlePath = [EXUpdatesUtils pathForBundledAsset:asset];
       NSAssert(bundlePath, @"NSBundle must contain the expected assets");
 
       if (!bundlePath) {

package/ios/EXUpdates/EXUpdatesAppDelegate.m

@@ -53,9 +53,14 @@ EX_REGISTER_SINGLETON_MODULE(EXUpdatesAppDelegate)
     // we just skip in this case.
     return NO;
   }
+  UIWindow *window = application.delegate.window;
+  if ([window.rootViewController.view isKindOfClass:[RCTRootView class]]) {
+    RCTRootView *rootView = (RCTRootView *)window.rootViewController.view;
+    [rootView.bridge invalidate];
+  }
   self.launchOptions = launchOptions;
   controller.delegate = self;
-  [controller startAndShowLaunchScreen:application.delegate.window];
+  [controller startAndShowLaunchScreen:window];
   return YES;
 }
 

package/ios/EXUpdates/EXUpdatesUtils.h

@@ -2,6 +2,7 @@
 
 #import <React/RCTBridge.h>
 
+#import <EXUpdates/EXUpdatesAsset.h>
 #import <EXUpdates/EXUpdatesConfig.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -14,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)sendEventToBridge:(nullable RCTBridge *)bridge withType:(NSString *)eventType body:(NSDictionary *)body;
 + (BOOL)shouldCheckForUpdateWithConfig:(EXUpdatesConfig *)config;
 + (NSString *)getRuntimeVersionWithConfig:(EXUpdatesConfig *)config;
++ (NSURL *)urlForBundledAsset:(EXUpdatesAsset *)asset;
++ (NSString *)pathForBundledAsset:(EXUpdatesAsset *)asset;
 
 @end
 

package/ios/EXUpdates/EXUpdatesUtils.m

@@ -104,6 +104,20 @@ static NSString * const EXUpdatesUtilsErrorDomain = @"EXUpdatesUtils";
   return config.runtimeVersion ?: config.sdkVersion ?: @"1";
 }
 
++ (NSURL *)urlForBundledAsset:(EXUpdatesAsset *)asset
+{
+  return asset.mainBundleDir
+    ? [[NSBundle mainBundle] URLForResource:asset.mainBundleFilename withExtension:asset.type subdirectory:asset.mainBundleDir]
+    : [[NSBundle mainBundle] URLForResource:asset.mainBundleFilename withExtension:asset.type];
+}
+
++ (NSString *)pathForBundledAsset:(EXUpdatesAsset *)asset
+{
+  return asset.mainBundleDir
+    ? [[NSBundle mainBundle] pathForResource:asset.mainBundleFilename ofType:asset.type inDirectory:asset.mainBundleDir]
+    : [[NSBundle mainBundle] pathForResource:asset.mainBundleFilename ofType:asset.type];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.10.8",
+  "version": "0.10.12",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -50,5 +50,5 @@
     "fs-extra": "^9.1.0",
     "memfs": "^3.2.0"
   },
-  "gitHead": "942691fee632748af6811280fa543e93a3cb8a92"
+  "gitHead": "41c62d399d0eb8588b8d55919697fdb6760c3eac"
 }

package/scripts/create-manifest-ios.sh

@@ -37,11 +37,13 @@ if [ "x$PROJECT_DIR_BASENAME" != "xPods" ]; then
 fi
 
 # ref: https://github.com/facebook/react-native/blob/c974cbff04a8d90ac0f856dbada3fc5a75c75b49/scripts/react-native-xcode.sh#L59-L65
-EXPO_UPDATES_PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+EXPO_UPDATES_PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
 # If PROJECT_ROOT is not specified, fallback to use Xcode PROJECT_DIR
 PROJECT_ROOT=${PROJECT_ROOT:-"$PROJECT_DIR/../.."}
 PROJECT_ROOT=${PROJECT_ROOT:-"$EXPO_UPDATES_PACKAGE_DIR/../.."}
 
 cd "$PROJECT_ROOT" || exit
+# We should get the physical path (/var/folders -> /private/var/folders) for metro to resolve correct files
+PROJECT_ROOT="$(pwd -P)"
 
 "$NODE_BINARY" "${EXPO_UPDATES_PACKAGE_DIR}/scripts/createManifest.js" ios "$PROJECT_ROOT" "$DEST/$RESOURCE_BUNDLE_NAME"