expo-dev-launcher 0.7.0 → 0.8.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "0.7.0",
+  "version": "0.8.3",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -28,15 +28,15 @@
   "license": "MIT",
   "homepage": "https://docs.expo.io",
   "dependencies": {
-    "@expo/config-plugins": "^3.0.0",
+    "@expo/config-plugins": "^3.1.0",
     "resolve-from": "^5.0.0",
     "semver": "^7.3.5"
   },
   "devDependencies": {
-    "babel-preset-expo": "~8.4.1",
+    "babel-preset-expo": "~8.5.1",
     "expo-module-scripts": "^2.0.0",
-    "react": "16.13.1",
-    "react-native": "0.63.2"
+    "react": "17.0.1",
+    "react-native": "0.64.2"
   },
-  "gitHead": "6231eededd3121ab5448e6e303214ab7dc39de46"
+  "gitHead": "7adf260ab3de492530d4bf250a24b132b5c4ba41"
 }

package/plugin/build/constants.d.ts

@@ -0,0 +1 @@
+export declare const InstallationPage = "https://docs.expo.dev/clients/installation/";

package/plugin/build/constants.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InstallationPage = void 0;
+exports.InstallationPage = 'https://docs.expo.dev/clients/installation/';

package/plugin/build/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function addLines(content: string, find: string | RegExp, offset: number, toAdd: string[]): string;
+export declare function replaceLine(content: string, find: string | RegExp, replace: string): string;

package/plugin/build/utils.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replaceLine = exports.addLines = void 0;
+function addLines(content, find, offset, toAdd) {
+    const lines = content.split('\n');
+    let lineIndex = lines.findIndex((line) => line.match(find));
+    for (const newLine of toAdd) {
+        if (!content.includes(newLine)) {
+            lines.splice(lineIndex + offset, 0, newLine);
+            lineIndex++;
+        }
+    }
+    return lines.join('\n');
+}
+exports.addLines = addLines;
+function replaceLine(content, find, replace) {
+    const lines = content.split('\n');
+    if (!content.includes(replace)) {
+        const lineIndex = lines.findIndex((line) => line.match(find));
+        lines.splice(lineIndex, 1, replace);
+    }
+    return lines.join('\n');
+}
+exports.replaceLine = replaceLine;

package/plugin/build/withDevLauncher.js

@@ -7,7 +7,9 @@ const config_plugins_1 = require("@expo/config-plugins");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
+const constants_1 = require("./constants");
 const resolveExpoUpdatesVersion_1 = require("./resolveExpoUpdatesVersion");
+const utils_1 = require("./utils");
 const withDevLauncherAppDelegate_1 = require("./withDevLauncherAppDelegate");
 const pkg = require('expo-dev-launcher/package.json');
 const DEV_LAUNCHER_ANDROID_IMPORT = 'expo.modules.devlauncher.DevLauncherController';
@@ -35,28 +37,9 @@ async function readFileAsync(path) {
 async function saveFileAsync(path, content) {
     return fs_1.default.promises.writeFile(path, content, 'utf8');
 }
-function addLines(content, find, offset, toAdd) {
-    const lines = content.split('\n');
-    let lineIndex = lines.findIndex(line => line.match(find));
-    for (const newLine of toAdd) {
-        if (!content.includes(newLine)) {
-            lines.splice(lineIndex + offset, 0, newLine);
-            lineIndex++;
-        }
-    }
-    return lines.join('\n');
-}
-function replaceLine(content, find, replace) {
-    const lines = content.split('\n');
-    if (!content.includes(replace)) {
-        const lineIndex = lines.findIndex(line => line.match(find));
-        lines.splice(lineIndex, 1, replace);
-    }
-    return lines.join('\n');
-}
 function addJavaImports(javaSource, javaImports) {
     const lines = javaSource.split('\n');
-    const lineIndexWithPackageDeclaration = lines.findIndex(line => line.match(/^package .*;$/));
+    const lineIndexWithPackageDeclaration = lines.findIndex((line) => line.match(/^package .*;$/));
     for (const javaImport of javaImports) {
         if (!javaSource.includes(javaImport)) {
             const importStatement = `import ${javaImport};`;
@@ -72,7 +55,8 @@ async function editMainApplication(config, action) {
         return await saveFileAsync(mainApplicationPath, mainApplication);
     }
     catch (e) {
-        config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}.`);
+        config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}.
+See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${constants_1.InstallationPage}`);
     }
 }
 async function editPodfile(config, action) {
@@ -82,7 +66,8 @@ async function editPodfile(config, action) {
         return await saveFileAsync(podfilePath, podfile);
     }
     catch (e) {
-        config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`);
+        config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.
+See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${constants_1.InstallationPage}`);
     }
 }
 async function editIndex(config, action) {
@@ -92,16 +77,17 @@ async function editIndex(config, action) {
         return await saveFileAsync(indexPath, index);
     }
     catch (e) {
-        config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`);
+        config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.
+See the expo-dev-client installation instructions to modify your index.js manually: ${constants_1.InstallationPage}`);
     }
 }
