@nx/expo 19.6.3 → 19.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "19.6.3",
+  "version": "19.6.4",
   "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": [
@@ -28,7 +28,7 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "19.6.3",
+    "@nx/devkit": "19.6.4",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
@@ -37,13 +37,13 @@
     "node-fetch": "^2.6.7",
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
-    "@nx/jest": "19.6.3",
-    "@nx/js": "19.6.3",
-    "@nx/eslint": "19.6.3",
-    "@nx/react": "19.6.3",
-    "@nx/web": "19.6.3",
-    "@nx/webpack": "19.6.3",
-    "@nrwl/expo": "19.6.3"
+    "@nx/jest": "19.6.4",
+    "@nx/js": "19.6.4",
+    "@nx/eslint": "19.6.4",
+    "@nx/react": "19.6.4",
+    "@nx/web": "19.6.4",
+    "@nx/webpack": "19.6.4",
+    "@nrwl/expo": "19.6.4"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/lib/add-e2e.d.ts

@@ -1,3 +1,3 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from './normalize-options';
 export declare function addE2e(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

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

@@ -7,16 +7,18 @@ const versions_1 = require("../../../utils/versions");
 const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 async function addE2e(tree, options) {
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
+    if (!hasPlugin) {
+        await (0, web_1.webStaticServeGenerator)(tree, {
+            buildTarget: `${options.projectName}:export`,
+            targetName: 'serve-static',
+        });
+    }
+    const e2eWebServerInfo = await getExpoE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'app.json'), options.addPlugin);
     switch (options.e2eTestRunner) {
         case 'cypress': {
-            if (!hasPlugin) {
-                await (0, web_1.webStaticServeGenerator)(tree, {
-                    buildTarget: `${options.projectName}:export`,
-                    targetName: 'serve-static',
-                });
-            }
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
                 projectType: 'application',
@@ -33,12 +35,14 @@ 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}:${options.e2eWebServerTarget}`,
-                port: options.e2ePort,
-                baseUrl: options.e2eWebServerAddress,
-                ciWebServerCommand: hasPlugin
-                    ? `nx run ${options.projectName}:serve-static`
-                    : undefined,
+                devServerTarget: e2eWebServerInfo.e2eDevServerTarget,
+                baseUrl: e2eWebServerInfo.e2eWebServerAddress,
+                ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+                webServerCommands: {
+                    default: e2eWebServerInfo.e2eWebServerCommand,
+                    production: e2eWebServerInfo.e2eCiWebServerCommand,
+                },
+                ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
                 jsx: true,
                 rootProject: options.rootProject,
             });
@@ -74,8 +78,8 @@ async function addE2e(tree, options) {
                 js: false,
                 linter: options.linter,
                 setParserOptionsProject: options.setParserOptionsProject,
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
-                webServerAddress: options.e2eWebServerAddress,
+                webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+                webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
                 rootProject: options.rootProject,
                 addPlugin: options.addPlugin,
             });
@@ -113,3 +117,23 @@ async function addE2e(tree, options) {
             return () => { };
     }
 }
+async function getExpoE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let e2ePort = isPluginBeingAdded ? 8081 : 4200;
+    if (nxJson.targetDefaults?.['serve'] &&
+        nxJson.targetDefaults?.['serve'].options?.port) {
+        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    }
+    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+        plugin: '@nx/expo/plugin',
+        serveTargetName: 'serveTargetName',
+        serveStaticTargetName: 'serveTargetName',
+        configFilePath,
+    }, {
+        defaultServeTargetName: 'serve',
+        defaultServeStaticTargetName: 'serve-static',
+        defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
+        defaultE2ECiBaseUrl: 'http://localhost:4200',
+        defaultE2EPort: e2ePort,
+    }, isPluginBeingAdded);
+}

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

@@ -9,8 +9,5 @@ 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,31 +21,12 @@ 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',
-        e2eTestRunner: options.e2eTestRunner,
+        e2eTestRunner: options.e2eTestRunner || 'none',
         name: projectNames.projectSimpleName,
         className,
         lowerCaseName: className.toLowerCase(),
@@ -56,8 +37,5 @@ async function normalizeOptions(host, options) {
         rootProject,
         e2eProjectName,
         e2eProjectRoot,
-        e2eWebServerAddress,
-        e2eWebServerTarget,
-        e2ePort,
     };
 }

package/src/generators/application/schema.json

@@ -76,7 +76,7 @@
       "description": "Adds the specified e2e test runner",
       "type": "string",
       "enum": ["playwright", "cypress", "detox", "none"],
-      "default": "playwright"
+      "default": "none"
     },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",