@nx/expo 18.2.2 → 18.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "18.2.2",
+  "version": "18.2.3",
   "private": false,
   "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
@@ -26,7 +26,7 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "18.2.2",
+    "@nx/devkit": "18.2.3",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
@@ -36,13 +36,13 @@
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "@nx/jest": "18.2.2",
-    "@nx/js": "18.2.2",
-    "@nx/eslint": "18.2.2",
-    "@nx/react": "18.2.2",
-    "@nx/web": "18.2.2",
-    "@nx/webpack": "18.2.2",
-    "@nrwl/expo": "18.2.2"
+    "@nx/jest": "18.2.3",
+    "@nx/js": "18.2.3",
+    "@nx/eslint": "18.2.3",
+    "@nx/react": "18.2.3",
+    "@nx/web": "18.2.3",
+    "@nx/webpack": "18.2.3",
+    "@nrwl/expo": "18.2.3"
   },
   "executors": "./executors.json",
   "ng-update": {

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

@@ -7,7 +7,6 @@ const versions_1 = require("../../../utils/versions");
 const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 async function addE2e(tree, options) {
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
-    const port = hasPlugin ? 8081 : 4200;
     switch (options.e2eTestRunner) {
         case 'cypress': {
             const hasNxExpoPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
@@ -33,9 +32,9 @@ async function addE2e(tree, options) {
                 // the name and root are already normalized, instruct the generator to use them as is
                 bundler: 'none',
                 skipFormat: true,
-                devServerTarget: `${options.projectName}:serve`,
-                port,
-                baseUrl: `http://localhost:${port}`,
+                devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
+                port: options.e2ePort,
+                baseUrl: options.e2eWebServerAddress,
                 ciWebServerCommand: hasNxExpoPlugin
                     ? `nx run ${options.projectName}:serve-static`
                     : undefined,
@@ -60,8 +59,8 @@ async function addE2e(tree, options) {
                 js: false,
                 linter: options.linter,
                 setParserOptionsProject: options.setParserOptionsProject,
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
-                webServerAddress: `http://localhost:${port}`,
+                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
+                webServerAddress: options.e2eWebServerAddress,
                 rootProject: options.rootProject,
             });
         }

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

@@ -9,5 +9,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

@@ -21,8 +21,27 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const rootProject = appProjectRoot === '.';
+    let e2eWebServerTarget = 'serve';
+    if (options.addPlugin) {
+        if (nxJson.plugins) {
+            for (const plugin of nxJson.plugins) {
+                if (typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/expo/plugin' &&
+                    plugin.options.serveTargetName) {
+                    e2eWebServerTarget = plugin.options
+                        .serveTargetName;
+                }
+            }
+        }
+    }
+    let e2ePort = options.addPlugin ? 8081 : 4200;
+    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
+        nxJson.targetDefaults?.[e2eWebServerTarget].options?.port) {
+        e2ePort = nxJson.targetDefaults?.[e2eWebServerTarget].options.port;
+    }
     const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
+    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     return {
         ...options,
         unitTestRunner: options.unitTestRunner || 'jest',
@@ -37,6 +56,9 @@ async function normalizeOptions(host, options) {
         rootProject,
         e2eProjectName,
         e2eProjectRoot,
+        e2eWebServerAddress,
+        e2eWebServerTarget,
+        e2ePort,
     };
 }
 exports.normalizeOptions = normalizeOptions;