expo-dev-menu 4.2.0 → 4.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Expo/React Native module with the developer menu.",
   "main": "build/DevMenu.js",
   "types": "build/DevMenu.d.ts",
@@ -8,7 +8,8 @@
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",
-    "lint": "expo-module lint",
+    "lint": "expo-module lint ./app/*",
+    "ts:check": "expo-module tsc --project tsconfig.app.json --noEmit & expo-module tsc --noEmit",
     "test": "expo-module test",
     "prepare": "expo-module prepare && ./scripts/reset-dev-menu-packager-host.sh",
     "prepublishOnly": "expo-module prepublishOnly",
@@ -48,7 +49,7 @@
     ]
   },
   "dependencies": {
-    "expo-dev-menu-interface": "1.4.0",
+    "expo-dev-menu-interface": "1.5.0",
     "semver": "^7.5.3"
   },
   "devDependencies": {
@@ -57,19 +58,19 @@
     "@testing-library/jest-native": "^4.0.4",
     "@testing-library/react-native": "^8.0.0",
     "babel-plugin-module-resolver": "^5.0.0",
-    "babel-preset-expo": "~9.7.0",
+    "babel-preset-expo": "~9.8.0",
     "expo-dev-client-components": "1.6.1",
     "expo-module-scripts": "^3.0.0",
     "fuse.js": "^6.4.6",
     "graphql": "^15.3.0",
     "graphql-tag": "^2.10.1",
     "react": "18.2.0",
-    "react-native": "0.72.4",
+    "react-native": "0.72.5",
     "use-subscription": "^1.8.0",
     "url": "^0.11.0"
   },
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee2c866ba3c7fbc35ff2a3e896041cf15d3bd7c5"
+  "gitHead": "da25937e2a99661cbe5eb60ca1d8d6245fc96a50"
 }

package/plugin/build/withDevMenu.d.ts

@@ -1,3 +1,2 @@
-import { ConfigPlugin } from 'expo/config-plugins';
-declare const _default: ConfigPlugin<unknown>;
+declare const _default: import("expo/config-plugins").ConfigPlugin<void>;
 export default _default;

package/plugin/build/withDevMenu.js

@@ -1,101 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 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 withDevMenuAppDelegate_1 = require("./withDevMenuAppDelegate");
 const pkg = require('expo-dev-menu/package.json');
