expo-dev-launcher 0.9.0 → 0.9.1

package/CHANGELOG.md

@@ -10,6 +10,15 @@
 
 ### 💡 Others
 
+## 0.9.1 — 2021-12-15
+
+### 🐛 Bug fixes
+
+- Fix plugin when `MainActivity.onNewIntent` exists. ([#15459](https://github.com/expo/expo/pull/15459) by [@janicduplessis](https://github.com/janicduplessis))
+- Fix plugin when `expo-updates` is not present. ([#15541](https://github.com/expo/expo/pull/15541) by [@esamelson](https://github.com/esamelson))
+- Include expo-platform header in manifest requests. ([#15563](https://github.com/expo/expo/pull/15563) by [@esamelson](https://github.com/esamelson))
+- Fix plugin compatibility with SDK 44. ([#15562](https://github.com/expo/expo/pull/15562) & [#15570](https://github.com/expo/expo/pull/15570) by [@lukmccall](https://github.com/lukmccall) & [@esamelson](https://github.com/esamelson))
+
 ## 0.9.0 — 2021-12-03
 
 ### 🎉 New features
@@ -20,7 +29,6 @@
 
 - Fix `No native splash screen registered for given view controller` error happening when project is using both `expo-dev-client` and `expo-splash-screen` packages. ([#14745](https://github.com/expo/expo/pull/14745) by [@kudo](https://github.com/kudo))
 - Fix cannot load url that starts with exp. (by [@lukmccall](https://github.com/lukmccall))
-- [plugin] Fix config plugin compatibility with expo-screen-orientation. ([#14752](https://github.com/expo/expo/pull/14752) by [@esamelson](https://github.com/esamelson))
 
 ## 0.8.4 — 2021-10-21
 

package/android/build.gradle

@@ -25,7 +25,7 @@ android {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet('targetSdkVersion', 30)
     versionCode 9
-    versionName "0.9.0"
+    versionName "0.9.1"
   }
 
   lintOptions {

package/android/src/main/java/expo/modules/devlauncher/helpers/DevLauncherOkHttpExtension.kt

@@ -4,6 +4,7 @@ import android.net.Uri
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.Call
 import okhttp3.Callback
+import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -31,5 +32,5 @@ suspend inline fun Request.await(okHttpClient: OkHttpClient): Response {
   }
 }
 
-fun fetch(url: Uri, method: String) =
-  Request.Builder().method(method, null).url(url.toString()).build()
+fun fetch(url: Uri, method: String, headers: Headers) =
+  Request.Builder().method(method, null).url(url.toString()).headers(headers).build()

package/android/src/main/java/expo/modules/devlauncher/launcher/manifest/DevLauncherManifestParser.kt

@@ -4,6 +4,7 @@ import android.net.Uri
 import expo.modules.devlauncher.helpers.await
 import expo.modules.devlauncher.helpers.fetch
 import expo.modules.manifests.core.Manifest
+import okhttp3.Headers
 import okhttp3.OkHttpClient
 import org.json.JSONObject
 import java.io.Reader
@@ -13,7 +14,7 @@ class DevLauncherManifestParser(
   private val url: Uri
 ) {
   suspend fun isManifestUrl(): Boolean {
-    val response = fetch(url, "HEAD").await(httpClient)
+    val response = fetch(url, "HEAD", getHeaders()).await(httpClient)
     val contentType = response.header("Content-Type")
     // published projects may respond unsuccessfully to HEAD requests sent with no headers
     return !response.isSuccessful
@@ -22,7 +23,7 @@ class DevLauncherManifestParser(
   }
 
   private suspend fun downloadManifest(): Reader {
-    val response = fetch(url, "GET").await(httpClient)
+    val response = fetch(url, "GET", getHeaders()).await(httpClient)
     if (!response.isSuccessful) {
       throw Exception("Failed to open app.\n\nIf you are trying to load the app from a development server, check your network connectivity and make sure you can access the server from your device.\n\nIf you are trying to open a published project, install a compatible version of expo-updates and follow all setup and integration steps.")
     }
@@ -35,4 +36,8 @@ class DevLauncherManifestParser(
       return Manifest.fromManifestJson(JSONObject(it.readText()))
     }
   }
+
+  private fun getHeaders(): Headers {
+    return Headers.of(mapOf("expo-platform" to "android"))
+  }
 }

package/ios/Manifest/EXDevLauncherManifestParser.m

@@ -91,6 +91,7 @@ typedef void (^CompletionHandler)(NSData *data, NSURLResponse *response);
 {
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:self.url];
   [request setHTTPMethod:method];
+  [request setValue:@"ios" forHTTPHeaderField:@"expo-platform"];
   NSURLSessionDataTask *dataTask = [self.session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
     if (error) {
       onError(error);

package/ios/Tests/EXDevLauncherManifestParserTests.m

@@ -117,6 +117,29 @@
   [self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
+- (void)testIsManifestURL_RequestIncludesPlatformHeader
+{
+  [HTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
+    return [request.URL.host isEqualToString:@"ohhttpstubs"] && [request.URL.path isEqualToString:@"/platform"];
+  } withStubResponse:^HTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
+    XCTAssertEqualObjects(@"ios", request.allHTTPHeaderFields[@"expo-platform"]);
+    return [HTTPStubsResponse responseWithData:[NSData new] statusCode:200 headers:nil];
+  }];
+
+  EXDevLauncherManifestParser *parser = [[EXDevLauncherManifestParser alloc] initWithURL:[NSURL URLWithString:@"http://ohhttpstubs/platform"] session:NSURLSession.sharedSession];
+
+  XCTestExpectation *expectation = [self expectationWithDescription:@"request should include expo-platform header"];
+
+  [parser isManifestURLWithCompletion:^(BOOL isManifestURL) {
+    [expectation fulfill];
+  } onError:^(NSError * _Nonnull error) {
+    XCTFail(@"Response should have been successful");
+    [expectation fulfill];
+  }];
+
+  [self waitForExpectationsWithTimeout:5 handler:nil];
+}
+
 - (void)testParseManifest
 {
   [HTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {

package/ios/assets/__node_modules/css-select/node_modules/dom-serializer/foreignNames.json

@@ -0,0 +1,102 @@
+{
+  "elementNames" : {
+"altglyph" : "altGlyph",
+"altglyphdef" : "altGlyphDef",
+"altglyphitem" : "altGlyphItem",
+"animatecolor" : "animateColor",
+"animatemotion" : "animateMotion",
+"animatetransform" : "animateTransform",
+"clippath" : "clipPath",
+"feblend" : "feBlend",
+"fecolormatrix" : "feColorMatrix",
+"fecomponenttransfer" : "feComponentTransfer",
+"fecomposite" : "feComposite",
+"feconvolvematrix" : "feConvolveMatrix",
+"fediffuselighting" : "feDiffuseLighting",
+"fedisplacementmap" : "feDisplacementMap",
+"fedistantlight" : "feDistantLight",
+"fedropshadow" : "feDropShadow",
+"feflood" : "feFlood",
+"fefunca" : "feFuncA",
+"fefuncb" : "feFuncB",
+"fefuncg" : "feFuncG",
+"fefuncr" : "feFuncR",
+"fegaussianblur" : "feGaussianBlur",
+"feimage" : "feImage",
+"femerge" : "feMerge",
+"femergenode" : "feMergeNode",
+"femorphology" : "feMorphology",
+"feoffset" : "feOffset",
+"fepointlight" : "fePointLight",
+"fespecularlighting" : "feSpecularLighting",
+"fespotlight" : "feSpotLight",
+"fetile" : "feTile",
+"feturbulence" : "feTurbulence",
+"foreignobject" : "foreignObject",
+"glyphref" : "glyphRef",
+"lineargradient" : "linearGradient",
+"radialgradient" : "radialGradient",
+"textpath" : "textPath"
+  },
+  "attributeNames" : {
+"definitionurl" : "definitionURL",
+"attributename" : "attributeName",
+"attributetype" : "attributeType",
+"basefrequency" : "baseFrequency",
+"baseprofile" : "baseProfile",
+"calcmode" : "calcMode",
+"clippathunits" : "clipPathUnits",
+"diffuseconstant" : "diffuseConstant",
+"edgemode" : "edgeMode",
+"filterunits" : "filterUnits",
+"glyphref" : "glyphRef",
+"gradienttransform" : "gradientTransform",
+"gradientunits" : "gradientUnits",
+"kernelmatrix" : "kernelMatrix",
+"kernelunitlength" : "kernelUnitLength",
+"keypoints" : "keyPoints",
+"keysplines" : "keySplines",
+"keytimes" : "keyTimes",
+"lengthadjust" : "lengthAdjust",
+"limitingconeangle" : "limitingConeAngle",
+"markerheight" : "markerHeight",
+"markerunits" : "markerUnits",
+"markerwidth" : "markerWidth",
+"maskcontentunits" : "maskContentUnits",
+"maskunits" : "maskUnits",
+"numoctaves" : "numOctaves",
+"pathlength" : "pathLength",
+"patterncontentunits" : "patternContentUnits",
+"patterntransform" : "patternTransform",
+"patternunits" : "patternUnits",
+"pointsatx" : "pointsAtX",
+"pointsaty" : "pointsAtY",
+"pointsatz" : "pointsAtZ",
+"preservealpha" : "preserveAlpha",
+"preserveaspectratio" : "preserveAspectRatio",
+"primitiveunits" : "primitiveUnits",
+"refx" : "refX",
+"refy" : "refY",
+"repeatcount" : "repeatCount",
+"repeatdur" : "repeatDur",
+"requiredextensions" : "requiredExtensions",
+"requiredfeatures" : "requiredFeatures",
+"specularconstant" : "specularConstant",
+"specularexponent" : "specularExponent",
+"spreadmethod" : "spreadMethod",
+"startoffset" : "startOffset",
+"stddeviation" : "stdDeviation",
+"stitchtiles" : "stitchTiles",
+"surfacescale" : "surfaceScale",
+"systemlanguage" : "systemLanguage",
+"tablevalues" : "tableValues",
+"targetx" : "targetX",
+"targety" : "targetY",
+"textlength" : "textLength",
+"viewbox" : "viewBox",
+"viewtarget" : "viewTarget",
+"xchannelselector" : "xChannelSelector",
+"ychannelselector" : "yChannelSelector",
+"zoomandpan" : "zoomAndPan"
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -33,10 +33,10 @@
     "semver": "^7.3.5"
   },
   "devDependencies": {
-    "babel-preset-expo": "~8.5.1",
+    "babel-preset-expo": "~9.0.0",
     "expo-module-scripts": "^2.0.0",
     "react": "17.0.1",
     "react-native": "0.64.3"
   },
-  "gitHead": "33c06f161723dc5b6099b9d7eded686bd92c7bbf"
+  "gitHead": "58a32c58b6532ec0e14df10b772fa33f7657fbcc"
 }

package/plugin/build/resolveExpoUpdatesVersion.js

@@ -8,7 +8,14 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const resolve_from_1 = __importDefault(require("resolve-from"));
 function resolveExpoUpdatesVersion(projectRoot) {
-    const expoUpdatesBuildPath = (0, resolve_from_1.default)(projectRoot, 'expo-updates');
+    let expoUpdatesBuildPath;
+    try {
+        expoUpdatesBuildPath = (0, resolve_from_1.default)(projectRoot, 'expo-updates');
+    }
+    catch (e) {
+        // this is expected in projects that don't have expo-updates installed
+        return null;
+    }
     if (!expoUpdatesBuildPath) {
         return null;
     }

package/plugin/build/withDevLauncher.d.ts

@@ -1,3 +1,4 @@
 import { ConfigPlugin } from '@expo/config-plugins';
+export declare function modifyJavaMainActivity(content: string): string;
 declare const _default: ConfigPlugin<unknown>;
 export default _default;

package/plugin/build/withDevLauncher.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.modifyJavaMainActivity = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -14,16 +15,20 @@ const withDevLauncherAppDelegate_1 = require("./withDevLauncherAppDelegate");
 const pkg = require('expo-dev-launcher/package.json');
 const DEV_LAUNCHER_ANDROID_IMPORT = 'expo.modules.devlauncher.DevLauncherController';
 const DEV_LAUNCHER_UPDATES_ANDROID_IMPORT = 'expo.modules.updates.UpdatesDevLauncherController';
-const DEV_LAUNCHER_ON_NEW_INTENT = `
-  @Override
-  public void onNewIntent(Intent intent) {
-      if (DevLauncherController.tryToHandleIntent(this, intent)) {
-         return;
-      }
-      super.onNewIntent(intent);
-  }
-`;
-const DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE = `DevLauncherController.wrapReactActivityDelegate(this, () -> $1);`;
+const DEV_LAUNCHER_ON_NEW_INTENT = [
+    '',
+    '  @Override',
+    '  public void onNewIntent(Intent intent) {',
+    '    super.onNewIntent(intent);',
+    '  }',
+    '',
+].join('\n');
+const DEV_LAUNCHER_HANDLE_INTENT = [
+    '    if (DevLauncherController.tryToHandleIntent(this, intent)) {',
+    '      return;',
+    '    }',
+].join('\n');
+const DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE = (activityDelegateDeclaration) => `DevLauncherController.wrapReactActivityDelegate(this, () -> ${activityDelegateDeclaration})`;
 const DEV_LAUNCHER_ANDROID_INIT = 'DevLauncherController.initialize(this, getReactNativeHost());';
 const DEV_LAUNCHER_UPDATES_ANDROID_INIT = `if (BuildConfig.DEBUG) {
       DevLauncherController.getInstance().setUpdatesInterface(UpdatesDevLauncherController.initialize(this));
@@ -37,6 +42,26 @@ async function readFileAsync(path) {
 async function saveFileAsync(path, content) {
     return fs_1.default.promises.writeFile(path, content, 'utf8');
 }
+function findClosingBracketMatchIndex(str, pos) {
+    if (str[pos] !== '(') {
+        throw new Error("No '(' at index " + pos);
+    }
+    let depth = 1;
+    for (let i = pos + 1; i < str.length; i++) {
+        switch (str[i]) {
+            case '(':
+                depth++;
+                break;
+            case ')':
+                if (--depth === 0) {
+                    return i;
+                }
+                break;
+        }
+    }
+    return -1; // No matching closing parenthesis
+}
+const replaceBetween = (origin, startIndex, endIndex, insertion) => `${origin.substring(0, startIndex)}${insertion}${origin.substring(endIndex)}`;
 function addJavaImports(javaSource, javaImports) {
     const lines = javaSource.split('\n');
     const lineIndexWithPackageDeclaration = lines.findIndex((line) => line.match(/^package .*;$/));
@@ -110,23 +135,38 @@ const withDevLauncherApplication = (config) => {
         },
     ]);
 };
+function modifyJavaMainActivity(content) {
+    content = addJavaImports(content, [DEV_LAUNCHER_ANDROID_IMPORT, 'android.content.Intent']);
+    if (!content.includes('onNewIntent')) {
+        const lines = content.split('\n');
+        const onCreateIndex = lines.findIndex((line) => line.includes('public class MainActivity'));
+        lines.splice(onCreateIndex + 1, 0, DEV_LAUNCHER_ON_NEW_INTENT);
+        content = lines.join('\n');
+    }
+    if (!content.includes(DEV_LAUNCHER_HANDLE_INTENT)) {
+        content = (0, utils_1.addLines)(content, /super\.onNewIntent\(intent\)/, 0, [DEV_LAUNCHER_HANDLE_INTENT]);
+    }
+    if (!content.includes('DevLauncherController.wrapReactActivityDelegate')) {
+        const activityDelegateMatches = Array.from(content.matchAll(/new ReactActivityDelegate(Wrapper)/g));
+        if (activityDelegateMatches.length !== 1) {
+            config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Failed to wrap 'ReactActivityDelegate'
+See the expo-dev-client installation instructions to modify your MainActivity.java manually: ${constants_1.InstallationPage}`);
+            return content;
+        }
+        const activityDelegateMatch = activityDelegateMatches[0];
+        const matchIndex = activityDelegateMatch.index;
+        const openingBracketIndex = matchIndex + activityDelegateMatch[0].length; // next character after `new ReactActivityDelegateWrapper`
+        const closingBracketIndex = findClosingBracketMatchIndex(content, openingBracketIndex);
+        const reactActivityDelegateDeclaration = content.substring(matchIndex, closingBracketIndex + 1);
+        content = replaceBetween(content, matchIndex, closingBracketIndex + 1, DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE(reactActivityDelegateDeclaration));
+    }
+    return content;
+}
+exports.modifyJavaMainActivity = modifyJavaMainActivity;
 const withDevLauncherActivity = (config) => {
     return (0, config_plugins_1.withMainActivity)(config, (config) => {
         if (config.modResults.language === 'java') {
-            let content = addJavaImports(config.modResults.contents, [
-                DEV_LAUNCHER_ANDROID_IMPORT,
-                'android.content.Intent',
-            ]);
-            if (!content.includes(DEV_LAUNCHER_ON_NEW_INTENT)) {
-                const lines = content.split('\n');
-                const onCreateIndex = lines.findIndex((line) => line.includes('public class MainActivity'));
-                lines.splice(onCreateIndex + 1, 0, DEV_LAUNCHER_ON_NEW_INTENT);
-                content = lines.join('\n');
-            }
-            if (!content.includes('DevLauncherController.wrapReactActivityDelegate')) {
-                content = content.replace(/(new ReactActivityDelegate(Wrapper)?(.|\s)*\}\)?);$/mu, DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE);
-            }
-            config.modResults.contents = content;
+            config.modResults.contents = modifyJavaMainActivity(config.modResults.contents);
         }
         else {
             config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java.

package/plugin/build/withDevLauncherAppDelegate.js

@@ -91,6 +91,16 @@ const DEV_LAUNCHER_INIT_TO_REMOVE = new RegExp(escapeRegExpCharacters(`RCTBridge
     rootView.backgroundColor = [UIColor whiteColor];
   }
 
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  UIViewController *rootViewController = `) +
+    `([^;]+)` +
+    escapeRegExpCharacters(`;
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];`), 'm');
+const DEV_LAUNCHER_INIT_TO_REMOVE_SDK_44 = new RegExp(escapeRegExpCharacters(`RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  rootView.backgroundColor = [UIColor whiteColor];
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = `) +
     `([^;]+)` +
@@ -147,6 +157,20 @@ const DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION = (viewContro
   return bridge;
 }
 `;
+const DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_SDK_44 = `
+- (RCTBridge *)initializeReactNativeApp:(NSDictionary *)launchOptions
+{
+  RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  rootView.backgroundColor = [UIColor whiteColor];
+  UIViewController *rootViewController = [self.reactDelegate createRootViewController];
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+
+  return bridge;
+ }
+`;
 function addImports(appDelegate, shouldAddUpdatesIntegration) {
     if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_IOS_IMPORT) &&
         !appDelegate.includes(DEV_LAUNCHER_UPDATES_APP_DELEGATE_IOS_IMPORT)) {
@@ -202,18 +226,29 @@ function modifyLegacyAppDelegate(appDelegate, expoUpdatesVersion = null) {
 exports.modifyLegacyAppDelegate = modifyLegacyAppDelegate;
 function modifyAppDelegate(appDelegate, expoUpdatesVersion = null) {
     const shouldAddUpdatesIntegration = expoUpdatesVersion != null && semver_1.default.gt(expoUpdatesVersion, '0.6.0');
-    if (!DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_REGEX.test(appDelegate)) {
-        if (DEV_LAUNCHER_INIT_TO_REMOVE.test(appDelegate)) {
+    if (!DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_REGEX.test(appDelegate) &&
+        !appDelegate.includes(DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_SDK_44)) {
+        let initToRemove;
+        let shouldAddSDK44Init = false;
+        if (DEV_LAUNCHER_INIT_TO_REMOVE_SDK_44.test(appDelegate)) {
+            initToRemove = DEV_LAUNCHER_INIT_TO_REMOVE_SDK_44;
+            shouldAddSDK44Init = true;
+        }
+        else if (DEV_LAUNCHER_INIT_TO_REMOVE.test(appDelegate)) {
+            initToRemove = DEV_LAUNCHER_INIT_TO_REMOVE;
+        }
+        if (initToRemove) {
             // UIViewController can be initialized differently depending on whether expo-screen-orientation is installed,
             // so we need to preserve whatever is there already.
             let viewControllerInit;
-            appDelegate = appDelegate.replace(DEV_LAUNCHER_INIT_TO_REMOVE, (match, p1) => {
+            appDelegate = appDelegate.replace(initToRemove, (match, p1) => {
                 viewControllerInit = p1;
                 return DEV_LAUNCHER_NEW_INIT;
             });
-            appDelegate = (0, utils_1.addLines)(appDelegate, '@implementation AppDelegate', 1, [
-                DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION(viewControllerInit),
-            ]);
+            const initToAdd = shouldAddSDK44Init
+                ? DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_SDK_44
+                : DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION(viewControllerInit);
+            appDelegate = (0, utils_1.addLines)(appDelegate, '@implementation AppDelegate', 1, [initToAdd]);
         }
         else {
             config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Failed to modify AppDelegate init function. 

package/plugin/src/resolveExpoUpdatesVersion.ts

@@ -3,7 +3,13 @@ import path from 'path';
 import resolveFrom from 'resolve-from';
 
 export function resolveExpoUpdatesVersion(projectRoot: string): string | null {
-  const expoUpdatesBuildPath = resolveFrom(projectRoot, 'expo-updates');
+  let expoUpdatesBuildPath;
+  try {
+    expoUpdatesBuildPath = resolveFrom(projectRoot, 'expo-updates');
+  } catch (e) {
+    // this is expected in projects that don't have expo-updates installed
+    return null;
+  }
   if (!expoUpdatesBuildPath) {
     return null;
   }

package/plugin/src/withDevLauncher.ts

@@ -20,16 +20,21 @@ const pkg = require('expo-dev-launcher/package.json');
 
 const DEV_LAUNCHER_ANDROID_IMPORT = 'expo.modules.devlauncher.DevLauncherController';
 const DEV_LAUNCHER_UPDATES_ANDROID_IMPORT = 'expo.modules.updates.UpdatesDevLauncherController';
-const DEV_LAUNCHER_ON_NEW_INTENT = `
-  @Override
-  public void onNewIntent(Intent intent) {
-      if (DevLauncherController.tryToHandleIntent(this, intent)) {
-         return;
-      }
-      super.onNewIntent(intent);
-  }
-`;
-const DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE = `DevLauncherController.wrapReactActivityDelegate(this, () -> $1);`;
+const DEV_LAUNCHER_ON_NEW_INTENT = [
+  '',
+  '  @Override',
+  '  public void onNewIntent(Intent intent) {',
+  '    super.onNewIntent(intent);',
+  '  }',
+  '',
+].join('\n');
+const DEV_LAUNCHER_HANDLE_INTENT = [
+  '    if (DevLauncherController.tryToHandleIntent(this, intent)) {',
+  '      return;',
+  '    }',
+].join('\n');
+const DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE = (activityDelegateDeclaration: string) =>
+  `DevLauncherController.wrapReactActivityDelegate(this, () -> ${activityDelegateDeclaration})`;
 const DEV_LAUNCHER_ANDROID_INIT = 'DevLauncherController.initialize(this, getReactNativeHost());';
 const DEV_LAUNCHER_UPDATES_ANDROID_INIT = `if (BuildConfig.DEBUG) {
       DevLauncherController.getInstance().setUpdatesInterface(UpdatesDevLauncherController.initialize(this));
@@ -48,6 +53,29 @@ async function saveFileAsync(path: string, content: string): Promise<void> {
   return fs.promises.writeFile(path, content, 'utf8');
 }
 
+function findClosingBracketMatchIndex(str: string, pos: number) {
+  if (str[pos] !== '(') {
+    throw new Error("No '(' at index " + pos);
+  }
+  let depth = 1;
+  for (let i = pos + 1; i < str.length; i++) {
+    switch (str[i]) {
+      case '(':
+        depth++;
+        break;
+      case ')':
+        if (--depth === 0) {
+          return i;
+        }
+        break;
+    }
+  }
+  return -1; // No matching closing parenthesis
+}
+
+const replaceBetween = (origin: string, startIndex: number, endIndex: number, insertion: string) =>
+  `${origin.substring(0, startIndex)}${insertion}${origin.substring(endIndex)}`;
+
 function addJavaImports(javaSource: string, javaImports: string[]): string {
   const lines = javaSource.split('\n');
   const lineIndexWithPackageDeclaration = lines.findIndex((line) => line.match(/^package .*;$/));
@@ -153,31 +181,56 @@ const withDevLauncherApplication: ConfigPlugin = (config) => {
   ]);
 };
 
-const withDevLauncherActivity: ConfigPlugin = (config) => {
-  return withMainActivity(config, (config) => {
-    if (config.modResults.language === 'java') {
-      let content = addJavaImports(config.modResults.contents, [
-        DEV_LAUNCHER_ANDROID_IMPORT,
-        'android.content.Intent',
-      ]);
+export function modifyJavaMainActivity(content: string): string {
+  content = addJavaImports(content, [DEV_LAUNCHER_ANDROID_IMPORT, 'android.content.Intent']);
 
-      if (!content.includes(DEV_LAUNCHER_ON_NEW_INTENT)) {
-        const lines = content.split('\n');
-        const onCreateIndex = lines.findIndex((line) => line.includes('public class MainActivity'));
+  if (!content.includes('onNewIntent')) {
+    const lines = content.split('\n');
+    const onCreateIndex = lines.findIndex((line) => line.includes('public class MainActivity'));
 
-        lines.splice(onCreateIndex + 1, 0, DEV_LAUNCHER_ON_NEW_INTENT);
+    lines.splice(onCreateIndex + 1, 0, DEV_LAUNCHER_ON_NEW_INTENT);
 
-        content = lines.join('\n');
-      }
+    content = lines.join('\n');
+  }
+  if (!content.includes(DEV_LAUNCHER_HANDLE_INTENT)) {
+    content = addLines(content, /super\.onNewIntent\(intent\)/, 0, [DEV_LAUNCHER_HANDLE_INTENT]);
+  }
 
-      if (!content.includes('DevLauncherController.wrapReactActivityDelegate')) {
-        content = content.replace(
-          /(new ReactActivityDelegate(Wrapper)?(.|\s)*\}\)?);$/mu,
-          DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE
-        );
-      }
+  if (!content.includes('DevLauncherController.wrapReactActivityDelegate')) {
+    const activityDelegateMatches = Array.from(
+      content.matchAll(/new ReactActivityDelegate(Wrapper)/g)
+    );
+
+    if (activityDelegateMatches.length !== 1) {
+      WarningAggregator.addWarningAndroid(
+        'expo-dev-launcher',
+        `Failed to wrap 'ReactActivityDelegate'
+See the expo-dev-client installation instructions to modify your MainActivity.java manually: ${InstallationPage}`
+      );
+      return content;
+    }
+
+    const activityDelegateMatch = activityDelegateMatches[0];
+    const matchIndex = activityDelegateMatch.index!;
+    const openingBracketIndex = matchIndex + activityDelegateMatch[0].length; // next character after `new ReactActivityDelegateWrapper`
+
+    const closingBracketIndex = findClosingBracketMatchIndex(content, openingBracketIndex);
+    const reactActivityDelegateDeclaration = content.substring(matchIndex, closingBracketIndex + 1);
 
-      config.modResults.contents = content;
+    content = replaceBetween(
+      content,
+      matchIndex,
+      closingBracketIndex + 1,
+      DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE(reactActivityDelegateDeclaration)
+    );
+  }
+  return content;
+}
+
+const withDevLauncherActivity: ConfigPlugin = (config) => {
+  return withMainActivity(config, (config) => {
+    if (config.modResults.language === 'java') {
+      config.modResults.contents = modifyJavaMainActivity(config.modResults.contents);
     } else {
       WarningAggregator.addWarningAndroid(
         'expo-dev-launcher',

package/plugin/src/withDevLauncherAppDelegate.ts

@@ -105,6 +105,20 @@ const DEV_LAUNCHER_INIT_TO_REMOVE = new RegExp(
   'm'
 );
 
+const DEV_LAUNCHER_INIT_TO_REMOVE_SDK_44 = new RegExp(
+  escapeRegExpCharacters(`RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  rootView.backgroundColor = [UIColor whiteColor];
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  UIViewController *rootViewController = `) +
+    `([^;]+)` +
+    escapeRegExpCharacters(`;
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];`),
+  'm'
+);
+
 const DEV_LAUNCHER_NEW_INIT = `self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
 #if defined(EX_DEV_LAUNCHER_ENABLED)
   EXDevLauncherController *controller = [EXDevLauncherController sharedInstance];
@@ -162,6 +176,21 @@ const DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION = (
 }
 `;
 
+const DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_SDK_44 = `
+- (RCTBridge *)initializeReactNativeApp:(NSDictionary *)launchOptions
+{
+  RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  rootView.backgroundColor = [UIColor whiteColor];
+  UIViewController *rootViewController = [self.reactDelegate createRootViewController];
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+
+  return bridge;
+ }
+`;
+
 function addImports(appDelegate: string, shouldAddUpdatesIntegration: boolean): string {
   if (
     !appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_IOS_IMPORT) &&
@@ -259,18 +288,31 @@ export function modifyAppDelegate(appDelegate: string, expoUpdatesVersion: strin
   const shouldAddUpdatesIntegration =
     expoUpdatesVersion != null && semver.gt(expoUpdatesVersion, '0.6.0');
 
-  if (!DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_REGEX.test(appDelegate)) {
-    if (DEV_LAUNCHER_INIT_TO_REMOVE.test(appDelegate)) {
+  if (
+    !DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_REGEX.test(appDelegate) &&
+    !appDelegate.includes(DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_SDK_44)
+  ) {
+    let initToRemove;
+    let shouldAddSDK44Init = false;
+    if (DEV_LAUNCHER_INIT_TO_REMOVE_SDK_44.test(appDelegate)) {
+      initToRemove = DEV_LAUNCHER_INIT_TO_REMOVE_SDK_44;
+      shouldAddSDK44Init = true;
+    } else if (DEV_LAUNCHER_INIT_TO_REMOVE.test(appDelegate)) {
+      initToRemove = DEV_LAUNCHER_INIT_TO_REMOVE;
+    }
+
+    if (initToRemove) {
       // UIViewController can be initialized differently depending on whether expo-screen-orientation is installed,
       // so we need to preserve whatever is there already.
       let viewControllerInit;
-      appDelegate = appDelegate.replace(DEV_LAUNCHER_INIT_TO_REMOVE, (match, p1) => {
+      appDelegate = appDelegate.replace(initToRemove, (match, p1) => {
         viewControllerInit = p1;
         return DEV_LAUNCHER_NEW_INIT;
       });
-      appDelegate = addLines(appDelegate, '@implementation AppDelegate', 1, [
-        DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION(viewControllerInit),
-      ]);
+      const initToAdd = shouldAddSDK44Init
+        ? DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_SDK_44
+        : DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION(viewControllerInit);
+      appDelegate = addLines(appDelegate, '@implementation AppDelegate', 1, [initToAdd]);
     } else {
       WarningAggregator.addWarningIOS(
         'expo-dev-launcher',