@nx/react-native 18.1.0-beta.0 → 18.1.0-beta.10

package/.eslintrc.json

@@ -37,7 +37,8 @@
               "@nx/webpack",
               "@nx/detox",
               "@nx/cypress",
-              "@nx/playwright"
+              "@nx/playwright",
+              "ajv"
             ]
           }
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "18.1.0-beta.0",
+  "version": "18.1.0-beta.10",
   "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": [
@@ -25,6 +25,7 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
+    "ajv": "^8.12.0",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
@@ -35,13 +36,13 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.1.0-beta.0",
-    "@nx/jest": "18.1.0-beta.0",
-    "@nx/js": "18.1.0-beta.0",
-    "@nx/eslint": "18.1.0-beta.0",
-    "@nx/react": "18.1.0-beta.0",
-    "@nx/workspace": "18.1.0-beta.0",
-    "@nrwl/react-native": "18.1.0-beta.0"
+    "@nx/devkit": "18.1.0-beta.10",
+    "@nx/jest": "18.1.0-beta.10",
+    "@nx/js": "18.1.0-beta.10",
+    "@nx/eslint": "18.1.0-beta.10",
+    "@nx/react": "18.1.0-beta.10",
+    "@nx/workspace": "18.1.0-beta.10",
+    "@nrwl/react-native": "18.1.0-beta.10"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes, ReactNativePluginOptions } from './plugins/plugin';
+export { createNodes, createDependencies, ReactNativePluginOptions, } from './plugins/plugin';

package/plugin.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = void 0;
+exports.createDependencies = exports.createNodes = void 0;
 var plugin_1 = require("./plugins/plugin");
 Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
+Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return plugin_1.createDependencies; } });

package/src/executors/build-android/build-android.impl.js

@@ -6,7 +6,7 @@ const chmod_android_gradle_files_1 = require("../../utils/chmod-android-gradle-f
 const get_cli_options_1 = require("../../utils/get-cli-options");
 async function* buildAndroidExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(projectRoot, 'android'));
+    (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(context.root, projectRoot, 'android'));
     await runCliBuild(context.root, projectRoot, options);
     yield { success: true };
 }

package/src/executors/build-android/build-android.impl.ts

@@ -15,7 +15,7 @@ export default async function* buildAndroidExecutor(
 ): AsyncGenerator<ReactNativeBuildOutput> {
   const projectRoot =
     context.projectsConfigurations.projects[context.projectName].root;
-  chmodAndroidGradlewFiles(join(projectRoot, 'android'));
+  chmodAndroidGradlewFiles(join(context.root, projectRoot, 'android'));
 
   await runCliBuild(context.root, projectRoot, options);
   yield { success: true };

package/src/executors/run-android/run-android.impl.js

@@ -8,7 +8,7 @@ const get_cli_options_1 = require("../../utils/get-cli-options");
 let childProcess;
 async function* runAndroidExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(projectRoot, 'android'));