-const DEV_MENU_ANDROID_IMPORT = 'expo.modules.devmenu.react.DevMenuAwareReactActivity';
-const DEV_MENU_ACTIVITY_CLASS = 'public class MainActivity extends DevMenuAwareReactActivity {';
-async function readFileAsync(path) {
-    return fs_1.default.promises.readFile(path, 'utf8');
-}
-async function saveFileAsync(path, content) {
-    return fs_1.default.promises.writeFile(path, content, 'utf8');
-}
-function addJavaImports(javaSource, javaImports) {
-    const lines = javaSource.split('\n');
-    const lineIndexWithPackageDeclaration = lines.findIndex((line) => line.match(/^package .*;$/));
-    for (const javaImport of javaImports) {
-        if (!javaSource.includes(javaImport)) {
-            const importStatement = `import ${javaImport};`;
-            lines.splice(lineIndexWithPackageDeclaration + 1, 0, importStatement);
-        }
-    }
-    return lines.join('\n');
-}
-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');
-}
-async function editPodfile(config, action) {
-    const podfilePath = path_1.default.join(config.modRequest.platformProjectRoot, 'Podfile');
-    try {
-        const podfile = action(await readFileAsync(podfilePath));
-        return await saveFileAsync(podfilePath, podfile);
-    }
-    catch (e) {
-        config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. 
-See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`);
-    }
-}
-const withDevMenuActivity = (config) => {
-    return (0, config_plugins_1.withMainActivity)(config, (config) => {
-        if (config.modResults.language === 'java') {
-            let content = config.modResults.contents;
-            content = addJavaImports(content, [DEV_MENU_ANDROID_IMPORT]);
-            content = content.replace('public class MainActivity extends ReactActivity {', DEV_MENU_ACTIVITY_CLASS);
-            config.modResults.contents = content;
-        }
-        else {
-            config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `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 withDevMenuPodfile = (config) => {
-    return (0, config_plugins_1.withDangerousMod)(config, [
-        'ios',
-        async (config) => {
-            await editPodfile(config, (podfile) => {
-                podfile = podfile.replace("platform :ios, '10.0'", "platform :ios, '11.0'");
-                // Match both variations of Ruby config:
-                // unknown: pod 'expo-dev-menu', path: '../node_modules/expo-dev-menu', :configurations => :debug
-                // Rubocop: pod 'expo-dev-menu', path: '../node_modules/expo-dev-menu', configurations: :debug
-                if (!podfile.match(/pod ['"]expo-dev-menu['"],\s?path: ['"][^'"]*node_modules\/expo-dev-menu['"],\s?:?configurations:?\s(?:=>\s)?:debug/)) {
-                    const packagePath = path_1.default.dirname(require.resolve('expo-dev-menu/package.json'));
-                    const relativePath = path_1.default.relative(config.modRequest.platformProjectRoot, packagePath);
-                    podfile = addLines(podfile, 'use_react_native', 0, [
-                        `  pod 'expo-dev-menu', path: '${relativePath}', :configurations => :debug`,
-                    ]);
-                }
-                return podfile;
-            });
-            return config;
-        },
-    ]);
-};
-const withDevMenu = (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_1.default.lt(config.sdkVersion, '45.0.0')) {
-        config = withDevMenuActivity(config);
-        config = withDevMenuPodfile(config);
-        config = (0, withDevMenuAppDelegate_1.withDevMenuAppDelegate)(config);
-    }
-    return config;
-};
-exports.default = (0, config_plugins_1.createRunOncePlugin)(withDevMenu, pkg.name, pkg.version);
+// no-op after SDK 44
+exports.default = (0, config_plugins_1.createRunOncePlugin)((config) => config, pkg.name, pkg.version);

package/plugin/jest.config.js

@@ -1 +1 @@
-module.exports = require('expo-module-scripts/jest-preset-plugin');
+module.exports = {};

package/plugin/src/withDevMenu.ts

@@ -1,132 +1,6 @@
-import { ExpoConfig } from 'expo/config';
-import {
-  ConfigPlugin,
-  createRunOncePlugin,
-  ExportedConfigWithProps,
-  WarningAggregator,
-  withDangerousMod,
-  withMainActivity,
-} from 'expo/config-plugins';
-import fs from 'fs';
-import path from 'path';
-import semver from 'semver';
-
-import { InstallationPage } from './constants';
-import { withDevMenuAppDelegate } from './withDevMenuAppDelegate';
+import { createRunOncePlugin } from 'expo/config-plugins';
 
 const pkg = require('expo-dev-menu/package.json');
 
-const DEV_MENU_ANDROID_IMPORT = 'expo.modules.devmenu.react.DevMenuAwareReactActivity';
-const DEV_MENU_ACTIVITY_CLASS = 'public class MainActivity extends DevMenuAwareReactActivity {';
-
-async function readFileAsync(path: string): Promise<string> {
-  return fs.promises.readFile(path, 'utf8');
-}
-
-async function saveFileAsync(path: string, content: string): Promise<void> {
-  return fs.promises.writeFile(path, content, 'utf8');
-}
-
-function addJavaImports(javaSource: string, javaImports: string[]): string {
-  const lines = javaSource.split('\n');
-  const lineIndexWithPackageDeclaration = lines.findIndex((line) => line.match(/^package .*;$/));
-  for (const javaImport of javaImports) {
-    if (!javaSource.includes(javaImport)) {
-      const importStatement = `import ${javaImport};`;
-      lines.splice(lineIndexWithPackageDeclaration + 1, 0, importStatement);
-    }
-  }
-  return lines.join('\n');
-}
-
-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');
-}
-
-async function editPodfile(config: ExportedConfigWithProps, action: (podfile: string) => string) {
-  const podfilePath = path.join(config.modRequest.platformProjectRoot, 'Podfile');
-  try {
-    const podfile = action(await readFileAsync(podfilePath));
-
-    return await saveFileAsync(podfilePath, podfile);
-  } catch (e) {
-    WarningAggregator.addWarningIOS(
-      'expo-dev-menu',
-      `Couldn't modified AppDelegate.m - ${e}. 
-See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}`
-    );
-  }
-}
-
-const withDevMenuActivity: ConfigPlugin = (config) => {
-  return withMainActivity(config, (config) => {
-    if (config.modResults.language === 'java') {
-      let content = config.modResults.contents;
-      content = addJavaImports(content, [DEV_MENU_ANDROID_IMPORT]);
-      content = content.replace(
-        'public class MainActivity extends ReactActivity {',
-        DEV_MENU_ACTIVITY_CLASS
-      );
-      config.modResults.contents = content;
-    } else {
-      WarningAggregator.addWarningAndroid(
-        'expo-dev-menu',
-        `Cannot automatically configure MainActivity if it's not java.
-See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}`
-      );
-    }
-
-    return config;
-  });
-};
-
-const withDevMenuPodfile: ConfigPlugin = (config) => {
-  return withDangerousMod(config, [
-    'ios',
-    async (config) => {
-      await editPodfile(config, (podfile) => {
-        podfile = podfile.replace("platform :ios, '10.0'", "platform :ios, '11.0'");
-        // Match both variations of Ruby config:
-        // unknown: pod 'expo-dev-menu', path: '../node_modules/expo-dev-menu', :configurations => :debug
-        // Rubocop: pod 'expo-dev-menu', path: '../node_modules/expo-dev-menu', configurations: :debug
-        if (
-          !podfile.match(
-            /pod ['"]expo-dev-menu['"],\s?path: ['"][^'"]*node_modules\/expo-dev-menu['"],\s?:?configurations:?\s(?:=>\s)?:debug/
-          )
-        ) {
-          const packagePath = path.dirname(require.resolve('expo-dev-menu/package.json'));
-          const relativePath = path.relative(config.modRequest.platformProjectRoot, packagePath);
-          podfile = addLines(podfile, 'use_react_native', 0, [
-            `  pod 'expo-dev-menu', path: '${relativePath}', :configurations => :debug`,
-          ]);
-        }
-        return podfile;
-      });
-      return config;
-    },
-  ]);
-};
-
-const withDevMenu = (config: ExpoConfig) => {
-  // 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;
-};
-
-export default createRunOncePlugin(withDevMenu, pkg.name, pkg.version);
+// no-op after SDK 44
+export default createRunOncePlugin<void>((config) => config, pkg.name, pkg.version);

package/tsconfig.app.json

@@ -0,0 +1,5 @@
+{
+  "extends": "expo-module-scripts/tsconfig.base",
+  "include": ["./app"],
+  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+}

package/plugin/build/constants.d.ts

@@ -1 +0,0 @@
-export declare const InstallationPage = "https://github.com/expo/expo/blob/main/packages/expo-dev-menu/README.md";

package/plugin/build/constants.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstallationPage = void 0;
-exports.InstallationPage = 'https://github.com/expo/expo/blob/main/packages/expo-dev-menu/README.md';

package/plugin/build/withDevMenuAppDelegate.d.ts

@@ -1,3 +0,0 @@
-import { ConfigPlugin } from 'expo/config-plugins';
-export declare function modifyAppDelegate(appDelegate: string): string;
-export declare const withDevMenuAppDelegate: ConfigPlugin;

package/plugin/build/withDevMenuAppDelegate.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withDevMenuAppDelegate = exports.modifyAppDelegate = void 0;
-const config_plugins_1 = require("expo/config-plugins");
-const constants_1 = require("./constants");
-const DEV_MENU_IOS_IMPORT = `
-#if defined(EX_DEV_MENU_ENABLED)
-@import EXDevMenu;
-#endif`;
-const DEV_MENU_IOS_INIT = `
-#if defined(EX_DEV_MENU_ENABLED)
-  [DevMenuManager configureWithBridge:bridge];
-#endif`;
-const DEV_LAUNCHER_IMPORT = `#include <EXDevLauncher/EXDevLauncherController.h>`;
-function modifyAppDelegate(appDelegate) {
-    if (!appDelegate.includes(DEV_MENU_IOS_IMPORT)) {
-        const lines = appDelegate.split('\n');
-        lines.splice(1, 0, DEV_MENU_IOS_IMPORT);
-        appDelegate = lines.join('\n');
-    }
-    if (!appDelegate.includes(DEV_LAUNCHER_IMPORT)) {
-        // expo-dev-launcher isn't present - we need to init expo-dev-menu
-        if (!appDelegate.includes(DEV_MENU_IOS_INIT)) {
-            const lines = appDelegate.split('\n');
-            const initializeReactNativeAppIndex = lines.findIndex((line) => line.includes('- (RCTBridge *)initializeReactNativeApp'));
-            const rootViewControllerIndex = lines.findIndex((line, index) => initializeReactNativeAppIndex < index && line.includes('rootViewController'));
-            lines.splice(rootViewControllerIndex - 1, 0, DEV_MENU_IOS_INIT);
-            appDelegate = lines.join('\n');
-        }
-    }
-    else {
-        // expo-dev-launcher is present - we need to remove expo-dev-menu init block
-        appDelegate = appDelegate.replace(DEV_MENU_IOS_INIT, '');
-    }
-    return appDelegate;
-}
-exports.modifyAppDelegate = modifyAppDelegate;
-const withDevMenuAppDelegate = (config) => {
-    return (0, config_plugins_1.withAppDelegate)(config, (config) => {
-        if (config.modResults.language === 'objc') {
-            config.modResults.contents = modifyAppDelegate(config.modResults.contents);
-        }
-        else {
-            config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `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.withDevMenuAppDelegate = withDevMenuAppDelegate;

package/plugin/src/constants.ts

@@ -1,2 +0,0 @@
-export const InstallationPage =
-  'https://github.com/expo/expo/blob/main/packages/expo-dev-menu/README.md';

package/plugin/src/withDevMenuAppDelegate.ts

@@ -1,63 +0,0 @@
-import { ConfigPlugin, WarningAggregator, withAppDelegate } from 'expo/config-plugins';
-
-import { InstallationPage } from './constants';
-
-const DEV_MENU_IOS_IMPORT = `
-#if defined(EX_DEV_MENU_ENABLED)
-@import EXDevMenu;
-#endif`;
-
-const DEV_MENU_IOS_INIT = `
-#if defined(EX_DEV_MENU_ENABLED)
-  [DevMenuManager configureWithBridge:bridge];
-#endif`;
-
-const DEV_LAUNCHER_IMPORT = `#include <EXDevLauncher/EXDevLauncherController.h>`;
-export function modifyAppDelegate(appDelegate: string) {
-  if (!appDelegate.includes(DEV_MENU_IOS_IMPORT)) {
-    const lines = appDelegate.split('\n');
-    lines.splice(1, 0, DEV_MENU_IOS_IMPORT);
-
-    appDelegate = lines.join('\n');
-  }
-
-  if (!appDelegate.includes(DEV_LAUNCHER_IMPORT)) {
-    // expo-dev-launcher isn't present - we need to init expo-dev-menu
-    if (!appDelegate.includes(DEV_MENU_IOS_INIT)) {
-      const lines = appDelegate.split('\n');
-
-      const initializeReactNativeAppIndex = lines.findIndex((line) =>
-        line.includes('- (RCTBridge *)initializeReactNativeApp')
-      );
-
-      const rootViewControllerIndex = lines.findIndex(
-        (line, index) =>
-          initializeReactNativeAppIndex < index && line.includes('rootViewController')
-      );
-
-      lines.splice(rootViewControllerIndex - 1, 0, DEV_MENU_IOS_INIT);
-
-      appDelegate = lines.join('\n');
-    }
-  } else {
-    // expo-dev-launcher is present - we need to remove expo-dev-menu init block
-    appDelegate = appDelegate.replace(DEV_MENU_IOS_INIT, '');
-  }
-
-  return appDelegate;
-}
-
-export const withDevMenuAppDelegate: ConfigPlugin = (config) => {
-  return withAppDelegate(config, (config) => {
-    if (config.modResults.language === 'objc') {
-      config.modResults.contents = modifyAppDelegate(config.modResults.contents);
-    } else {
-      WarningAggregator.addWarningIOS(
-        'expo-dev-menu',
-        `Swift AppDelegate files are not supported yet.
-See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}`
-      );
-    }
-    return config;
-  });
-};