[expo-dev-launcher][expo-dev-menu] gate config plugin mods by SDK ver…

…sion (#16495)
expo · Mar 3, 2022 · ca2c059 · ca2c059
1 parent 4771ed2
commit ca2c059
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 16 deletions.
diff --git a/packages/expo-dev-launcher/CHANGELOG.md b/packages/expo-dev-launcher/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Add the `isDevelopmentBuild` function to determine if you are running in a development build. ([#16486](https://github.com/expo/expo/pull/16486) by [@lukmccall](https://github.com/lukmccall))
 - Add expo-modules automatic setup on Android. ([#16441](https://github.com/expo/expo/pull/16441) by [@esamelson](https://github.com/esamelson))
 - Add support for auto-setup with updates integration on Android. ([#16442](https://github.com/expo/expo/pull/16442) by [@esamelson](https://github.com/esamelson))
+- Remove regex-based config plugin mods in SDK 45+ projects. ([#16495](https://github.com/expo/expo/pull/16495) by [@esamelson](https://github.com/esamelson))
 
 ### 🐛 Bug fixes
 

diff --git a/packages/expo-dev-launcher/plugin/build/withDevLauncher.js b/packages/expo-dev-launcher/plugin/build/withDevLauncher.js
diff --git a/packages/expo-dev-launcher/plugin/src/withDevLauncher.ts b/packages/expo-dev-launcher/plugin/src/withDevLauncher.ts
@@ -292,10 +292,14 @@ const withErrorHandling: ConfigPlugin = (config) => {
 };
 
 const withDevLauncher = (config: ExpoConfig) => {
-  config = withDevLauncherActivity(config);
-  config = withDevLauncherApplication(config);
-  config = withDevLauncherPodfile(config);
-  config = withDevLauncherAppDelegate(config);
+  // projects using SDKs before 45 need the old regex-based integration
+  // TODO: remove these once we drop support for SDK 44
+  if (config.sdkVersion && semver.lt(config.sdkVersion, '45.0.0')) {
+    config = withDevLauncherActivity(config);
+    config = withDevLauncherApplication(config);
+    config = withDevLauncherPodfile(config);
+    config = withDevLauncherAppDelegate(config);
+  }
   config = withErrorHandling(config);
   return config;
 };

diff --git a/packages/expo-dev-menu/.npmignore b/packages/expo-dev-menu/.npmignore
@@ -7,6 +7,5 @@ __mocks__
 __tests__
 
 /babel.config.js
-/metro.config.js
 /android/src/androidTest/
 /android/src/test/
diff --git a/packages/expo-dev-menu/CHANGELOG.md b/packages/expo-dev-menu/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 - Add unit tests for react app. ([#16005](https://github.com/expo/expo/pull/16005) by [@ajsmth](https://github.com/ajsmth))
 - Add expo-modules automatic setup on Android. ([#16441](https://github.com/expo/expo/pull/16441) by [@esamelson](https://github.com/esamelson))
+- Remove regex-based config plugin mods in SDK 45+ projects. ([#16495](https://github.com/expo/expo/pull/16495) by [@esamelson](https://github.com/esamelson))
 
 ### 🐛 Bug fixes
 

diff --git a/packages/expo-dev-menu/package.json b/packages/expo-dev-menu/package.json
@@ -47,7 +47,8 @@
   },
   "dependencies": {
     "@expo/config-plugins": "^4.0.14",
-    "expo-dev-menu-interface": "0.5.1"
+    "expo-dev-menu-interface": "0.5.1",
+    "semver": "^7.3.5"
   },
   "devDependencies": {
     "@apollo/client": "^3.4.10",

diff --git a/packages/expo-dev-menu/plugin/build/withDevMenu.js b/packages/expo-dev-menu/plugin/build/withDevMenu.js
diff --git a/packages/expo-dev-menu/plugin/src/withDevMenu.ts b/packages/expo-dev-menu/plugin/src/withDevMenu.ts
@@ -9,6 +9,7 @@ import {
 import { ExpoConfig } from '@expo/config-types';
 import fs from 'fs';
 import path from 'path';
+import semver from 'semver';
 
 import { InstallationPage } from './constants';
 import { withDevMenuAppDelegate } from './withDevMenuAppDelegate';
@@ -118,9 +119,13 @@ const withDevMenuPodfile: ConfigPlugin = (config) => {
 };
 
 const withDevMenu = (config: ExpoConfig) => {
-  config = withDevMenuActivity(config);
-  config = withDevMenuPodfile(config);
-  config = withDevMenuAppDelegate(config);
+  // projects using SDKs before 45 need the old regex-based integration
+  // TODO: remove this config plugin once we drop support for SDK 44
+  if (config.sdkVersion && semver.lt(config.sdkVersion, '45.0.0')) {
+    config = withDevMenuActivity(config);
+    config = withDevMenuPodfile(config);
+    config = withDevMenuAppDelegate(config);
+  }
   return config;
 };