expo-updates 0.10.10 → 0.10.11

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 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._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.10.10'
+version = '0.10.11'
 
 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.10'
+    versionName '0.10.11'
     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

@@ -260,12 +260,14 @@ static NSString * const EXUpdatesAppLauncherErrorDomain = @"AppLauncher";
     }
 
     if (matchingAsset && matchingAsset.mainBundleFilename) {
-      NSString *bundlePath = [[NSBundle mainBundle] pathForResource:matchingAsset.mainBundleFilename ofType:matchingAsset.type];
-      if (bundlePath == nil) {
-        completion(NO, nil);
-        return;
-      }
       dispatch_async([EXUpdatesFileDownloader assetFilesQueue], ^{
+        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, ^{
@@ -275,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/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.10",
+  "version": "0.10.11",
   "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": "712122d3d4079e4d419d3a5fedf39cc011051ab6"
+  "gitHead": "0803ed01bfe56c3911db024457bcbcec79899706"
 }