+    (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(context.root, projectRoot, 'android'));
     const tasks = [runCliRunAndroid(context.root, projectRoot, options)];
     if (options.mode !== 'Release') {
         tasks.push((0, start_impl_1.runCliStart)(context.root, projectRoot, {

package/src/executors/run-android/run-android.impl.ts

@@ -19,7 +19,7 @@ export default async function* runAndroidExecutor(
 ): AsyncGenerator<ReactNativeRunAndroidOutput> {
   const projectRoot =
     context.projectsConfigurations.projects[context.projectName].root;
-  chmodAndroidGradlewFiles(join(projectRoot, 'android'));
+  chmodAndroidGradlewFiles(join(context.root, projectRoot, 'android'));
 
   const tasks = [runCliRunAndroid(context.root, projectRoot, options)];
 

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

@@ -21,7 +21,7 @@ async function* reactNativeStorybookExecutor(options, context) {
     const workspacePackageJson = (0, devkit_1.readJsonFile)(workspacePackageJsonPath);
     const projectPackageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
     if ((0, fileutils_1.fileExists)(packageJsonPath))
-        (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, await (0, sync_deps_impl_1.syncDeps)(projectPackageJson, packageJsonPath, workspacePackageJson, [
+        (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',
             '@storybook/addon-ondevice-backgrounds',

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

@@ -41,9 +41,11 @@ export default async function* reactNativeStorybookExecutor(
     displayNewlyAddedDepsMessage(
       context.projectName,
       await syncDeps(
+        context.projectName,
         projectPackageJson,
         packageJsonPath,
         workspacePackageJson,
+        context.projectGraph,
         [
           `@storybook/react-native`,
           '@storybook/addon-ondevice-actions',

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

@@ -1,4 +1,5 @@
 export interface ReactNativeSyncDepsOptions {
   include: string[] | string; // default is an empty array []
   exclude: string[] | string; // default is an empty array []
+  all: boolean; // default is false
 }

package/src/executors/sync-deps/schema.json

@@ -23,6 +23,11 @@
       },
       "default": [],
       "description": "An array of npm packages to exclude."
+    },
+    "all": {
+      "type": "boolean",
+      "description": "Copy all dependencies and devDependencies from the workspace root package.json.",
+      "default": false
     }
   }
 }

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

@@ -1,9 +1,9 @@
-import { ExecutorContext } from '@nx/devkit';
+import { ExecutorContext, ProjectGraph } from '@nx/devkit';
 import { ReactNativeSyncDepsOptions } from './schema';
 import { PackageJson } from 'nx/src/utils/package-json';
 export interface ReactNativeSyncDepsOutput {
     success: boolean;
 }
 export default function syncDepsExecutor(options: ReactNativeSyncDepsOptions, context: ExecutorContext): AsyncGenerator<ReactNativeSyncDepsOutput>;
-export declare function syncDeps(projectPackageJson: PackageJson, projectPackageJsonPath: string, workspacePackageJson: PackageJson, include?: string[], exclude?: string[]): Promise<string[]>;
+export declare function syncDeps(projectName: string, projectPackageJson: PackageJson, projectPackageJsonPath: string, workspacePackageJson: PackageJson, projectGraph?: ProjectGraph, include?: string[], exclude?: string[], all?: boolean): Promise<string[]>;
 export declare function displayNewlyAddedDepsMessage(projectName: string, deps: string[]): void;

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

@@ -4,23 +4,28 @@ 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;
     const workspacePackageJsonPath = (0, path_1.join)(context.root, 'package.json');
     const projectPackageJsonPath = (0, path_1.join)(context.root, projectRoot, 'package.json');
     const workspacePackageJson = (0, devkit_1.readJsonFile)(workspacePackageJsonPath);
     const projectPackageJson = (0, devkit_1.readJsonFile)(projectPackageJsonPath);
-    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(projectPackageJson, projectPackageJsonPath, workspacePackageJson, typeof options.include === 'string'
+    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(context.projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, context.projectGraph, typeof options.include === 'string'
         ? options.include.split(',')
         : options.include, typeof options.exclude === 'string'
         ? options.exclude.split(',')
-        : options.exclude));
+        : options.exclude, options.all));
     yield { success: true };
 }
 exports.default = syncDepsExecutor;
-async function syncDeps(projectPackageJson, projectPackageJsonPath, workspacePackageJson, include = [], exclude = []) {
-    let npmDeps = Object.keys(workspacePackageJson.dependencies || {});
-    let npmDevdeps = Object.keys(workspacePackageJson.devDependencies || {});
+async function syncDeps(projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, projectGraph = (0, devkit_1.readCachedProjectGraph)(), include = [], exclude = [], all = false) {
+    let npmDeps = all
+        ? Object.keys(workspacePackageJson.dependencies || {})
+        : (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
+    let npmDevdeps = all
+        ? Object.keys(workspacePackageJson.devDependencies || {})
+        : [];
     const newDeps = [];
     let updated = false;
     if (!projectPackageJson.dependencies) {

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

@@ -2,12 +2,15 @@ import { join } from 'path';
 import * as chalk from 'chalk';
 import {
   ExecutorContext,
+  ProjectGraph,
   logger,
+  readCachedProjectGraph,
   readJsonFile,
   writeJsonFile,
 } from '@nx/devkit';
 
 import { ReactNativeSyncDepsOptions } from './schema';
+import { findAllNpmDependencies } from '../../utils/find-all-npm-dependencies';
 import { PackageJson } from 'nx/src/utils/package-json';
 
 export interface ReactNativeSyncDepsOutput {
@@ -33,15 +36,18 @@ export default async function* syncDepsExecutor(
   displayNewlyAddedDepsMessage(
     context.projectName,
     await syncDeps(
+      context.projectName,
       projectPackageJson,
       projectPackageJsonPath,
       workspacePackageJson,
+      context.projectGraph,
       typeof options.include === 'string'
         ? options.include.split(',')
         : options.include,
       typeof options.exclude === 'string'
         ? options.exclude.split(',')
-        : options.exclude
+        : options.exclude,
+      options.all
     )
   );
 
@@ -49,14 +55,21 @@ export default async function* syncDepsExecutor(
 }
 
 export async function syncDeps(
+  projectName: string,
   projectPackageJson: PackageJson,
   projectPackageJsonPath: string,
   workspacePackageJson: PackageJson,
+  projectGraph: ProjectGraph = readCachedProjectGraph(),
   include: string[] = [],
-  exclude: string[] = []
+  exclude: string[] = [],
+  all: boolean = false
 ): Promise<string[]> {
-  let npmDeps = Object.keys(workspacePackageJson.dependencies || {});
-  let npmDevdeps = Object.keys(workspacePackageJson.devDependencies || {});
+  let npmDeps = all
+    ? Object.keys(workspacePackageJson.dependencies || {})
+    : findAllNpmDependencies(projectGraph, projectName);
+  let npmDevdeps = all
+    ? Object.keys(workspacePackageJson.devDependencies || {})
+    : [];
 
   const newDeps = [];
   let updated = false;

package/src/generators/application/application.js

@@ -61,11 +61,10 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     tasks.push(chmodTaskGradlewTask);
     const podInstallTask = (0, pod_install_task_1.runPodInstall)((0, devkit_1.joinPathFragments)(host.root, options.iosProjectRoot));
     if (options.install) {
-        const workspacePackageJsonPath = (0, devkit_1.joinPathFragments)('package.json');
         const projectPackageJsonPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json');
-        const workspacePackageJson = (0, devkit_1.readJson)(host, workspacePackageJsonPath);
+        const workspacePackageJson = (0, devkit_1.readJson)(host, 'package.json');
         const projectPackageJson = (0, devkit_1.readJson)(host, projectPackageJsonPath);
-        await (0, sync_deps_impl_1.syncDeps)(projectPackageJson, projectPackageJsonPath, workspacePackageJson);
+        await (0, sync_deps_impl_1.syncDeps)(options.name, projectPackageJson, projectPackageJsonPath, workspacePackageJson);
         tasks.push(podInstallTask);
     }
     else {

package/src/generators/application/files/app/src/app/App.tsx.template

@@ -387,7 +387,7 @@ export const App = () => {
                   </View>
                 </View>
                 <View style={styles.codeBlock}>
-                  <Text style={[styles.monospace]}>nx connect-to-nx-cloud</Text>
+                  <Text style={[styles.monospace]}>nx connect</Text>
                 </View>
               </View>
             </TouchableOpacity>

package/src/generators/application/lib/normalize-options.js

@@ -12,7 +12,10 @@ async function normalizeOptions(host, options) {
         callingGenerator: '@nx/react-native:application',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     const { className, fileName } = (0, devkit_1.names)(options.name);
     const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
     const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');

package/src/generators/init/init.js

@@ -15,7 +15,10 @@ function reactNativeInitGenerator(host, schema) {
 exports.reactNativeInitGenerator = reactNativeInitGenerator;
 async function reactNativeInitGeneratorInternal(host, schema) {
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
-    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
         addPlugin(host);
     }

package/src/generators/library/lib/normalize-options.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeOptions(host, options) {
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -11,7 +12,10 @@ async function normalizeOptions(host, options) {
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         callingGenerator: '@nx/react-native:library',
     });
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];

package/src/generators/storybook-configuration/configuration.js

@@ -16,7 +16,10 @@ exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
  */
 async function storybookConfigurationGeneratorInternal(host, schema) {
     devkit_1.logger.warn(`Please run 'nx run @nx/react:storybook-configuration ${schema.project}' instead.`);
-    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    schema.addPlugin ??= addPluginDefault;
     return (0, react_1.storybookConfigurationGenerator)(host, schema);
 }
 exports.storybookConfigurationGeneratorInternal = storybookConfigurationGeneratorInternal;

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/find-all-npm-dependencies.d.ts

@@ -0,0 +1,2 @@
+import { ProjectGraph } from '@nx/devkit';
+export declare function findAllNpmDependencies(graph: ProjectGraph, projectName: string, list?: string[], seen?: Set<string>): string[];

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

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findAllNpmDependencies = void 0;
+function findAllNpmDependencies(graph, projectName, list = [], seen = new Set()) {
+    // In case of bad circular dependencies
+    if (seen.has(projectName)) {
+        return list;
+    }
+    seen.add(projectName);
+    const node = graph.externalNodes[projectName];
+    // 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` &&
+            node.name !== `npm:@nx/expo` &&
+            node.name !== `npm:@nrwl/expo`) {
+            list.push(node.data.packageName);
+        }
+    }
+    else {
+        // it's workspace project, search for it's dependencies
+        graph.dependencies[projectName]?.forEach((dep) => findAllNpmDependencies(graph, dep.target, list, seen));
+    }
+    return list;
+}
+exports.findAllNpmDependencies = findAllNpmDependencies;

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

@@ -0,0 +1,103 @@
+import { findAllNpmDependencies } from './find-all-npm-dependencies';
+import { DependencyType, ProjectGraph } from '@nx/devkit';
+
+test('findAllNpmDependencies', () => {
+  const graph: ProjectGraph = {
+    nodes: {
+      myapp: {
+        type: 'app',
+        name: 'myapp',
+        data: { files: [] },
+      },
+      lib1: {
+        type: 'lib',
+        name: 'lib1',
+        data: { files: [] },
+      },
+      lib2: {
+        type: 'lib',
+        name: 'lib2',
+        data: { files: [] },
+      },
+      lib3: {
+        type: 'lib',
+        name: 'lib3',
+        data: { files: [] },
+      },
+    } as any,
+    externalNodes: {
+      'npm:react-native-image-picker': {
+        type: 'npm',
+        name: 'npm:react-native-image-picker',
+        data: {
+          version: '1',
+          packageName: 'react-native-image-picker',
+        },
+      },
+      'npm:react-native-dialog': {
+        type: 'npm',
+        name: 'npm:react-native-dialog',
+        data: {
+          version: '1',
+          packageName: 'react-native-dialog',
+        },
+      },
+      'npm:react-native-snackbar': {
+        type: 'npm',
+        name: 'npm:react-native-snackbar',
+        data: {
+          version: '1',
+          packageName: 'react-native-snackbar',
+        },
+      },
+      'npm:@nx/react-native': {
+        type: 'npm',
+        name: 'npm:@nx/react-native',
+        data: {
+          version: '1',
+          packageName: '@nx/react-native',
+        },
+      },
+    },
+    dependencies: {
+      myapp: [
+        { type: DependencyType.static, source: 'myapp', target: 'lib1' },
+        { type: DependencyType.static, source: 'myapp', target: 'lib2' },
+        {
+          type: DependencyType.static,
+          source: 'myapp',
+          target: 'npm:react-native-image-picker',
+        },
+        {
+          type: DependencyType.static,
+          source: 'myapp',
+          target: 'npm:@nx/react-native',
+        },
+      ],
+      lib1: [
+        { type: DependencyType.static, source: 'lib1', target: 'lib2' },
+        {
+          type: DependencyType.static,
+          source: 'lib3',
+          target: 'npm:react-native-snackbar',
+        },
+      ],
+      lib2: [{ type: DependencyType.static, source: 'lib2', target: 'lib3' }],
+      lib3: [
+        {
+          type: DependencyType.static,
+          source: 'lib3',
+          target: 'npm:react-native-dialog',
+        },
+      ],
+    },
+  };
+
+  const result = findAllNpmDependencies(graph, 'myapp');
+
+  expect(result).toEqual([
+    'react-native-dialog',
+    'react-native-snackbar',
+    'react-native-image-picker',
+  ]);
+});