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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "18.2.2",
+  "version": "18.3.0-beta.0",
   "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.2.2",
-    "@nx/jest": "18.2.2",
-    "@nx/js": "18.2.2",
-    "@nx/eslint": "18.2.2",
-    "@nx/react": "18.2.2",
-    "@nx/workspace": "18.2.2",
-    "@nrwl/react-native": "18.2.2"
+    "@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"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/lib/normalize-options.d.ts

@@ -13,5 +13,8 @@ export interface NormalizedSchema extends Schema {
     rootProject: boolean;
     e2eProjectName: string;
     e2eProjectRoot: string;
+    e2eWebServerAddress: string;
+    e2eWebServerTarget: string;
+    e2ePort: number;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -20,8 +20,28 @@ async function normalizeOptions(host, options) {
     const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
     const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');
     const rootProject = appProjectRoot === '.';
+    let e2eWebServerTarget = 'start';
+    if (options.addPlugin) {
+        if (nxJson.plugins) {
+            for (const plugin of nxJson.plugins) {
+                if (options.bundler === 'vite' &&
+                    typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/react-native/plugin' &&
+                    plugin.options.startTargetName) {
+                    e2eWebServerTarget = plugin.options
+                        .startTargetName;
+                }
+            }
+        }
+    }
+    let e2ePort = 4200;
+    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
+        nxJson.targetDefaults?.[e2eWebServerTarget].options?.port) {
+        e2ePort = nxJson.targetDefaults?.[e2eWebServerTarget].options?.port;
+    }
     const e2eProjectName = rootProject ? 'e2e' : `${fileName}-e2e`;
     const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
+    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -42,6 +62,9 @@ async function normalizeOptions(host, options) {
         rootProject,
         e2eProjectName,
         e2eProjectRoot,
+        e2eWebServerAddress,
+        e2eWebServerTarget,
+        e2ePort,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/application/lib/normalize-options.spec.ts

@@ -44,6 +44,9 @@ describe('Normalize Options', () => {
       rootProject: false,
       e2eProjectName: 'my-app-e2e',
       e2eProjectRoot: 'my-app-e2e',
+      e2ePort: 4200,
+      e2eWebServerAddress: 'http://localhost:4200',
+      e2eWebServerTarget: 'start',
     });
   });
 
@@ -80,6 +83,9 @@ describe('Normalize Options', () => {
       rootProject: false,
       e2eProjectName: 'my-app-e2e',
       e2eProjectRoot: 'myApp-e2e',
+      e2ePort: 4200,
+      e2eWebServerAddress: 'http://localhost:4200',
+      e2eWebServerTarget: 'start',
     });
   });
 
@@ -118,6 +124,9 @@ describe('Normalize Options', () => {
       rootProject: false,
       e2eProjectName: 'my-app-e2e',
       e2eProjectRoot: 'directory/my-app-e2e',
+      e2ePort: 4200,
+      e2eWebServerAddress: 'http://localhost:4200',
+      e2eWebServerTarget: 'start',
     });
   });
 
@@ -154,6 +163,9 @@ describe('Normalize Options', () => {
       rootProject: false,
       e2eProjectName: 'directory/my-app-e2e',
       e2eProjectRoot: 'directory/my-app-e2e',
+      e2ePort: 4200,
+      e2eWebServerAddress: 'http://localhost:4200',
+      e2eWebServerTarget: 'start',
     });
   });
 
@@ -191,6 +203,9 @@ describe('Normalize Options', () => {
       rootProject: false,
       e2eProjectName: 'my-app-e2e',
       e2eProjectRoot: 'my-app-e2e',
+      e2ePort: 4200,
+      e2eWebServerAddress: 'http://localhost:4200',
+      e2eWebServerTarget: 'start',
     });
   });
 });