@nx/remix 18.2.0-beta.1 → 18.2.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "18.2.0-beta.1",
+  "version": "18.2.0-beta.3",
   "description": "The Remix plugin for Nx contains executors and generators for managing Remix applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, routes, loaders, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -28,12 +28,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "18.2.0-beta.1",
-    "@nx/js": "18.2.0-beta.1",
-    "@nx/react": "18.2.0-beta.1",
+    "@nx/devkit": "18.2.0-beta.3",
+    "@nx/js": "18.2.0-beta.3",
+    "@nx/react": "18.2.0-beta.3",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "18.2.0-beta.1"
+    "@nrwl/remix": "18.2.0-beta.3"
   },
   "peerDependencies": {},
   "publishConfig": {

package/src/generators/application/__snapshots__/application.impl.spec.ts.snap

@@ -153,10 +153,9 @@ export default defineConfig({
   e2e: {
     ...nxE2EPreset(__filename, {
       cypressDir: 'src',
-      webServerCommands: { default: 'nx run test:serve:development' },
-      ciWebServerCommand: 'nx run test:serve-static',
+      webServerCommands: { default: 'nx run test:dev:development' },
     }),
-    baseUrl: 'http://localhost:4200',
+    baseUrl: 'http://localhost:3000',
   },
 });
 "
@@ -169,7 +168,7 @@ import { nxE2EPreset } from '@nx/playwright/preset';
 import { workspaceRoot } from '@nx/devkit';
 
 // For CI, you may want to set BASE_URL to the deployed application.
-const baseURL = process.env['BASE_URL'] || 'http://localhost:4200';
+const baseURL = process.env['BASE_URL'] || 'http://localhost:3000';
 
 /**
  * Read environment variables from file.
@@ -190,8 +189,8 @@ export default defineConfig({
   },
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'pnpm exec nx serve test',
-    url: 'http://localhost:4200',
+    command: 'pnpm exec nx dev test',
+    url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     cwd: workspaceRoot,
   },
@@ -667,10 +666,9 @@ export default defineConfig({
   e2e: {
     ...nxE2EPreset(__filename, {
       cypressDir: 'src',
-      webServerCommands: { default: 'nx run test:serve:development' },
-      ciWebServerCommand: 'nx run test:serve-static',
+      webServerCommands: { default: 'nx run test:dev:development' },
     }),
-    baseUrl: 'http://localhost:4200',
+    baseUrl: 'http://localhost:3000',
   },
 });
 "
@@ -683,7 +681,7 @@ import { nxE2EPreset } from '@nx/playwright/preset';
 import { workspaceRoot } from '@nx/devkit';
 
 // For CI, you may want to set BASE_URL to the deployed application.
-const baseURL = process.env['BASE_URL'] || 'http://localhost:4200';
+const baseURL = process.env['BASE_URL'] || 'http://localhost:3000';
 
 /**
  * Read environment variables from file.
@@ -704,8 +702,8 @@ export default defineConfig({
   },
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'pnpm exec nx serve test',
-    url: 'http://localhost:4200',
+    command: 'pnpm exec nx dev test',
+    url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     cwd: workspaceRoot,
   },
@@ -1037,10 +1035,9 @@ export default defineConfig({
   e2e: {
     ...nxE2EPreset(__filename, {
       cypressDir: 'src',
-      webServerCommands: { default: 'nx run test:serve:development' },
-      ciWebServerCommand: 'nx run test:serve-static',
+      webServerCommands: { default: 'nx run test:dev:development' },
     }),
-    baseUrl: 'http://localhost:4200',
+    baseUrl: 'http://localhost:3000',
   },
 });
 "
@@ -1419,7 +1416,7 @@ import { nxE2EPreset } from '@nx/playwright/preset';
 import { workspaceRoot } from '@nx/devkit';
 
 // For CI, you may want to set BASE_URL to the deployed application.
-const baseURL = process.env['BASE_URL'] || 'http://localhost:4200';
+const baseURL = process.env['BASE_URL'] || 'http://localhost:3000';
 
 /**
  * Read environment variables from file.
@@ -1440,8 +1437,8 @@ export default defineConfig({
   },
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'pnpm exec nx serve test',
-    url: 'http://localhost:4200',
+    command: 'pnpm exec nx dev test',
+    url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     cwd: workspaceRoot,
   },

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

@@ -6,7 +6,9 @@ const versions_1 = require("../../../utils/versions");
 async function addE2E(tree, options) {
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', (0, versions_1.getPackageVersion)(tree, 'nx'));
-        addFileServerTarget(tree, options, 'serve-static');
+        // TODO(colum): Remix needs a different approach to serve-static
+        // Likely via remix start
+        // addFileServerTarget(tree, options, 'serve-static');
         (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
             projectType: 'application',
             root: options.e2eProjectRoot,
@@ -19,8 +21,8 @@ async function addE2E(tree, options) {
             project: options.e2eProjectName,
             directory: 'src',
             skipFormat: true,
-            devServerTarget: `${options.projectName}:serve:development`,
-            baseUrl: 'http://localhost:4200',
+            devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}:development`,
+            baseUrl: options.e2eWebServerAddress,
             addPlugin: options.addPlugin,
         });
     }
@@ -42,8 +44,8 @@ async function addE2E(tree, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: false,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
-            webServerAddress: 'http://localhost:4200',
+            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
+            webServerAddress: options.e2eWebServerAddress,
             rootProject: options.rootProject,
             addPlugin: options.addPlugin,
         });
@@ -59,7 +61,7 @@ function addFileServerTarget(tree, options, targetName) {
         executor: '@nx/web:file-server',
         options: {
             buildTarget: `${options.projectName}:build`,
-            port: 4200,
+            port: options.e2ePort,
         },
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, projectConfig);

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

@@ -5,6 +5,9 @@ export interface NormalizedSchema extends NxRemixGeneratorSchema {
     projectRoot: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
+    e2eWebServerAddress: string;
+    e2eWebServerTarget: string;
+    e2ePort: number;
     parsedTags: string[];
 }
 export declare function normalizeOptions(tree: Tree, options: NxRemixGeneratorSchema): Promise<NormalizedSchema>;

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

@@ -19,8 +19,31 @@ async function normalizeOptions(tree, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
+    let e2eWebServerTarget = options.addPlugin ? 'dev' : 'serve';
+    if (options.addPlugin) {
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        if (nxJson.plugins) {
+            for (const plugin of nxJson.plugins) {
+                if (typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/remix/plugin' &&
+                    plugin.options.devTargetName) {
+                    e2eWebServerTarget = plugin.options
+                        .devTargetName;
+                }
+            }
+        }
+    }
+    let e2ePort = options.addPlugin ? 3000 : 4200;
+    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
+        (nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
+            nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT)) {
+        e2ePort =
+            nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
+                nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT;
+    }
     const e2eProjectName = options.rootProject ? 'e2e' : `${projectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${projectRoot}-e2e`;
+    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -31,6 +54,9 @@ async function normalizeOptions(tree, options) {
         projectRoot,
         e2eProjectName,
         e2eProjectRoot,
+        e2eWebServerAddress,
+        e2eWebServerTarget,
+        e2ePort,
         parsedTags,
     };
 }

package/src/generators/application/schema.json

@@ -47,7 +47,8 @@
       "type": "string",
       "enum": ["cypress", "playwright", "none"],
       "default": "cypress",
-      "description": "Test runner to use for e2e tests"
+      "description": "Test runner to use for e2e tests",
+      "x-prompt": "Which E2E test runner would you like to use?"
     },
     "tags": {
       "type": "string",