@nx/react-native 17.0.3 → 17.0.5

package/src/utils/add-linting.js

@@ -14,9 +14,9 @@ async function addLinting(host, options) {
         linter: options.linter,
         project: options.projectName,
         tsConfigPaths: options.tsConfigPaths,
-        eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
         skipFormat: true,
         skipPackageJson: options.skipPackageJson,
+        addPlugin: options.addPlugin,
     });
     tasks.push(lintTask);
     if ((0, eslint_file_1.isEslintConfigSupported)(host)) {

package/src/utils/add-linting.spec.ts

@@ -15,21 +15,19 @@ describe('Add Linting', () => {
     });
   });
 
-  it('should add update configuration when eslint is passed', () => {
-    addLinting(tree, {
+  it('should add a .eslintrc.json when is passed', async () => {
+    await addLinting(tree, {
       projectName: 'my-lib',
       linter: Linter.EsLint,
       tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'],
       projectRoot: 'libs/my-lib',
     });
-    const project = readProjectConfiguration(tree, 'my-lib');
 
-    expect(project.targets.lint).toBeDefined();
-    expect(project.targets.lint.executor).toEqual('@nx/eslint:lint');
+    expect(tree.exists('libs/my-lib/.eslintrc.json')).toBeTruthy();
   });
 
   it('should not add lint target when "none" is passed', async () => {
-    addLinting(tree, {
+    await addLinting(tree, {
       projectName: 'my-lib',
       linter: Linter.None,
       tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'],

package/src/utils/chmod-android-gradle-files.js

@@ -5,8 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");
 function chmodAndroidGradlewFiles(androidFolder) {
-    (0, fs_1.chmodSync)((0, path_1.join)(androidFolder, 'gradlew'), 0o775);
-    (0, fs_1.chmodSync)((0, path_1.join)(androidFolder, 'gradlew.bat'), 0o775);
+    if ((0, fs_1.existsSync)((0, path_1.join)(androidFolder, 'gradlew'))) {
+        (0, fs_1.chmodSync)((0, path_1.join)(androidFolder, 'gradlew'), 0o775);
+    }
+    if ((0, fs_1.existsSync)((0, path_1.join)(androidFolder, 'gradlew.bat'))) {
+        (0, fs_1.chmodSync)((0, path_1.join)(androidFolder, 'gradlew.bat'), 0o775);
+    }
 }
 exports.chmodAndroidGradlewFiles = chmodAndroidGradlewFiles;
 function chmodAndroidGradlewFilesTask(androidFolder) {

package/src/utils/ensure-dependencies.d.ts

@@ -0,0 +1,2 @@
+import { GeneratorCallback, Tree } from '@nx/devkit';
+export declare function ensureDependencies(tree: Tree): GeneratorCallback;

package/src/utils/ensure-dependencies.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("@nx/react/src/utils/versions");
+const versions_2 = require("./versions");
+function ensureDependencies(tree) {
+    const isPnpm = (0, devkit_1.detectPackageManager)(tree.root) === 'pnpm';
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@types/node': versions_2.typesNodeVersion,
+        '@types/react': versions_2.typesReactVersion,
+        '@react-native/babel-preset': versions_2.reactNativeBabelPresetVersion,
+        '@react-native/metro-config': versions_2.reactNativeMetroConfigVersion,
+        '@testing-library/react-native': versions_2.testingLibraryReactNativeVersion,
+        '@testing-library/jest-native': versions_2.testingLibraryJestNativeVersion,
+        '@react-native-community/cli-platform-android': versions_2.reactNativeCommunityCliPlatformAndroidVersion,
+        'jest-react-native': versions_2.jestReactNativeVersion,
+        'react-test-renderer': versions_2.reactTestRendererVersion,
+        'react-native-svg-transformer': versions_2.reactNativeSvgTransformerVersion,
+        'react-native-svg': versions_2.reactNativeSvgVersion,
+        '@babel/preset-react': versions_1.babelPresetReactVersion,
+        '@babel/core': versions_1.babelCoreVersion,
+        ...(isPnpm
+            ? {
+                '@babel/runtime': versions_2.babelRuntimeVersion, // @babel/runtime is used by react-native-svg
+            }
+            : {}),
+    });
+}
+exports.ensureDependencies = ensureDependencies;

package/src/utils/find-all-npm-dependencies.js

@@ -8,11 +8,13 @@ function findAllNpmDependencies(graph, projectName, list = [], seen = new Set())
     }
     seen.add(projectName);
     const node = graph.externalNodes[projectName];
-    // Don't want to include '@nx/react-native' because React Native
+    // Don't want to include '@nx/react-native' and '@nx/expo' because React Native
     // autolink will warn that the package has no podspec file for iOS.
     if (node) {
-        if (node.name !== 'npm:@nx/react-native' &&
-            node.name !== 'npm:@nrwl/react-native') {
+        if (node.name !== `npm:@nx/react-native` &&
+            node.name !== `npm:@nrwl/react-native` &&
+            node.name !== `npm:@nx/expo` &&
+            node.name !== `npm:@nrwl/expo`) {
             list.push(node.data.packageName);
         }
     }

package/src/utils/find-all-npm-dependencies.spec.ts

@@ -1,5 +1,5 @@
 import { findAllNpmDependencies } from './find-all-npm-dependencies';
-import { ProjectGraph } from '@nx/devkit';
+import { DependencyType, ProjectGraph } from '@nx/devkit';
 
 test('findAllNpmDependencies', () => {
   const graph: ProjectGraph = {
@@ -61,26 +61,34 @@ test('findAllNpmDependencies', () => {
     },
     dependencies: {
       myapp: [
-        { type: 'static', source: 'myapp', target: 'lib1' },
-        { type: 'static', source: 'myapp', target: 'lib2' },
+        { type: DependencyType.static, source: 'myapp', target: 'lib1' },
+        { type: DependencyType.static, source: 'myapp', target: 'lib2' },
         {
-          type: 'static',
+          type: DependencyType.static,
           source: 'myapp',
           target: 'npm:react-native-image-picker',
         },
         {
-          type: 'static',
+          type: DependencyType.static,
           source: 'myapp',
           target: 'npm:@nx/react-native',
         },
       ],
       lib1: [
-        { type: 'static', source: 'lib1', target: 'lib2' },
-        { type: 'static', source: 'lib3', target: 'npm:react-native-snackbar' },
+        { type: DependencyType.static, source: 'lib1', target: 'lib2' },
+        {
+          type: DependencyType.static,
+          source: 'lib3',
+          target: 'npm:react-native-snackbar',
+        },
       ],
-      lib2: [{ type: 'static', source: 'lib2', target: 'lib3' }],
+      lib2: [{ type: DependencyType.static, source: 'lib2', target: 'lib3' }],
       lib3: [
-        { type: 'static', source: 'lib3', target: 'npm:react-native-dialog' },
+        {
+          type: DependencyType.static,
+          source: 'lib3',
+          target: 'npm:react-native-dialog',
+        },
       ],
     },
   };

package/src/utils/testing-generators.js

@@ -14,6 +14,7 @@ async function createApp(tree, appName) {
         e2eTestRunner: 'none',
         install: false,
         projectNameAndRootFormat: 'as-provided',
+        bundler: 'webpack',
     });
 }
 exports.createApp = createApp;

package/src/utils/versions.d.ts

@@ -1,20 +1,17 @@
 export declare const nxVersion: any;
-export declare const reactNativeVersion = "0.72.4";
-export declare const typesNodeVersion = "18.14.4";
-export declare const metroVersion = "0.76.7";
-export declare const reactNativeMetroConfigVersion = "^0.72.11";
-export declare const reactNativeCommunityCli = "11.3.6";
-export declare const reactNativeCommunityCliIos = "11.3.6";
-export declare const reactNativeCommunityCliAndroid = "11.3.6";
+export declare const reactNativeVersion = "0.73.2";
+export declare const typesNodeVersion = "18.16.9";
+export declare const reactNativeCommunityCliPlatformAndroidVersion = "12.3.0";
+export declare const reactNativeBabelPresetVersion = "^0.73.18";
+export declare const reactNativeMetroConfigVersion = "^0.73.2";
+export declare const reactNativeWebVersion = "^0.19.9";
 export declare const reactVersion = "18.2.0";
 export declare const reactDomVersion = "18.2.0";
 export declare const reactTestRendererVersion = "18.2.0";
-export declare const typesReactVersion = "18.0.28";
-export declare const testingLibraryReactNativeVersion = "~12.3.0";
+export declare const typesReactVersion = "~18.2.45";
+export declare const testingLibraryReactNativeVersion = "~12.4.2";
 export declare const testingLibraryJestNativeVersion = "~5.4.3";
 export declare const jestReactNativeVersion = "18.0.0";
-export declare const reactNativeSvgTransformerVersion = "1.0.0";
-export declare const reactNativeSvgVersion = "13.9.0";
+export declare const reactNativeSvgTransformerVersion = "1.2.0";
+export declare const reactNativeSvgVersion = "14.1.0";
 export declare const babelRuntimeVersion = "7.22.6";
-export declare const reactNativeAsyncStorageVersion = "~1.19.3";
-export declare const reactNativeSafeAreaContextVersion = "~4.7.2";

package/src/utils/versions.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reactNativeSafeAreaContextVersion = exports.reactNativeAsyncStorageVersion = exports.babelRuntimeVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.jestReactNativeVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.reactNativeCommunityCliAndroid = exports.reactNativeCommunityCliIos = exports.reactNativeCommunityCli = exports.reactNativeMetroConfigVersion = exports.metroVersion = exports.typesNodeVersion = exports.reactNativeVersion = exports.nxVersion = void 0;
+exports.babelRuntimeVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.jestReactNativeVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.reactNativeWebVersion = exports.reactNativeMetroConfigVersion = exports.reactNativeBabelPresetVersion = exports.reactNativeCommunityCliPlatformAndroidVersion = exports.typesNodeVersion = exports.reactNativeVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.reactNativeVersion = '0.72.4';
-exports.typesNodeVersion = '18.14.4';
-exports.metroVersion = '0.76.7';
-exports.reactNativeMetroConfigVersion = '^0.72.11';
-exports.reactNativeCommunityCli = '11.3.6';
-exports.reactNativeCommunityCliIos = '11.3.6';
-exports.reactNativeCommunityCliAndroid = '11.3.6';
+exports.reactNativeVersion = '0.73.2';
+exports.typesNodeVersion = '18.16.9';
+exports.reactNativeCommunityCliPlatformAndroidVersion = '12.3.0'; // anddroid refers files from this package
+exports.reactNativeBabelPresetVersion = '^0.73.18';
+exports.reactNativeMetroConfigVersion = '^0.73.2';
+exports.reactNativeWebVersion = '^0.19.9';
 exports.reactVersion = '18.2.0';
 exports.reactDomVersion = '18.2.0';
 exports.reactTestRendererVersion = '18.2.0';
-exports.typesReactVersion = '18.0.28';
-exports.testingLibraryReactNativeVersion = '~12.3.0';
+exports.typesReactVersion = '~18.2.45';
+exports.testingLibraryReactNativeVersion = '~12.4.2';
 exports.testingLibraryJestNativeVersion = '~5.4.3';
 exports.jestReactNativeVersion = '18.0.0';
-exports.reactNativeSvgTransformerVersion = '1.0.0';
-exports.reactNativeSvgVersion = '13.9.0';
+exports.reactNativeSvgTransformerVersion = '1.2.0';
+exports.reactNativeSvgVersion = '14.1.0';
 exports.babelRuntimeVersion = '7.22.6';
-exports.reactNativeAsyncStorageVersion = '~1.19.3';
-exports.reactNativeSafeAreaContextVersion = '~4.7.2';

package/src/generators/application/files/app/android/app/src/debug/java/com/__lowerCaseName__/ReactNativeFlipper.java.template

@@ -1,75 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- */
-package com.<%= lowerCaseName %>;
-
-import android.content.Context;
-import com.facebook.flipper.android.AndroidFlipperClient;
-import com.facebook.flipper.android.utils.FlipperUtils;
-import com.facebook.flipper.core.FlipperClient;
-import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
-import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
-import com.facebook.flipper.plugins.inspector.DescriptorMapping;
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
-import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
-import com.facebook.react.ReactInstanceEventListener;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.network.NetworkingModule;
-import okhttp3.OkHttpClient;
-
-/**
- * Class responsible of loading Flipper inside your React Native application. This is the debug
- * flavor of it. Here you can add your own plugins and customize the Flipper setup.
- */
-public class ReactNativeFlipper {
-  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
-    if (FlipperUtils.shouldEnableFlipper(context)) {
-      final FlipperClient client = AndroidFlipperClient.getInstance(context);
-
-      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
-      client.addPlugin(new DatabasesFlipperPlugin(context));
-      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
-      client.addPlugin(CrashReporterPlugin.getInstance());
-
-      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
-      NetworkingModule.setCustomClientBuilder(
-          new NetworkingModule.CustomClientBuilder() {
-            @Override
-            public void apply(OkHttpClient.Builder builder) {
-              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
-            }
-          });
-      client.addPlugin(networkFlipperPlugin);
-      client.start();
-
-      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
-      // Hence we run if after all native modules have been initialized
-      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-      if (reactContext == null) {
-        reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceEventListener() {
-              @Override
-              public void onReactContextInitialized(ReactContext reactContext) {
-                reactInstanceManager.removeReactInstanceEventListener(this);
-                reactContext.runOnNativeModulesQueueThread(
-                    new Runnable() {
-                      @Override
-                      public void run() {
-                        client.addPlugin(new FrescoFlipperPlugin());
-                      }
-                    });
-              }
-            });
-      } else {
-        client.addPlugin(new FrescoFlipperPlugin());
-      }
-    }
-  }
-}

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

@@ -1,32 +0,0 @@
-package com.<%= lowerCaseName %>;
-
-import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;
-
-public class MainActivity extends ReactActivity {
-
-  /**
-   * Returns the name of the main component registered from JavaScript. This is used to schedule
-   * rendering of the component.
-   */
-  @Override
-  protected String getMainComponentName() {
-    return "<%= className %>";
-  }
-
-  /**
-   * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
-   * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
-   * (aka React 18) with two boolean flags.
-   */
-  @Override
-  protected ReactActivityDelegate createReactActivityDelegate() {
-    return new DefaultReactActivityDelegate(
-        this,
-        getMainComponentName(),
-        // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-        DefaultNewArchitectureEntryPoint.getFabricEnabled());
-  }
-}

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

@@ -1,62 +0,0 @@
-package com.<%= lowerCaseName %>;
-
-import android.app.Application;
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactNativeHost;
-import com.facebook.soloader.SoLoader;
-import java.util.List;
-
-public class MainApplication extends Application implements ReactApplication {
-
-  private final ReactNativeHost mReactNativeHost =
-      new DefaultReactNativeHost(this) {
-        @Override
-        public boolean getUseDeveloperSupport() {
-          return BuildConfig.DEBUG;
-        }
-
-        @Override
-        protected List<ReactPackage> getPackages() {
-          @SuppressWarnings("UnnecessaryLocalVariable")
-          List<ReactPackage> packages = new PackageList(this).getPackages();
-          // Packages that cannot be autolinked yet can be added manually here, for example:
-          // packages.add(new MyReactNativePackage());
-          return packages;
-        }
-
-        @Override
-        protected String getJSMainModuleName() {
-          return "<%= entryFile %>";
-        }
-
-        @Override
-        protected boolean isNewArchEnabled() {
-          return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-        }
-
-        @Override
-        protected Boolean isHermesEnabled() {
-          return BuildConfig.IS_HERMES_ENABLED;
-        }
-      };
-
-  @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    SoLoader.init(this, /* native exopackage */ false);
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      DefaultNewArchitectureEntryPoint.load();
-    }
-    ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-  }
-}

package/src/generators/application/files/app/android/app/src/release/java/com/__lowerCaseName__/ReactNativeFlipper.java.template

@@ -1,20 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- */
-package com.<%= lowerCaseName %>;
-
-import android.content.Context;
-import com.facebook.react.ReactInstanceManager;
-
-/**
- * Class responsible of loading Flipper inside your React Native application. This is the release
- * flavor of it so it's empty as we don't want to load Flipper.
- */
-public class ReactNativeFlipper {
-  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
-    // Do nothing as we don't want to initialize Flipper on Release.
-  }
-}

package/src/generators/application/files/app/babel.config.json.template

@@ -1,3 +0,0 @@
-{
-  "presets": ["module:metro-react-native-babel-preset"]
-}

package/src/generators/application/lib/add-detox.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-import { NormalizedSchema } from './normalize-options';
-export declare function addDetox(host: Tree, options: NormalizedSchema): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/generators/application/lib/add-detox.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDetox = void 0;
-const detox_1 = require("@nx/detox");
-const eslint_1 = require("@nx/eslint");
-async function addDetox(host, options) {
-    if (options?.e2eTestRunner !== 'detox') {
-        return () => { };
-    }
-    return (0, detox_1.detoxApplicationGenerator)(host, {
-        ...options,
-        linter: eslint_1.Linter.EsLint,
-        e2eName: `${options.projectName}-e2e`,
-        e2eDirectory: `${options.appProjectRoot}-e2e`,
-        projectNameAndRootFormat: 'as-provided',
-        appProject: options.projectName,
-        appDisplayName: options.displayName,
-        appName: options.name,
-        framework: 'react-native',
-        skipFormat: true,
-    });
-}
-exports.addDetox = addDetox;