@nx/react-native 18.0.0-beta.1 → 18.0.0-canary.20240201-8762c38

package/src/executors/storybook/storybook.impl.ts

@@ -11,6 +11,10 @@ import {
 } from '../sync-deps/sync-deps.impl';
 import { writeFileSync } from 'fs-extra';
 
+/**
+ * TODO (@xiongemi): remove this function in v19.
+ * @deprecated Going to use the default react storybook target. Use @nx/react:storybook executor instead.
+ */
 export default async function* reactNativeStorybookExecutor(
   options: ReactNativeStorybookOptions,
   context: ExecutorContext
@@ -28,21 +32,15 @@ export default async function* reactNativeStorybookExecutor(
   if (fileExists(packageJsonPath))
     displayNewlyAddedDepsMessage(
       context.projectName,
-      await syncDeps(
-        context.projectName,
-        projectRoot,
-        context.root,
-        context.projectGraph,
-        [
-          `@storybook/react-native`,
-          '@storybook/addon-ondevice-actions',
-          '@storybook/addon-ondevice-backgrounds',
-          '@storybook/addon-ondevice-controls',
-          '@storybook/addon-ondevice-notes',
-          '@react-native-async-storage/async-storage',
-          'react-native-safe-area-context',
-        ]
-      )
+      await syncDeps(projectRoot, context.root, [
+        `@storybook/react-native`,
+        '@storybook/addon-ondevice-actions',
+        '@storybook/addon-ondevice-backgrounds',
+        '@storybook/addon-ondevice-controls',
+        '@storybook/addon-ondevice-notes',
+        '@react-native-async-storage/async-storage',
+        'react-native-safe-area-context',
+      ])
     );
 
   runCliStorybook(context.root, options);

package/src/executors/sync-deps/sync-deps.impl.d.ts

@@ -1,8 +1,8 @@
-import { ExecutorContext, ProjectGraph } from '@nx/devkit';
+import { ExecutorContext } from '@nx/devkit';
 import { ReactNativeSyncDepsOptions } from './schema';
 export interface ReactNativeSyncDepsOutput {
     success: boolean;
 }
 export default function syncDepsExecutor(options: ReactNativeSyncDepsOptions, context: ExecutorContext): AsyncGenerator<ReactNativeSyncDepsOutput>;
-export declare function syncDeps(projectName: string, projectRoot: string, workspaceRoot: string, projectGraph: ProjectGraph, include?: string[], exclude?: string[]): Promise<string[]>;
+export declare function syncDeps(projectRoot: string, workspaceRoot: string, include?: string[], exclude?: string[]): Promise<string[]>;
 export declare function displayNewlyAddedDepsMessage(projectName: string, deps: string[]): void;

package/src/executors/sync-deps/sync-deps.impl.js

@@ -4,10 +4,9 @@ exports.displayNewlyAddedDepsMessage = exports.syncDeps = void 0;
 const path_1 = require("path");
 const chalk = require("chalk");
 const devkit_1 = require("@nx/devkit");
-const find_all_npm_dependencies_1 = require("../../utils/find-all-npm-dependencies");
 async function* syncDepsExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(context.projectName, projectRoot, context.root, context.projectGraph, typeof options.include === 'string'
+    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(projectRoot, context.root, typeof options.include === 'string'
         ? options.include.split(',')
         : options.include, typeof options.exclude === 'string'
         ? options.exclude.split(',')
@@ -15,8 +14,11 @@ async function* syncDepsExecutor(options, context) {
     yield { success: true };
 }
 exports.default = syncDepsExecutor;
-async function syncDeps(projectName, projectRoot, workspaceRoot, projectGraph, include = [], exclude = []) {
-    let npmDeps = (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
+async function syncDeps(projectRoot, workspaceRoot, include = [], exclude = []) {
+    const workspacePackageJsonPath = (0, path_1.join)(workspaceRoot, 'package.json');
+    const workspacePackageJson = (0, devkit_1.readJsonFile)(workspacePackageJsonPath);
+    let npmDeps = Object.keys(workspacePackageJson.dependencies || {});
+    let npmDevdeps = Object.keys(workspacePackageJson.devDependencies || {});
     const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
     const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
     const newDeps = [];
@@ -31,13 +33,26 @@ async function syncDeps(projectName, projectRoot, workspaceRoot, projectGraph, i
     if (exclude && exclude.length) {
         npmDeps = npmDeps.filter((dep) => !exclude.includes(dep));
     }
+    if (!packageJson.devDependencies) {
+        packageJson.devDependencies = {};
+    }
+    if (!packageJson.dependencies) {
+        packageJson.dependencies = {};
+    }
     npmDeps.forEach((dep) => {
-        if (!packageJson.dependencies[dep]) {
+        if (!packageJson.dependencies[dep] && !packageJson.devDependencies[dep]) {
             packageJson.dependencies[dep] = '*';
             newDeps.push(dep);
             updated = true;
         }
     });
+    npmDevdeps.forEach((dep) => {
+        if (!packageJson.dependencies[dep] && !packageJson.devDependencies[dep]) {
+            packageJson.devDependencies[dep] = '*';
+            newDeps.push(dep);
+            updated = true;
+        }
+    });
     if (updated) {
         (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
     }

package/src/executors/sync-deps/sync-deps.impl.ts

@@ -3,13 +3,10 @@ import * as chalk from 'chalk';
 import {
   ExecutorContext,
   logger,
-  ProjectGraph,
   readJsonFile,
   writeJsonFile,
 } from '@nx/devkit';
 
-import { findAllNpmDependencies } from '../../utils/find-all-npm-dependencies';
-
 import { ReactNativeSyncDepsOptions } from './schema';
 
 export interface ReactNativeSyncDepsOutput {
@@ -25,10 +22,8 @@ export default async function* syncDepsExecutor(
   displayNewlyAddedDepsMessage(
     context.projectName,
     await syncDeps(
-      context.projectName,
       projectRoot,
       context.root,
-      context.projectGraph,
       typeof options.include === 'string'
         ? options.include.split(',')
         : options.include,
@@ -42,14 +37,16 @@ export default async function* syncDepsExecutor(
 }
 
 export async function syncDeps(
-  projectName: string,
   projectRoot: string,
   workspaceRoot: string,
-  projectGraph: ProjectGraph,
   include: string[] = [],
   exclude: string[] = []
 ): Promise<string[]> {
-  let npmDeps = findAllNpmDependencies(projectGraph, projectName);
+  const workspacePackageJsonPath = join(workspaceRoot, 'package.json');
+  const workspacePackageJson = readJsonFile(workspacePackageJsonPath);
+  let npmDeps = Object.keys(workspacePackageJson.dependencies || {});
+  let npmDevdeps = Object.keys(workspacePackageJson.devDependencies || {});
+
   const packageJsonPath = join(workspaceRoot, projectRoot, 'package.json');
   const packageJson = readJsonFile(packageJsonPath);
   const newDeps = [];
@@ -67,13 +64,27 @@ export async function syncDeps(
     npmDeps = npmDeps.filter((dep) => !exclude.includes(dep));
   }
 
+  if (!packageJson.devDependencies) {
+    packageJson.devDependencies = {};
+  }
+  if (!packageJson.dependencies) {
+    packageJson.dependencies = {};
+  }
+
   npmDeps.forEach((dep) => {
-    if (!packageJson.dependencies[dep]) {
+    if (!packageJson.dependencies[dep] && !packageJson.devDependencies[dep]) {
       packageJson.dependencies[dep] = '*';
       newDeps.push(dep);
       updated = true;
     }
   });
+  npmDevdeps.forEach((dep) => {
+    if (!packageJson.dependencies[dep] && !packageJson.devDependencies[dep]) {
+      packageJson.devDependencies[dep] = '*';
+      newDeps.push(dep);
+      updated = true;
+    }
+  });
 
   if (updated) {
     writeJsonFile(packageJsonPath, packageJson);

package/src/executors/upgrade/schema.d.ts

@@ -0,0 +1 @@
+export interface UpgradeExecutorSchema {}

package/src/executors/upgrade/schema.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "version": 2,
+  "cli": "nx",
+  "$id": "NxReactNativeUpgrade",
+  "title": "React Native Upgrade Executor",
+  "description": "Upgrade React Native code for project.",
+  "type": "object",
+  "properties": {},
+  "required": []
+}

package/src/executors/upgrade/upgrade.impl.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+import { ExecutorContext } from '@nx/devkit';
+import { ChildProcess } from 'child_process';
+import { UpgradeExecutorSchema } from './schema';
+export interface ReactNativeUpgradeOutput {
+    success: boolean;
+}
+/**
+ * This executor is equivalent to `npx react-native upgrade`.
+ * https://github.com/react-native-community/cli/blob/main/packages/cli/src/commands/upgrade/upgrade.ts
+ */
+export default function upgradeExecutor(options: UpgradeExecutorSchema, context: ExecutorContext): AsyncGenerator<ReactNativeUpgradeOutput>;
+export declare function runCliUpgrade(workspaceRoot: string, projectRoot: string): Promise<ChildProcess>;

package/src/executors/upgrade/upgrade.impl.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runCliUpgrade = void 0;
+const path_1 = require("path");
+const child_process_1 = require("child_process");
+/**
+ * This executor is equivalent to `npx react-native upgrade`.
+ * https://github.com/react-native-community/cli/blob/main/packages/cli/src/commands/upgrade/upgrade.ts
+ */
+async function* upgradeExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    await runCliUpgrade(context.root, projectRoot);
+    yield { success: true };
+}
+exports.default = upgradeExecutor;
+function runCliUpgrade(workspaceRoot, projectRoot) {
+    return new Promise((resolve, reject) => {
+        const childProcess = (0, child_process_1.fork)(require.resolve('react-native/cli.js'), ['upgrade'], {
+            stdio: 'inherit',
+            cwd: (0, path_1.resolve)(workspaceRoot, projectRoot),
+            env: process.env,
+        });
+        /**
+         * Ensure the child process is killed when the parent exits
+         */
+        const processExitListener = (signal) => () => {
+            childProcess.kill(signal);
+            process.exit();
+        };
+        process.once('exit', (signal) => childProcess.kill(signal));
+        process.once('SIGTERM', processExitListener);
+        process.once('SIGINT', processExitListener);
+        process.once('SIGQUIT', processExitListener);
+        childProcess.on('error', (err) => {
+            reject(err);
+        });
+        childProcess.on('exit', (code) => {
+            if (code === 0) {
+                resolve(childProcess);
+            }
+            else {
+                reject(code);
+            }
+        });
+    });
+}
+exports.runCliUpgrade = runCliUpgrade;

package/src/executors/upgrade/upgrade.impl.ts

@@ -0,0 +1,64 @@
+import { ExecutorContext } from '@nx/devkit';
+import { resolve as pathResolve } from 'path';
+import { ChildProcess, fork } from 'child_process';
+
+import { UpgradeExecutorSchema } from './schema';
+
+export interface ReactNativeUpgradeOutput {
+  success: boolean;
+}
+
+/**
+ * This executor is equivalent to `npx react-native upgrade`.
+ * https://github.com/react-native-community/cli/blob/main/packages/cli/src/commands/upgrade/upgrade.ts
+ */
+export default async function* upgradeExecutor(
+  options: UpgradeExecutorSchema,
+  context: ExecutorContext
+): AsyncGenerator<ReactNativeUpgradeOutput> {
+  const projectRoot =
+    context.projectsConfigurations.projects[context.projectName].root;
+
+  await runCliUpgrade(context.root, projectRoot);
+  yield { success: true };
+}
+
+export function runCliUpgrade(
+  workspaceRoot: string,
+  projectRoot: string
+): Promise<ChildProcess> {
+  return new Promise<ChildProcess>((resolve, reject) => {
+    const childProcess = fork(
+      require.resolve('react-native/cli.js'),
+      ['upgrade'],
+      {
+        stdio: 'inherit',
+        cwd: pathResolve(workspaceRoot, projectRoot),
+        env: process.env,
+      }
+    );
+
+    /**
+     * Ensure the child process is killed when the parent exits
+     */
+    const processExitListener = (signal?: number | NodeJS.Signals) => () => {
+      childProcess.kill(signal);
+      process.exit();
+    };
+    process.once('exit', (signal) => childProcess.kill(signal));
+    process.once('SIGTERM', processExitListener);
+    process.once('SIGINT', processExitListener);
+    process.once('SIGQUIT', processExitListener);
+
+    childProcess.on('error', (err) => {
+      reject(err);
+    });
+    childProcess.on('exit', (code) => {
+      if (code === 0) {
+        resolve(childProcess);
+      } else {
+        reject(code);
+      }
+    });
+  });
+}

package/src/generators/application/application.js

@@ -3,18 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeApplicationGeneratorInternal = exports.reactNativeApplicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const symlink_task_1 = require("../../utils/symlink-task");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
 const chmod_android_gradle_files_1 = require("../../utils/chmod-android-gradle-files");
 const pod_install_task_1 = require("../../utils/pod-install-task");
+const web_configuration_1 = require("../web-configuration/web-configuration");
 const normalize_options_1 = require("./lib/normalize-options");
 const init_1 = require("../init/init");
 const add_project_1 = require("./lib/add-project");
 const create_application_files_1 = require("./lib/create-application-files");
-const add_detox_1 = require("./lib/add-detox");
+const add_e2e_1 = require("./lib/add-e2e");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const sync_deps_impl_1 = require("../../executors/sync-deps/sync-deps.impl");
 async function reactNativeApplicationGenerator(host, schema) {
     return await reactNativeApplicationGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -47,16 +48,29 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     tasks.push(lintTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
     tasks.push(jestTask);
-    const detoxTask = await (0, add_detox_1.addDetox)(host, options);
-    tasks.push(detoxTask);
-    const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
-    tasks.push(symlinkTask);
+    const webTask = await (0, web_configuration_1.webConfigurationGenerator)(host, {
+        ...options,
+        project: options.name,
+        skipFormat: true,
+    });
+    tasks.push(webTask);
+    const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
+    tasks.push(e2eTask);
     const chmodTaskGradlewTask = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)((0, devkit_1.joinPathFragments)(host.root, options.androidProjectRoot));
     tasks.push(chmodTaskGradlewTask);
     const podInstallTask = (0, pod_install_task_1.runPodInstall)((0, devkit_1.joinPathFragments)(host.root, options.iosProjectRoot));
     if (options.install) {
+        await (0, sync_deps_impl_1.syncDeps)(options.appProjectRoot, host.root);
         tasks.push(podInstallTask);
     }
+    else {
+        devkit_1.output.log({
+            title: 'Skip `pod install`',
+            bodyLines: [
+                `run 'nx run ${options.name}:pod-install' to install native modules before running iOS app`,
+            ],
+        });
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/application.spec.ts

@@ -24,6 +24,8 @@ describe('app', () => {
       e2eTestRunner: 'none',
       install: false,
       projectNameAndRootFormat: 'as-provided',
+      unitTestRunner: 'none',
+      bundler: 'vite',
     });
     const projects = getProjects(appTree);
 
@@ -39,6 +41,8 @@ describe('app', () => {
       e2eTestRunner: 'none',
       install: false,
       projectNameAndRootFormat: 'as-provided',
+      unitTestRunner: 'none',
+      bundler: 'vite',
     });
 
     const projectConfiguration = readProjectConfiguration(appTree, 'my-app');
@@ -55,6 +59,8 @@ describe('app', () => {
       e2eTestRunner: 'none',
       install: false,
       projectNameAndRootFormat: 'as-provided',
+      unitTestRunner: 'jest',
+      bundler: 'vite',
     });
     expect(appTree.exists('my-app/src/app/App.tsx')).toBeTruthy();
     expect(appTree.exists('my-app/src/main.tsx')).toBeTruthy();
@@ -74,6 +80,17 @@ describe('app', () => {
         moduleNameMapper: {
           '\\\\.svg$': '@nx/react-native/plugins/jest/svg-mock',
         },
+        transform: {
+          '^.+.(js|ts|tsx)$': [
+            'babel-jest',
+            {
+              configFile: __dirname + '/.babelrc.js',
+            },
+          ],
+          '^.+.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$': require.resolve(
+            'react-native/jest/assetFileTransformer.js'
+          ),
+        },
         coverageDirectory: '../coverage/my-app',
       };
       "
@@ -88,6 +105,8 @@ describe('app', () => {
       e2eTestRunner: 'none',
       install: false,
       projectNameAndRootFormat: 'as-provided',
+      unitTestRunner: 'jest',
+      bundler: 'vite',
     });
     const targets = readProjectConfiguration(appTree, 'my-app').targets;
     expect(targets.test).toBeDefined();
@@ -103,6 +122,8 @@ describe('app', () => {
       e2eTestRunner: 'none',
       install: false,
       projectNameAndRootFormat: 'as-provided',
+      unitTestRunner: 'none',
+      bundler: 'vite',
     });
 
     const tsconfig = readJson(appTree, 'my-app/tsconfig.json');
@@ -118,6 +139,8 @@ describe('app', () => {
         e2eTestRunner: 'detox',
         install: false,
         projectNameAndRootFormat: 'as-provided',
+        bundler: 'vite',
+        unitTestRunner: 'none',
       });
 
       const projects = getProjects(appTree);
@@ -168,6 +191,8 @@ describe('app', () => {
         e2eTestRunner: 'detox',
         install: false,
         projectNameAndRootFormat: 'as-provided',
+        bundler: 'vite',
+        unitTestRunner: 'none',
       });
 
       const projects = getProjects(appTree);
@@ -223,6 +248,8 @@ describe('app', () => {
         install: false,
         skipPackageJson: true,
         projectNameAndRootFormat: 'as-provided',
+        unitTestRunner: 'none',
+        bundler: 'webpack',
       });
 
       expect(readJson(appTree, 'package.json')).toEqual(packageJsonBefore);

package/src/generators/application/files/app/.babelrc.js.template

@@ -0,0 +1,23 @@
+module.exports = function (api) {
+  api.cache(true);
+
+  if (
+    process.env.NX_TASK_TARGET_TARGET === 'build' ||
+    process.env.NX_TASK_TARGET_TARGET.includes('storybook')
+  ) {
+    return {
+      presets: [
+        [
+          '@nx/react/babel',
+          {
+            runtime: 'automatic',
+          },
+        ],
+      ],
+    };
+  }
+
+  return {
+    presets: [['module:@react-native/babel-preset',  { "useTransformReactJSX": true }]],
+  };
+};

package/src/generators/application/files/app/android/app/build.gradle.template

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 
 /**
@@ -9,12 +10,12 @@ react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
     // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
+    //   The folder where the react-native NPM package is. Default is <%= offsetFromRoot %>../../node_modules/react-native
+    reactNativeDir = file("<%= offsetFromRoot %>../../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is <%= offsetFromRoot %>../../node_modules/@react-native/codegen
+    codegenDir = file("<%= offsetFromRoot %>../../node_modules/@react-native/codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is <%= offsetFromRoot %>../../node_modules/react-native/cli.js
+    cliFile = file("<%= offsetFromRoot %>../../node_modules/react-native/cli.js")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -36,7 +37,7 @@ react {
     // bundleAssetName = "MyApplication.android.bundle"
     //
     //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    // entryFile = file("../js/MyApplication.android.js")
+    entryFile = file("../../<%= entryFile %>")
     //
     //   A list of extra flags to pass to the 'bundle' commands.
     //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
@@ -48,7 +49,6 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
-    entryFile = file("../../<%= entryFile %>")
 }
 
 /**
@@ -71,8 +71,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
-
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.<%= lowerCaseName %>"
     defaultConfig {
@@ -81,10 +81,6 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        <% if (e2eTestRunner === 'detox') { %>
-        testBuildType System.getProperty('testBuildType', 'debug')
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        <% } %>
     }
     signingConfigs {
         debug {
@@ -104,27 +100,15 @@ android {
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            <% if (e2eTestRunner === 'detox') { %>
-            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
-            <% } %>
         }
     }
 }
 
 dependencies {
-    <% if (e2eTestRunner === 'detox') { %>
-    androidTestImplementation('com.wix:detox:+')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    <% } %>
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
+    implementation("com.facebook.react:flipper-integration")
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {
@@ -132,4 +116,4 @@ dependencies {
     }
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: file("<%= offsetFromRoot %>../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

package/src/generators/application/files/app/android/app/src/debug/AndroidManifest.xml.template

@@ -2,13 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning"
-        android:networkSecurityConfig="@xml/network_security_config">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
+        android:networkSecurityConfig="@xml/network_security_config"
+        tools:ignore="GoogleAppIndexingWarning"/>
 </manifest>

package/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/MainActivity.kt.template

@@ -0,0 +1,22 @@
+package com.<%= lowerCaseName %>
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+
+class MainActivity : ReactActivity() {
+
+  /**
+   * Returns the name of the main component registered from JavaScript. This is used to schedule
+   * rendering of the component.
+   */
+  override fun getMainComponentName(): String = "<%= className %>"
+
+  /**
+   * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
+   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
+   */
+  override fun createReactActivityDelegate(): ReactActivityDelegate =
+      DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+}