@nx/react-native 17.3.0-beta.4 → 17.3.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "17.3.0-beta.4",
+  "version": "17.3.0-beta.6",
   "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": [
@@ -32,18 +32,18 @@
     "ignore": "^5.0.4",
     "metro-config": "~0.76.8",
     "metro-resolver": "~0.76.8",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/detox": "17.3.0-beta.4",
-    "@nx/devkit": "17.3.0-beta.4",
-    "@nx/jest": "17.3.0-beta.4",
-    "@nx/js": "17.3.0-beta.4",
-    "@nx/eslint": "17.3.0-beta.4",
-    "@nx/react": "17.3.0-beta.4",
-    "@nx/workspace": "17.3.0-beta.4",
-    "@nrwl/react-native": "17.3.0-beta.4"
+    "@nx/detox": "17.3.0-beta.6",
+    "@nx/devkit": "17.3.0-beta.6",
+    "@nx/jest": "17.3.0-beta.6",
+    "@nx/js": "17.3.0-beta.6",
+    "@nx/eslint": "17.3.0-beta.6",
+    "@nx/react": "17.3.0-beta.6",
+    "@nx/workspace": "17.3.0-beta.6",
+    "@nrwl/react-native": "17.3.0-beta.6"
   },
   "peerDependencies": {
     "react-native": ">= 0.72.0 < 0.73.0"

package/plugins/plugin.d.ts

@@ -1,6 +1,7 @@
 import { CreateDependencies, CreateNodes } from '@nx/devkit';
 export interface ReactNativePluginOptions {
     startTargetName?: string;
+    podInstallTargetName?: string;
     runIosTargetName?: string;
     runAndroidTargetName?: string;
     buildIosTargetName?: string;

package/plugins/plugin.js

@@ -30,7 +30,6 @@ exports.createNodes = [
         // Do not create a project if package.json or project.json or metro.config.js isn't there.
         const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
         if (!siblingFiles.includes('package.json') ||
-            !siblingFiles.includes('project.json') ||
             !siblingFiles.includes('metro.config.js')) {
             return {};
         }
@@ -58,8 +57,17 @@ function buildReactNativeTargets(projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {
         [options.startTargetName]: {
-            command: `react-native start`,
-            options: { cwd: projectRoot },
+            executor: `@nx/react-native:start`,
+        },
+        [options.podInstallTargetName]: {
+            command: `pod install`,
+            options: { cwd: (0, devkit_1.joinPathFragments)(projectRoot, 'ios') },
+            cache: true,
+            inputs: getInputs(namedInputs),
+            outputs: [
+                getOutputs(projectRoot, 'ios/Pods'),
+                getOutputs(projectRoot, 'ios/Podfile.lock'),
+            ],
         },
         [options.runIosTargetName]: {
             command: `react-native run-ios`,
@@ -133,6 +141,7 @@ function load(path) {
 function normalizeOptions(options) {
     options ??= {};
     options.startTargetName ??= 'start';
+    options.podInstallTargetName ??= 'pod-install';
     options.runIosTargetName ??= 'run-ios';
     options.runAndroidTargetName ??= 'run-android';
     options.buildIosTargetName ??= 'build-ios';

package/src/generators/application/application.js

@@ -7,6 +7,7 @@ const symlink_task_1 = require("../../utils/symlink-task");
 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 normalize_options_1 = require("./lib/normalize-options");
 const init_1 = require("../init/init");
 const add_project_1 = require("./lib/add-project");
@@ -51,6 +52,10 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     tasks.push(symlinkTask);
     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) {
+        tasks.push(podInstallTask);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/init/init.d.ts

@@ -1,5 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function reactNativeInitGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function updateDependencies(host: Tree): GeneratorCallback;
+export declare function updateDependencies(host: Tree, schema: Schema): GeneratorCallback;
 export default reactNativeInitGenerator;

package/src/generators/init/init.js

@@ -12,7 +12,7 @@ async function reactNativeInitGenerator(host, schema) {
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push(moveDependency(host));
-        tasks.push(updateDependencies(host));
+        tasks.push(updateDependencies(host, schema));
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -20,7 +20,7 @@ async function reactNativeInitGenerator(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.reactNativeInitGenerator = reactNativeInitGenerator;
-function updateDependencies(host) {
+function updateDependencies(host, schema) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
         react: versions_1.reactVersion,
         'react-dom': versions_1.reactDomVersion,
@@ -30,7 +30,7 @@ function updateDependencies(host) {
         '@react-native-community/cli': versions_1.reactNativeCommunityCli,
         '@react-native-community/cli-platform-android': versions_1.reactNativeCommunityCliAndroid,
         '@react-native-community/cli-platform-ios': versions_1.reactNativeCommunityCliIos,
-    });
+    }, undefined, schema.keepExistingVersions);
 }
 exports.updateDependencies = updateDependencies;
 function moveDependency(host) {
@@ -50,6 +50,7 @@ function addPlugin(host) {
         plugin: '@nx/react-native/plugin',
         options: {
             startTargetName: 'start',
+            podInstallTargetName: 'pod-install',
             bundleTargetName: 'bundle',
             runIosTargetName: 'run-ios',
             runAndroidTargetName: 'run-android',

package/src/generators/init/schema.d.ts

@@ -1,4 +1,5 @@
 export interface Schema {
   skipFormat?: boolean;
   skipPackageJson?: boolean; //default is false
+  keepExistingVersions?: boolean; //default is false
 }

package/src/generators/init/schema.json

@@ -17,6 +17,12 @@
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
   },
   "required": []

package/src/generators/stories/stories.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const component_story_1 = require("../component-story/component-story");
 const stories_1 = require("@nx/react/src/generators/stories/stories");
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const versions_1 = require("../../utils/versions");
 async function createAllStories(tree, projectName, ignorePaths) {
     (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
@@ -16,7 +16,7 @@ async function createAllStories(tree, projectName, ignorePaths) {
     const projectPath = await (0, stories_1.projectRootPath)(tree, projectConfiguration);
     let componentPaths = [];
     (0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
-        if (ignorePaths?.some((pattern) => minimatch(path, pattern)))
+        if (ignorePaths?.some((pattern) => (0, minimatch_1.minimatch)(path, pattern)))
             return;
         if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
             (path.endsWith('.js') && !path.endsWith('.spec.js')) ||