@nx/react-native 18.3.0-beta.0 → 18.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "18.3.0-beta.0",
+  "version": "18.3.0-beta.2",
   "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": [
@@ -36,13 +36,13 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.3.0-beta.0",
-    "@nx/jest": "18.3.0-beta.0",
-    "@nx/js": "18.3.0-beta.0",
-    "@nx/eslint": "18.3.0-beta.0",
-    "@nx/react": "18.3.0-beta.0",
-    "@nx/workspace": "18.3.0-beta.0",
-    "@nrwl/react-native": "18.3.0-beta.0"
+    "@nx/devkit": "18.3.0-beta.2",
+    "@nx/jest": "18.3.0-beta.2",
+    "@nx/js": "18.3.0-beta.2",
+    "@nx/eslint": "18.3.0-beta.2",
+    "@nx/react": "18.3.0-beta.2",
+    "@nx/workspace": "18.3.0-beta.2",
+    "@nrwl/react-native": "18.3.0-beta.2"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/with-nx-metro.js

@@ -4,6 +4,7 @@ exports.withNxMetro = void 0;
 const devkit_1 = require("@nx/devkit");
 const metro_config_1 = require("metro-config");
 const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
 const metro_resolver_1 = require("./metro-resolver");
 async function withNxMetro(userConfig, opts = {}) {
     const extensions = ['', 'ts', 'tsx', 'js', 'jsx', 'json'];
@@ -13,7 +14,7 @@ async function withNxMetro(userConfig, opts = {}) {
         extensions.push(...opts.extensions);
     let watchFolders = (0, fs_extra_1.readdirSync)(devkit_1.workspaceRoot)
         .filter((fileName) => !['dist', 'e2e'].includes(fileName) && !fileName.startsWith('.'))
-        .map((fileName) => (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, fileName))
+        .map((fileName) => (0, path_1.join)(devkit_1.workspaceRoot, fileName))
         .filter((filePath) => (0, fs_extra_1.statSync)(filePath).isDirectory());
     if (opts.watchFolders?.length) {
         watchFolders = watchFolders.concat(opts.watchFolders);
@@ -22,7 +23,7 @@ async function withNxMetro(userConfig, opts = {}) {
     const nxConfig = {
         resolver: {
             resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions),
-            nodeModulesPaths: [(0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'node_modules')],
+            nodeModulesPaths: [(0, path_1.join)(devkit_1.workspaceRoot, 'node_modules')],
         },
         watchFolders,
     };

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

@@ -1,3 +1,5 @@
+import 'nx/src/internal-testing-utils/mock-project-graph';
+
 import {
   Tree,
   getProjects,

package/src/generators/component/component.spec.ts

@@ -1,3 +1,5 @@
+import 'nx/src/internal-testing-utils/mock-project-graph';
+
 import { logger, Tree } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { createApp, createLib } from '../../utils/testing-generators';

package/src/generators/init/init.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = exports.reactNativeInitGeneratorInternal = exports.reactNativeInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
@@ -20,16 +20,55 @@ async function reactNativeInitGeneratorInternal(host, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        addPlugin(host);
+        await (0, add_plugin_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/react-native/plugin', plugin_1.createNodes, {
+            startTargetName: ['start', 'react-native:start', 'react-native-start'],
+            upgradeTargetname: [
+                'update',
+                'react-native:update',
+                'react-native-update',
+            ],
+            bundleTargetName: [
+                'bundle',
+                'react-native:bundle',
+                'react-native-bundle',
+            ],
+            podInstallTargetName: [
+                'pod-install',
+                'react-native:pod-install',
+                'react-native-pod-install',
+            ],
+            runIosTargetName: [
+                'run-ios',
+                'react-native:run-ios',
+                'react-native-run-ios',
+            ],
+            runAndroidTargetName: [
+                'run-android',
+                'react-native:run-android',
+                'react-native-run-android',
+            ],
+            buildIosTargetName: [
+                'build-ios',
+                'react-native:build-ios',
+                'react-native-build-ios',
+            ],
+            buildAndroidTargetName: [
+                'build-android',
+                'react-native:build-android',
+                'react-native-build-android',
+            ],
+            syncDepsTargetName: [
+                'sync-deps',
+                'react-native:sync-deps',
+                'react-native-sync-deps',
+            ],
+        }, schema.updatePackageScripts);
     }
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push(moveDependency(host));
         tasks.push(updateDependencies(host, schema));
     }
-    if (schema.updatePackageScripts) {
-        await (0, update_package_scripts_1.updatePackageScripts)(host, plugin_1.createNodes);
-    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
@@ -49,30 +88,4 @@ exports.updateDependencies = updateDependencies;
 function moveDependency(host) {
     return (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react-native'], []);
 }
-function addPlugin(host) {
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    nxJson.plugins ??= [];
-    for (const plugin of nxJson.plugins) {
-        if (typeof plugin === 'string'
-            ? plugin === '@nx/react-native/plugin'
-            : plugin.plugin === '@nx/react-native/plugin') {
-            return;
-        }
-    }
-    nxJson.plugins.push({
-        plugin: '@nx/react-native/plugin',
-        options: {
-            startTargetName: 'start',
-            podInstallTargetName: 'pod-install',
-            bundleTargetName: 'bundle',
-            runIosTargetName: 'run-ios',
-            runAndroidTargetName: 'run-android',
-            buildIosTargetName: 'build-ios',
-            buildAndroidTargetName: 'build-android',
-            syncDepsTargetName: 'sync-deps',
-            upgradeTargetname: 'upgrade',
-        },
-    });
-    (0, devkit_1.updateNxJson)(host, nxJson);
-}
 exports.default = reactNativeInitGenerator;

package/src/generators/init/init.spec.ts

@@ -1,3 +1,5 @@
+import 'nx/src/internal-testing-utils/mock-project-graph';
+
 import { Tree, readJson } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { reactNativeInitGenerator } from './init';

package/src/generators/library/library.spec.ts

@@ -1,3 +1,5 @@
+import 'nx/src/internal-testing-utils/mock-project-graph';
+
 import {
   readJson,
   readProjectConfiguration,

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

@@ -1,3 +1,5 @@
+import 'nx/src/internal-testing-utils/mock-project-graph';
+
 import { readProjectConfiguration, Tree } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { Linter } from '@nx/eslint';