@react-native-tvos/config-tv 0.0.3 → 0.0.4

package/README.md

@@ -37,7 +37,8 @@ or
         {
           "isTV": true,
           "showVerboseWarnings": false,
-          "tvosDeploymentTarget": "13.4"
+          "tvosDeploymentTarget": "13.4",
+          "removeFlipperOnAndroid": true
         }
       ]
     ]
@@ -52,6 +53,7 @@ _Plugin parameters_:
 - `isTV`: (optional boolean, default false) If true, prebuild should generate or modify Android and iOS files to build for TV (Android TV and Apple TV). If false, the default phone-appropriate files should be generated, and if existing files contain TV changes, they will be reverted. Setting the environment variable EXPO_TV to "true" or "1" will override this value and force a TV build.
 - `showVerboseWarnings`: (optional boolean, default false) If true, verbose warnings will be shown during plugin execution.
 - `tvosDeploymentTarget`: (optional string, default '13.4') Used to set the tvOS deployment target version in the Xcode project.
+- `removeFlipperOnAndroid`: (optional boolean, default true) Used to remove the Flipper dependency from `MainApplication.kt` (or `MainApplication.java`) and `android/app/build.gradle`. This is necessary for React Native TV 0.73 and higher, since Flipper integration is removed from these versions. If this causes issues, set the value to false, run `prebuild --clean` again, and then remove Flipper from your Android source manually.
 
 _Warning_:
 
@@ -60,7 +62,7 @@ When this plugin is used to generate files in the iOS directory that build an Ap
 ```json
 {
   "dependencies": {
-    "react-native": "npm:react-native-tvos@^0.72.5-0"
+    "react-native": "npm:react-native-tvos@^0.72.6-1"
   }
 }
 ```

package/build/types.d.ts

@@ -3,15 +3,19 @@ export type ConfigData = {
      * If true, prebuild should generate Android and iOS files for TV (Android TV and Apple TV).
      * If false, the default phone-appropriate files should be generated.
      * Setting the environment variable EXPO_TV to "true" or "1" will override
-     * this value.
+     * this value. (Defaults to false.)
      */
     isTV?: boolean;
     /**
-     * If true, verbose warnings will be shown during plugin execution.
+     * If true, verbose warnings will be shown during plugin execution. (Defaults to false.)
      */
     showVerboseWarnings?: boolean;
     /**
      * If set, this will be used as the tvOS deployment target version instead of the default (13.4).
      */
     tvosDeploymentTarget?: string;
+    /**
+     * If set, Android code that references Flipper will be removed. (Defaults to true.)
+     */
+    removeFlipperOnAndroid?: boolean;
 };

package/build/utils.d.ts

@@ -2,3 +2,4 @@ import { ConfigData } from './types';
 export declare function isTVEnabled(params: ConfigData): boolean;
 export declare function showVerboseWarnings(params: ConfigData): boolean;
 export declare function tvosDeploymentTarget(params: ConfigData): string;
+export declare function shouldRemoveFlipperOnAndroid(params: ConfigData): boolean;