-const withDevLauncherApplication = config => {
+const withDevLauncherApplication = (config) => {
     return config_plugins_1.withDangerousMod(config, [
         'android',
         async (config) => {
-            await editMainApplication(config, mainApplication => {
+            await editMainApplication(config, (mainApplication) => {
                 mainApplication = addJavaImports(mainApplication, [DEV_LAUNCHER_ANDROID_IMPORT]);
-                mainApplication = addLines(mainApplication, 'initializeFlipper\\(this', 0, [
+                mainApplication = utils_1.addLines(mainApplication, 'initializeFlipper\\(this', 0, [
                     `    ${DEV_LAUNCHER_ANDROID_INIT}`,
                 ]);
                 let expoUpdatesVersion;
@@ -113,10 +99,10 @@ const withDevLauncherApplication = config => {
                 }
                 if (expoUpdatesVersion && semver_1.default.gt(expoUpdatesVersion, '0.6.0')) {
                     mainApplication = addJavaImports(mainApplication, [DEV_LAUNCHER_UPDATES_ANDROID_IMPORT]);
-                    mainApplication = addLines(mainApplication, 'initializeFlipper\\(this', 0, [
+                    mainApplication = utils_1.addLines(mainApplication, 'initializeFlipper\\(this', 0, [
                         `    ${DEV_LAUNCHER_UPDATES_ANDROID_INIT}`,
                     ]);
-                    mainApplication = replaceLine(mainApplication, 'return BuildConfig.DEBUG;', `      ${DEV_LAUNCHER_UPDATES_DEVELOPER_SUPPORT}`);
+                    mainApplication = utils_1.replaceLine(mainApplication, 'return BuildConfig.DEBUG;', `      ${DEV_LAUNCHER_UPDATES_DEVELOPER_SUPPORT}`);
                 }
                 return mainApplication;
             });
@@ -124,8 +110,8 @@ const withDevLauncherApplication = config => {
         },
     ]);
 };
-const withDevLauncherActivity = config => {
-    return config_plugins_1.withMainActivity(config, config => {
+const withDevLauncherActivity = (config) => {
+    return config_plugins_1.withMainActivity(config, (config) => {
         if (config.modResults.language === 'java') {
             let content = addJavaImports(config.modResults.contents, [
                 DEV_LAUNCHER_ANDROID_IMPORT,
@@ -133,34 +119,36 @@ const withDevLauncherActivity = config => {
             ]);
             if (!content.includes(DEV_LAUNCHER_ON_NEW_INTENT)) {
                 const lines = content.split('\n');
-                const onCreateIndex = lines.findIndex(line => line.includes('public class MainActivity'));
+                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(.*|\s)*});$/m, DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE);
+                content = content.replace(/(new ReactActivityDelegate(Wrapper)?(.|\s)*\}\)?);$/mu, DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE);
             }
             config.modResults.contents = content;
         }
         else {
-            config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`);
+            config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java.
+See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`);
         }
         return config;
     });
 };
-const withDevLauncherPodfile = config => {
+const withDevLauncherPodfile = (config) => {
     return config_plugins_1.withDangerousMod(config, [
         'ios',
         async (config) => {
-            await editPodfile(config, podfile => {
-                podfile = podfile.replace("platform :ios, '10.0'", "platform :ios, '11.0'");
+            await editPodfile(config, (podfile) => {
+                // replace all iOS versions below 12
+                podfile = podfile.replace(/platform :ios, '((\d\.0)|(1[0-1].0))'/, "platform :ios, '12.0'");
                 // Match both variations of Ruby config:
                 // unknown: pod 'expo-dev-launcher', path: '../node_modules/expo-dev-launcher', :configurations => :debug
                 // Rubocop: pod 'expo-dev-launcher', path: '../node_modules/expo-dev-launcher', configurations: :debug
                 if (!podfile.match(/pod ['"]expo-dev-launcher['"],\s?path: ['"][^'"]*node_modules\/expo-dev-launcher['"],\s?:?configurations:?\s(?:=>\s)?:debug/)) {
                     const packagePath = path_1.default.dirname(require.resolve('expo-dev-launcher/package.json'));
                     const relativePath = path_1.default.relative(config.modRequest.platformProjectRoot, packagePath);
-                    podfile = addLines(podfile, 'use_react_native', 0, [
+                    podfile = utils_1.addLines(podfile, 'use_react_native', 0, [
                         `  pod 'expo-dev-launcher', path: '${relativePath}', :configurations => :debug`,
                     ]);
                 }
@@ -170,9 +158,9 @@ const withDevLauncherPodfile = config => {
         },
     ]);
 };
-const withErrorHandling = config => {
+const withErrorHandling = (config) => {
     const injectErrorHandlers = async (config) => {
-        await editIndex(config, index => {
+        await editIndex(config, (index) => {
             if (!index.includes(DEV_LAUNCHER_JS_REGISTER_ERROR_HANDLERS) &&
                 !index.includes(DEV_LAUNCHER_JS_REGISTER_ERROR_HANDLERS_VIA_LAUNCHER)) {
                 index = DEV_LAUNCHER_JS_REGISTER_ERROR_HANDLERS + ';\n\n' + index;

package/plugin/build/withDevLauncherAppDelegate.d.ts

@@ -1,3 +1,4 @@
 import { ConfigPlugin } from '@expo/config-plugins';
+export declare function modifyLegacyAppDelegate(appDelegate: string, expoUpdatesVersion?: string | null): string;
 export declare function modifyAppDelegate(appDelegate: string, expoUpdatesVersion?: string | null): string;
 export declare const withDevLauncherAppDelegate: ConfigPlugin;

package/plugin/build/withDevLauncherAppDelegate.js

@@ -3,10 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withDevLauncherAppDelegate = exports.modifyAppDelegate = void 0;
+exports.withDevLauncherAppDelegate = exports.modifyAppDelegate = exports.modifyLegacyAppDelegate = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const semver_1 = __importDefault(require("semver"));
+const constants_1 = require("./constants");
 const resolveExpoUpdatesVersion_1 = require("./resolveExpoUpdatesVersion");
+const utils_1 = require("./utils");
+function escapeRegExpCharacters(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+const INITIALIZE_REACT_NATIVE_APP_FUNCTION = `- (RCTBridge *)initializeReactNativeApp`;
+const NEW_INITIALIZE_REACT_NATIVE_APP_FUNCTION = `- (RCTBridge *)initializeReactNativeApp:(NSDictionary *)launchOptions`;
 const DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL = `  #if defined(EX_DEV_LAUNCHER_ENABLED)
   return [[EXDevLauncherController sharedInstance] sourceUrl];
   #else
@@ -27,7 +34,7 @@ const DEV_LAUNCHER_UPDATES_APP_DELEGATE_IOS_IMPORT = `
 #include <EXDevLauncher/EXDevLauncherController.h>
 #import <EXUpdates/EXUpdatesDevLauncherController.h>
 #endif`;
-const DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE = `
+const DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE_LEGACY = `
 #if defined(EX_DEV_LAUNCHER_ENABLED)
 @implementation AppDelegate (EXDevLauncherControllerDelegate)
 
@@ -39,6 +46,19 @@ const DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE = `
   [splashScreenService showSplashScreenFor:self.window.rootViewController];
 }
 
+@end
+#endif
+`;
+const DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE = `
+#if defined(EX_DEV_LAUNCHER_ENABLED)
+@implementation AppDelegate (EXDevLauncherControllerDelegate)
+
+- (void)devLauncherController:(EXDevLauncherController *)developmentClientController
+    didStartWithSuccess:(BOOL)success
+{
+  developmentClientController.appBridge = [self initializeReactNativeApp:[EXDevLauncherController.sharedInstance getLaunchOptions]];
+}
+
 @end
 #endif
 `;
@@ -62,8 +82,72 @@ const DEV_MENU_IOS_INIT = `
 #if defined(EX_DEV_MENU_ENABLED)
   [DevMenuManager configureWithBridge:bridge];
 #endif`;
-function modifyAppDelegate(appDelegate, expoUpdatesVersion = null) {
-    const shouldAddUpdatesIntegration = expoUpdatesVersion != null && semver_1.default.gt(expoUpdatesVersion, '0.6.0');
+const DEV_LAUNCHER_INIT_TO_REMOVE = new RegExp(escapeRegExpCharacters(`RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
+  if (rootViewBackgroundColor != nil) {
+    rootView.backgroundColor = [RCTConvert UIColor:rootViewBackgroundColor];
+  } else {
+    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];
+  [controller startWithWindow:self.window delegate:(id<EXDevLauncherControllerDelegate>)self launchOptions:launchOptions];
+#else
+  [self initializeReactNativeApp:launchOptions];
+#endif`;
+const DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_REGEX = new RegExp(escapeRegExpCharacters(`
+- (RCTBridge *)initializeReactNativeApp:(NSDictionary *)launchOptions
+{
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
+  if (rootViewBackgroundColor != nil) {
+    rootView.backgroundColor = [RCTConvert UIColor:rootViewBackgroundColor];
+  } else {
+    rootView.backgroundColor = [UIColor whiteColor];
+  }
+
+  UIViewController *rootViewController = `) +
+    `[^;]+` +
+    escapeRegExpCharacters(`;
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+
+  return bridge;
+}
+`), 'm');
+const DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION = (viewControllerInit) => `
+- (RCTBridge *)initializeReactNativeApp:(NSDictionary *)launchOptions
+{
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
+  if (rootViewBackgroundColor != nil) {
+    rootView.backgroundColor = [RCTConvert UIColor:rootViewBackgroundColor];
+  } else {
+    rootView.backgroundColor = [UIColor whiteColor];
+  }
+
+  UIViewController *rootViewController = ${viewControllerInit !== null && viewControllerInit !== void 0 ? viewControllerInit : '[UIViewController new]'};
+  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)) {
         const lines = appDelegate.split('\n');
@@ -72,6 +156,31 @@ function modifyAppDelegate(appDelegate, expoUpdatesVersion = null) {
             : DEV_LAUNCHER_APP_DELEGATE_IOS_IMPORT);
         appDelegate = lines.join('\n');
     }
+    return appDelegate;
+}
+function removeDevMenuInit(appDelegate) {
+    if (!appDelegate.includes(DEV_MENU_IMPORT)) {
+        // expo-dev-launcher is responsible for initializing the expo-dev-menu.
+        // We need to remove init block from AppDelegate.
+        appDelegate = appDelegate.replace(DEV_MENU_IOS_INIT, '');
+    }
+    return appDelegate;
+}
+function addDeepLinkHandler(appDelegate) {
+    if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
+        appDelegate = appDelegate.replace('return [RCTLinkingManager application:application openURL:url options:options];', DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK);
+    }
+    return appDelegate;
+}
+function changeDebugURL(appDelegate) {
+    if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL)) {
+        appDelegate = appDelegate.replace('return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];', DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL);
+    }
+    return appDelegate;
+}
+function modifyLegacyAppDelegate(appDelegate, expoUpdatesVersion = null) {
+    const shouldAddUpdatesIntegration = expoUpdatesVersion != null && semver_1.default.gt(expoUpdatesVersion, '0.6.0');
+    appDelegate = addImports(appDelegate, shouldAddUpdatesIntegration);
     if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_INIT)) {
         appDelegate = appDelegate.replace(/(didFinishLaunchingWithOptions([^}])*)\[self initializeReactNativeApp\];(([^}])*})/, `$1${DEV_LAUNCHER_APP_DELEGATE_INIT}$3`);
     }
@@ -82,25 +191,53 @@ function modifyAppDelegate(appDelegate, expoUpdatesVersion = null) {
     if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_BRIDGE)) {
         appDelegate = appDelegate.replace('RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:self.launchOptions];', DEV_LAUNCHER_APP_DELEGATE_BRIDGE);
     }
-    if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL)) {
-        appDelegate = appDelegate.replace('return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];', DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL);
+    appDelegate = changeDebugURL(appDelegate);
+    appDelegate = addDeepLinkHandler(appDelegate);
+    if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE_LEGACY)) {
+        appDelegate += DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE_LEGACY;
     }
-    if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
-        appDelegate = appDelegate.replace('return [RCTLinkingManager application:application openURL:url options:options];', DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK);
+    appDelegate = removeDevMenuInit(appDelegate);
+    return appDelegate;
+}
+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)) {
+            // 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) => {
+                viewControllerInit = p1;
+                return DEV_LAUNCHER_NEW_INIT;
+            });
+            appDelegate = utils_1.addLines(appDelegate, '@implementation AppDelegate', 1, [
+                DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION(viewControllerInit),
+            ]);
+        }
+        else {
+            config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Failed to modify AppDelegate init function. 
+See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`);
+        }
+    }
+    if (shouldAddUpdatesIntegration &&
+        !appDelegate.includes(DEV_LAUNCHER_UPDATES_APP_DELEGATE_INIT)) {
+        appDelegate = appDelegate.replace('EXDevLauncherController *controller = [EXDevLauncherController sharedInstance];', DEV_LAUNCHER_UPDATES_APP_DELEGATE_INIT);
     }
+    appDelegate = addImports(appDelegate, shouldAddUpdatesIntegration);
     if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE)) {
         appDelegate += DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE;
     }
-    if (!appDelegate.includes(DEV_MENU_IMPORT)) {
-        // expo-dev-launcher is responsible for initializing the expo-dev-menu.
-        // We need to remove init block from AppDelegate.
-        appDelegate = appDelegate.replace(DEV_MENU_IOS_INIT, '');
+    if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
+        appDelegate = appDelegate.replace('return [RCTLinkingManager application:application openURL:url options:options];', DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK);
     }
+    appDelegate = changeDebugURL(appDelegate);
+    appDelegate = removeDevMenuInit(appDelegate);
     return appDelegate;
 }
 exports.modifyAppDelegate = modifyAppDelegate;
-exports.withDevLauncherAppDelegate = config => {
-    return config_plugins_1.withAppDelegate(config, config => {
+const withDevLauncherAppDelegate = (config) => {
+    return config_plugins_1.withAppDelegate(config, (config) => {
         if (config.modResults.language === 'objc') {
             let expoUpdatesVersion;
             try {
@@ -109,11 +246,19 @@ exports.withDevLauncherAppDelegate = config => {
             catch (e) {
                 config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Failed to check compatibility with expo-updates - ${e}`);
             }
-            config.modResults.contents = modifyAppDelegate(config.modResults.contents, expoUpdatesVersion);
+            if (config.modResults.contents.includes(INITIALIZE_REACT_NATIVE_APP_FUNCTION) &&
+                !config.modResults.contents.includes(NEW_INITIALIZE_REACT_NATIVE_APP_FUNCTION)) {
+                config.modResults.contents = modifyLegacyAppDelegate(config.modResults.contents, expoUpdatesVersion);
+            }
+            else {
+                config.modResults.contents = modifyAppDelegate(config.modResults.contents, expoUpdatesVersion);
+            }
         }
         else {
-            config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', 'Swift AppDelegate files are not supported yet.');
+            config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Swift AppDelegate files are not supported yet.
+See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`);
         }
         return config;
     });
 };
+exports.withDevLauncherAppDelegate = withDevLauncherAppDelegate;

package/plugin/src/constants.ts

@@ -0,0 +1 @@
+export const InstallationPage = 'https://docs.expo.dev/clients/installation/';

package/plugin/src/utils.ts

@@ -0,0 +1,25 @@
+export function addLines(content: string, find: string | RegExp, offset: number, toAdd: string[]) {
+  const lines = content.split('\n');
+
+  let lineIndex = lines.findIndex((line) => line.match(find));
+
+  for (const newLine of toAdd) {
+    if (!content.includes(newLine)) {
+      lines.splice(lineIndex + offset, 0, newLine);
+      lineIndex++;
+    }
+  }
+
+  return lines.join('\n');
+}
+
+export function replaceLine(content: string, find: string | RegExp, replace: string) {
+  const lines = content.split('\n');
+
+  if (!content.includes(replace)) {
+    const lineIndex = lines.findIndex((line) => line.match(find));
+    lines.splice(lineIndex, 1, replace);
+  }
+
+  return lines.join('\n');
+}