@nx/react-native 21.4.0-beta.11 → 21.4.0-beta.12

package/.eslintrc.json

@@ -24,7 +24,6 @@
           {
             "buildTargets": ["build-base"],
             "ignoredDependencies": [
-              "tslib",
               "nx",
               "eslint",
               "prettier",
@@ -33,6 +32,7 @@
               "react-native",
 
               // These are in ensurePackage
+              "@nx/jest",
               "@nx/rollup",
               "@nx/storybook",
               "@nx/vite",
@@ -51,6 +51,7 @@
       "rules": {
         "no-restricted-imports": [
           "error",
+          "@nx/workspace",
           {
             "name": "fs-extra",
             "message": "Please use equivalent utilities from `node:fs` instead."

package/generators.json

@@ -29,11 +29,6 @@
       "description": "Create a React Native component.",
       "aliases": ["c"]
     },
-    "upgrade-native": {
-      "factory": "./src/generators/upgrade-native/upgrade-native#reactNativeUpgradeNativeGenerator",
-      "schema": "./src/generators/upgrade-native/schema.json",
-      "description": "Destructive command to upgrade native iOS and Android code to latest."
-    },
     "web-configuration": {
       "factory": "./src/generators/web-configuration/web-configuration#webConfigurationGenerator",
       "schema": "./src/generators/web-configuration/schema.json",

package/migrations.json

@@ -5,6 +5,18 @@
       "version": "19.6.0-beta.1",
       "description": "Rename upgrade target name to fix casing.",
       "implementation": "./src/migrations/update-19-6-0/rename-upgrade-target-name"
+    },
+    "update-21-4-0-remove-deprecated-deps": {
+      "version": "21.4.0-beta.0",
+      "cli": "nx",
+      "description": "Remove deprecated dependencies from package.json",
+      "factory": "./src/migrations/update-21-4-0/remove-deprecated-deps"
+    },
+    "update-21-4-0-upgrade-react-native-projects": {
+      "version": "21.4.0-beta.0",
+      "cli": "nx",
+      "description": "Run nx upgrade for each React Native project",
+      "factory": "./src/migrations/update-21-4-0/upgrade-react-native-projects"
     }
   },
   "packageJsonUpdates": {
@@ -167,6 +179,79 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "21.4.0": {
+      "version": "21.4.0-beta.0",
+      "packages": {
+        "react-native": {
+          "version": "~0.79.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-native-community/cli": {
+          "version": "~18.0.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@react-native-community/cli-platform-android": {
+          "version": "~18.0.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@react-native-community/cli-platform-ios": {
+          "version": "~18.0.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@react-native/babel-preset": {
+          "version": "~0.79.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-native/metro-config": {
+          "version": "~0.79.3",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-web": {
+          "version": "~0.20.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react": {
+          "version": "19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-dom": {
+          "version": "19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-test-renderer": {
+          "version": "~19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react": {
+          "version": "~19.0.10",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-dom": {
+          "version": "~19.0.6",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react-native": {
+          "version": "~13.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg-transformer": {
+          "version": "~1.5.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "~15.11.2",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg-web": {
+          "version": "~1.0.9",
+          "alwaysAddToPackageJson": false
+        },
+        "@babel/runtime": {
+          "version": "~7.27.6",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "21.4.0-beta.11",
+  "version": "21.4.0-beta.12",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -26,26 +26,25 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/detox": "21.4.0-beta.11",
-    "@nx/devkit": "21.4.0-beta.11",
-    "@nx/eslint": "21.4.0-beta.11",
-    "@nx/jest": "21.4.0-beta.11",
-    "@nx/js": "21.4.0-beta.11",
-    "@nx/react": "21.4.0-beta.11",
-    "@nx/rollup": "21.4.0-beta.11",
-    "@nx/workspace": "21.4.0-beta.11",
+    "@nx/devkit": "21.4.0-beta.12",
+    "@nx/js": "21.4.0-beta.12",
+    "@nx/eslint": "21.4.0-beta.12",
+    "@nx/react": "21.4.0-beta.12",
     "ajv": "^8.12.0",
     "enhanced-resolve": "^5.8.3",
-    "glob": "7.1.4",
     "ignore": "^5.0.4",
-    "metro-config": "~0.80.4",
-    "metro-resolver": "~0.80.4",
     "picocolors": "^1.1.0",
+    "tinyglobby": "^0.2.12",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0"
   },
-  "devDependencies": {
-    "nx": "21.4.0-beta.11"
+  "peerDependencies": {
+    "metro-config": ">= 0.82.0",
+    "metro-resolver": ">= 0.82.0"
+  },
+  "optionalDependencies": {
+    "@nx/detox": "21.4.0-beta.12",
+    "@nx/rollup": "21.4.0-beta.12"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/metro-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metro-resolver.d.ts","sourceRoot":"","sources":["../../../../packages/react-native/plugins/metro-resolver.ts"],"names":[],"mappings":"AAeA,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,qBAAqB,GAAE,MAAM,EAAO,EACpC,UAAU,GAAE,MAAM,EAAO,IAGvB,UAAU,GAAG,EACb,gBAAgB,MAAM,EACtB,UAAU,MAAM,GAAG,IAAI,SAwC1B"}
+{"version":3,"file":"metro-resolver.d.ts","sourceRoot":"","sources":["../../../../packages/react-native/plugins/metro-resolver.ts"],"names":[],"mappings":"AAiCA,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,qBAAqB,GAAE,MAAM,EAAO,EACpC,UAAU,GAAE,MAAM,EAAO,IAGvB,UAAU,GAAG,EACb,gBAAgB,MAAM,EACtB,UAAU,MAAM,GAAG,IAAI,SAwC1B"}

package/plugins/metro-resolver.js

@@ -1,13 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResolveRequest = getResolveRequest;
-const metroResolver = require("metro-resolver");
 const tsconfig_paths_1 = require("tsconfig-paths");
 const pc = require("picocolors");
 const enhanced_resolve_1 = require("enhanced-resolve");
 const path_1 = require("path");
 const fs = require("fs");
 const devkit_1 = require("@nx/devkit");
+// Cache for metro-resolver module
+let metroResolver = null;
+/**
+ * Lazily require metro-resolver to handle cases where it might not be installed
+ */
+function getMetroResolver() {
+    if (!metroResolver) {
+        try {
+            metroResolver = require('metro-resolver');
+        }
+        catch (error) {
+            throw new Error('metro-resolver is required but not installed. Please install metro-resolver >= 0.82.0');
+        }
+    }
+    return metroResolver;
+}
 /*
  * Use tsconfig to resolve additional workspace libs.
  *
@@ -46,7 +61,8 @@ function resolveRequestFromContext(resolveRequest, context, realModuleName, plat
  */
 function defaultMetroResolver(context, realModuleName, platform, debug) {
     try {
-        return metroResolver.resolve(context, realModuleName, platform);
+        const resolver = getMetroResolver();
+        return resolver.resolve(context, realModuleName, platform);
     }
     catch {
         if (debug)
@@ -60,7 +76,7 @@ function defaultMetroResolver(context, realModuleName, platform, debug) {
  */
 function pnpmResolver(extensions, context, realModuleName, debug, exportsConditionNames = [], mainFields = []) {
     try {
-        const pnpmResolve = getPnpmResolver(extensions);
+        const pnpmResolve = getPnpmResolver(extensions, exportsConditionNames, mainFields);
         const lookupStartPath = (0, path_1.dirname)(context.originModulePath);
         const filePath = pnpmResolve.resolveSync({}, lookupStartPath, realModuleName);
         if (filePath) {
@@ -80,7 +96,8 @@ function tsconfigPathsResolver(context, extensions, realModuleName, platform, de
     try {
         const tsConfigPathMatcher = getMatcher(debug);
         const match = tsConfigPathMatcher(realModuleName, undefined, undefined, extensions.map((ext) => `.${ext}`));
-        return metroResolver.resolve(context, match, platform);
+        const resolver = getMetroResolver();
+        return resolver.resolve(context, match, platform);
     }
     catch {
         if (debug) {
@@ -115,14 +132,15 @@ function getMatcher(debug) {
  * This function returns resolver for pnpm.
  * It is inspired form https://github.com/vjpr/pnpm-expo-example/blob/main/packages/pnpm-expo-helper/util/make-resolver.js.
  */
-let resolver;
+let pnpmpResolver;
 function getPnpmResolver(extensions, exportsConditionNames = [], mainFields = []) {
-    if (!resolver) {
+    if (!pnpmpResolver) {
         // Create a filesystem adapter that matches enhanced-resolve's expected interface
+        // The issue is that Node.js fs types allow withFileTypes: true, but enhanced-resolve expects withFileTypes?: false
         // This is compatible with the latest version of enhanced-resolve and is the intended way to use it.
         // See https://github.com/webpack/enhanced-resolve/commit/d55471f20c17bce4def0b53cfe0b7027e7b48d82
         const fileSystem = new enhanced_resolve_1.CachedInputFileSystem(fs, 4000);
-        resolver = enhanced_resolve_1.ResolverFactory.createResolver({
+        pnpmpResolver = enhanced_resolve_1.ResolverFactory.createResolver({
             fileSystem,
             extensions: extensions.map((extension) => '.' + extension),
             useSyncFileSystemCalls: true,
@@ -140,5 +158,5 @@ function getPnpmResolver(extensions, exportsConditionNames = [], mainFields = []
             aliasFields: ['browser'],
         });
     }
-    return resolver;
+    return pnpmpResolver;
 }

package/plugins/with-nx-metro.d.ts

@@ -1,4 +1,4 @@
-import type { MetroConfig } from 'metro-config';
+type MetroConfig = any;
 interface WithNxOptions {
     /**
      * Change this to true to see debugging info.
@@ -21,6 +21,6 @@ interface WithNxOptions {
      */
     mainFields?: string[];
 }
-export declare function withNxMetro(userConfig: MetroConfig, opts?: WithNxOptions): Promise<import("metro-config").ConfigT>;
+export declare function withNxMetro(userConfig: MetroConfig, opts?: WithNxOptions): Promise<any>;
 export {};
 //# sourceMappingURL=with-nx-metro.d.ts.map

package/plugins/with-nx-metro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-nx-metro.d.ts","sourceRoot":"","sources":["../../../../packages/react-native/plugins/with-nx-metro.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMhD,UAAU,aAAa;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAKxB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAsB,WAAW,CAC/B,UAAU,EAAE,WAAW,EACvB,IAAI,GAAE,aAAkB,2CAmCzB"}
+{"version":3,"file":"with-nx-metro.d.ts","sourceRoot":"","sources":["../../../../packages/react-native/plugins/with-nx-metro.ts"],"names":[],"mappings":"AAuBA,KAAK,WAAW,GAAG,GAAG,CAAC;AAIvB,UAAU,aAAa;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAKxB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAsB,WAAW,CAC/B,UAAU,EAAE,WAAW,EACvB,IAAI,GAAE,aAAkB,gBAoCzB"}

package/plugins/with-nx-metro.js

@@ -2,9 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNxMetro = withNxMetro;
 const devkit_1 = require("@nx/devkit");
-const metro_config_1 = require("metro-config");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
+// Cache for metro-config module
+let metroConfig = null;
+/**
+ * Lazily require metro-config to handle cases where it might not be installed
+ */
+function getMetroConfig() {
+    if (!metroConfig) {
+        try {
+            metroConfig = require('metro-config');
+        }
+        catch (error) {
+            throw new Error('metro-config is required but not installed. Please install metro-config >= 0.82.0');
+        }
+    }
+    return metroConfig;
+}
 const metro_resolver_1 = require("./metro-resolver");
 async function withNxMetro(userConfig, opts = {}) {
     const extensions = ['', 'ts', 'tsx', 'js', 'jsx', 'json'];
@@ -27,5 +42,6 @@ async function withNxMetro(userConfig, opts = {}) {
         },
         watchFolders,
     };
-    return (0, metro_config_1.mergeConfig)(userConfig, nxConfig);
+    const { mergeConfig } = getMetroConfig();
+    return mergeConfig(userConfig, nxConfig);
 }

package/src/executors/bundle/bundle.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/bundle/bundle.impl.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,eAAe,EAAE,MAAM,YAAY,CAAC;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAA+B,cAAc,CAC3C,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC,uBAAuB,CAAC,CAUzC"}
+{"version":3,"file":"bundle.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/bundle/bundle.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,eAAe,EAAE,MAAM,YAAY,CAAC;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAGpD,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAA+B,cAAc,CAC3C,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC,uBAAuB,CAAC,CAUzC"}

package/src/executors/bundle/bundle.impl.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bundleExecutor;
-const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
+const fs_1 = require("fs");
 async function* bundleExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     options.bundleOutput = (0, path_1.join)(context.root, options.bundleOutput);
-    (0, fileutils_1.createDirectory)((0, path_1.dirname)(options.bundleOutput));
+    (0, fs_1.mkdirSync)((0, path_1.dirname)(options.bundleOutput));
     await runCliBuild(context.root, projectRoot, options);
     yield { success: true };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"storybook.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAwB,MAAM,YAAY,CAAC;AAKnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAOvD;;;GAGG;AACH,wBAA+B,4BAA4B,CACzD,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA2CtC;AAED,wBAAgB,eAAe,CAC7B,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,2BAA2B,QAwBrC"}
+{"version":3,"file":"storybook.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAwB,MAAM,YAAY,CAAC;AAInE,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAOvD;;;GAGG;AACH,wBAA+B,4BAA4B,CACzD,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA2CtC;AAED,wBAAgB,eAAe,CAC7B,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,2BAA2B,QAwBrC"}

package/src/executors/storybook/storybook.impl.js

@@ -5,9 +5,8 @@ exports.runCliStorybook = runCliStorybook;
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
-const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
 const pc = require("picocolors");
-const glob_1 = require("glob");
+const tinyglobby_1 = require("tinyglobby");
 const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 /**
  * TODO (@xiongemi): remove this function in v20.
@@ -22,7 +21,7 @@ async function* reactNativeStorybookExecutor(options, context) {
     const workspacePackageJsonPath = (0, path_1.join)(context.root, 'package.json');
     const workspacePackageJson = (0, devkit_1.readJsonFile)(workspacePackageJsonPath);
     const projectPackageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
-    if (isSyncDepsEnabled && (0, fileutils_1.fileExists)(packageJsonPath))
+    if (isSyncDepsEnabled && (0, node_fs_1.existsSync)(packageJsonPath))
         (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, await (0, sync_deps_impl_1.syncDeps)(context.projectName, projectPackageJson, packageJsonPath, workspacePackageJson, context.projectGraph, [
             `@storybook/react-native`,
             '@storybook/addon-ondevice-actions',
@@ -37,7 +36,7 @@ async function* reactNativeStorybookExecutor(options, context) {
 }
 function runCliStorybook(workspaceRoot, options) {
     const storiesFiles = options.searchDir.flatMap((dir) => {
-        const storyFilePaths = (0, glob_1.sync)((0, path_1.join)(dir, options.pattern));
+        const storyFilePaths = (0, tinyglobby_1.globSync)((0, path_1.join)(dir, options.pattern));
         return storyFilePaths.map((storyFilePath) => {
             const loaderPath = (0, path_1.resolve)((0, path_1.dirname)(options.outputFile));
             return (0, path_1.relative)(loaderPath, storyFilePath);

package/src/generators/application/application.js

@@ -41,7 +41,7 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
     if (!options.skipPackageJson) {
-        tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(host, options.unitTestRunner));
     }
     await (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);

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

@@ -63,14 +63,14 @@ def enableProguardInReleaseBuilds = false
  * The preferred build flavor of JavaScriptCore (JSC)
  *
  * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ * `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
  *
  * The international variant includes ICU i18n library and necessary data
  * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
  * give correct results when using with locales other than en-US. Note that
  * this variant is about 6MiB larger per architecture than default.
  */
-def jscFlavor = 'org.webkit:android-jsc:+'
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion

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

@@ -5,6 +5,5 @@
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
-        android:networkSecurityConfig="@xml/network_security_config"
         tools:ignore="GoogleAppIndexingWarning"/>
 </manifest>

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

@@ -9,8 +9,7 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme"
-      android:supportsRtl="true"
-      android:networkSecurityConfig="@xml/network_security_config">
+      android:supportsRtl="true">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

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

@@ -3,9 +3,9 @@ buildscript {
         buildToolsVersion = "35.0.0"
         minSdkVersion = 24
         compileSdkVersion = 35
-        targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.24"
+        targetSdkVersion = 35
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
     }
     repositories {
         google()

package/src/generators/application/files/app/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/src/generators/application/files/app/android/gradlew.template

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

package/src/generators/application/files/app/ios/.xcode.env.template

@@ -9,4 +9,3 @@
 # For example, to use nvm with brew, add the following line
 # . "$(brew --prefix nvm)/nvm.sh" --no-use
 export NODE_BINARY=$(command -v node)
-export ENTRY_FILE="${PROJECT_DIR}/../<%= entryFile %>"

package/src/generators/application/files/app/ios/Podfile.template

@@ -23,11 +23,6 @@ target '<%= className %>' do
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
-  target '<%= className %>Tests' do
-    inherit! :complete
-    # Pods for testing
-  end
-
   post_install do |installer|
     # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
     react_native_post_install(

package/src/generators/application/files/app/ios/__className__/AppDelegate.swift.template

@@ -0,0 +1,48 @@
+import UIKit
+import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+  var window: UIWindow?
+
+  var reactNativeDelegate: ReactNativeDelegate?
+  var reactNativeFactory: RCTReactNativeFactory?
+
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    let delegate = ReactNativeDelegate()
+    let factory = RCTReactNativeFactory(delegate: delegate)
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+
+    reactNativeDelegate = delegate
+    reactNativeFactory = factory
+
+    window = UIWindow(frame: UIScreen.main.bounds)
+
+    factory.startReactNative(
+      withModuleName: "<%= className %>",
+      in: window,
+      launchOptions: launchOptions
+    )
+
+    return true
+  }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+#if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "src/main")
+#else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+}

package/src/generators/application/files/app/ios/__className__/PrivacyInfo.xcprivacy

@@ -2,37 +2,36 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>NSPrivacyCollectedDataTypes</key>
-  <array>
-  </array>
-  <key>NSPrivacyAccessedAPITypes</key>
-  <array>
-    <dict>
-      <key>NSPrivacyAccessedAPIType</key>
-      <string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
-      <key>NSPrivacyAccessedAPITypeReasons</key>
-      <array>
-        <string>C617.1</string>
-      </array>
-    </dict>
-    <dict>
-      <key>NSPrivacyAccessedAPIType</key>
-      <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
-      <key>NSPrivacyAccessedAPITypeReasons</key>
-      <array>
-        <string>CA92.1</string>
-      </array>
-    </dict>
-    <dict>
-      <key>NSPrivacyAccessedAPIType</key>
-      <string>NSPrivacyAccessedAPICategorySystemBootTime</string>
-      <key>NSPrivacyAccessedAPITypeReasons</key>
-      <array>
-        <string>35F9.1</string>
-      </array>
-    </dict>
-  </array>
-  <key>NSPrivacyTracking</key>
-  <false/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>35F9.1</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
 </dict>
 </plist>