package/build/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tvosDeploymentTarget = exports.showVerboseWarnings = exports.isTVEnabled = void 0;
+exports.shouldRemoveFlipperOnAndroid = exports.tvosDeploymentTarget = exports.showVerboseWarnings = exports.isTVEnabled = void 0;
 const getenv_1 = require("getenv");
 class Env {
     /** Enable prebuild for TV */
@@ -22,3 +22,7 @@ function tvosDeploymentTarget(params) {
     return params?.tvosDeploymentTarget ?? defaultTvosDeploymentVersion;
 }
 exports.tvosDeploymentTarget = tvosDeploymentTarget;
+function shouldRemoveFlipperOnAndroid(params) {
+    return params?.removeFlipperOnAndroid ?? true;
+}
+exports.shouldRemoveFlipperOnAndroid = shouldRemoveFlipperOnAndroid;

package/build/withTV.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from "expo/config-plugins";
-import { ConfigData } from "./types";
+import { ConfigPlugin } from 'expo/config-plugins';
+import { ConfigData } from './types';
 declare const _default: ConfigPlugin<ConfigData>;
 export default _default;

package/build/withTV.js

@@ -5,12 +5,14 @@ const withTVAndroidManifest_1 = require("./withTVAndroidManifest");
 const withTVPodfile_1 = require("./withTVPodfile");
 const withTVSplashScreen_1 = require("./withTVSplashScreen");
 const withTVXcodeProject_1 = require("./withTVXcodeProject");
+const withTVAndroidRemoveFlipper_1 = require("./withTVAndroidRemoveFlipper");
 const withTVPlugin = (config, params = {}) => {
     config = (0, withTVXcodeProject_1.withTVXcodeProject)(config, params);
     config = (0, withTVPodfile_1.withTVPodfile)(config, params);
     config = (0, withTVSplashScreen_1.withTVSplashScreen)(config, params);
     config = (0, withTVAndroidManifest_1.withTVAndroidManifest)(config, params);
+    config = (0, withTVAndroidRemoveFlipper_1.withTVAndroidRemoveFlipper)(config, params);
     return config;
 };
-const pkg = require("../package.json");
+const pkg = require('../package.json');
 exports.default = (0, config_plugins_1.createRunOncePlugin)(withTVPlugin, pkg.name, pkg.version);

package/build/withTVAndroidRemoveFlipper.d.ts

@@ -0,0 +1,4 @@
+import { ConfigPlugin } from 'expo/config-plugins';
+import { ConfigData } from './types';
+/** Dangerously makes or reverts TV changes in the project Podfile. */
+export declare const withTVAndroidRemoveFlipper: ConfigPlugin<ConfigData>;

package/build/withTVAndroidRemoveFlipper.js

@@ -0,0 +1,65 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withTVAndroidRemoveFlipper = void 0;
+const config_plugins_1 = require("expo/config-plugins");
+const fs_1 = require("fs");
+const glob_1 = __importDefault(require("glob"));
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("./utils");
+const pkg = require('../package.json');
+/** Dangerously makes or reverts TV changes in the project Podfile. */
+const withTVAndroidRemoveFlipper = (c, params = {}) => {
+    const isTV = (0, utils_1.isTVEnabled)(params);
+    const verbose = (0, utils_1.showVerboseWarnings)(params);
+    const androidRemoveFlipper = (0, utils_1.shouldRemoveFlipperOnAndroid)(params);
+    return (0, config_plugins_1.withDangerousMod)(c, [
+        'android',
+        // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+        async (config) => {
+            if (isTV && androidRemoveFlipper) {
+                // Modify main application
+                const mainApplicationFile = mainApplicationFilePath(config.modRequest.platformProjectRoot);
+                if (verbose) {
+                    config_plugins_1.WarningAggregator.addWarningAndroid('source', `${pkg.name}@${pkg.version}: removing Flipper from MainApplication file`);
+                }
+                const mainApplicationContents = await fs_1.promises.readFile(mainApplicationFile, 'utf8');
+                const mainApplicationModifiedContents = commentOutLinesWithString(mainApplicationContents, 'Flipper');
+                await fs_1.promises.writeFile(mainApplicationFile, mainApplicationModifiedContents, 'utf-8');
+                // Modify app/build.gradle
+                const buildGradleFile = appBuildGradleFilePath(config.modRequest.platformProjectRoot);
+                if (verbose) {
+                    config_plugins_1.WarningAggregator.addWarningAndroid('source', `${pkg.name}@${pkg.version}: removing Flipper from android/app/build.gradle`);
+                }
+                const buildGradleContents = await fs_1.promises.readFile(buildGradleFile, 'utf-8');
+                const buildGradleModifiedContents = commentOutLinesWithString(buildGradleContents, 'flipper');
+                await fs_1.promises.writeFile(buildGradleFile, buildGradleModifiedContents, 'utf-8');
+            }
+            return config;
+        },
+    ]);
+};
+exports.withTVAndroidRemoveFlipper = withTVAndroidRemoveFlipper;
+const mainApplicationFilePath = (androidRoot) => {
+    const paths = glob_1.default.sync(`${androidRoot}/**/MainApplication.*`);
+    if (paths.length > 0) {
+        return paths[0];
+    }
+    else {
+        throw new Error('AndroidApplication path not found');
+    }
+};
+const appBuildGradleFilePath = (androidRoot) => path_1.default.resolve(androidRoot, 'app', 'build.gradle');
+const commentOutLinesWithString = (contents, searchString) => {
+    return contents
+        .split('\n')
+        .map((line) => {
+        if (line.indexOf(searchString) !== -1) {
+            return line.replace(/^/, '// ');
+        }
+        return line;
+    })
+        .join('\n');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-tvos/config-tv",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Config plugin to reconfigure native directories for Apple TV and Android TV development if needed",
   "main": "build/withTV.js",
   "types": "build/withTV.d.ts",
@@ -34,7 +34,7 @@
     "react-native-tvos"
   ],
   "peerDependencies": {
-    "expo": "^50.0.0.alpha.5"
+    "expo": "^50.0.0-alpha.7"
   },
   "devDependencies": {
     "@types/getenv": "^1.0.1",