@nx/remix 21.0.0-beta.4 → 21.0.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "21.0.0-beta.4",
+  "version": "21.0.0-beta.5",
   "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, Playwright, 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",
@@ -29,9 +29,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.0.0-beta.4",
-    "@nx/js": "21.0.0-beta.4",
-    "@nx/react": "21.0.0-beta.4",
+    "@nx/devkit": "21.0.0-beta.5",
+    "@nx/js": "21.0.0-beta.5",
+    "@nx/react": "21.0.0-beta.5",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },

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

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2E = addE2E;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 async function addE2E(tree, options) {
     const hasRemixPlugin = (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
@@ -42,31 +40,14 @@ async function addE2E(tree, options) {
             skipFormat: true,
             devServerTarget: e2eWebsServerInfo.e2eDevServerTarget,
             baseUrl: e2eWebsServerInfo.e2eWebServerAddress,
-            webServerCommands: hasRemixPlugin
-                ? {
-                    default: e2eWebsServerInfo.e2eWebServerCommand,
-                    production: e2eWebsServerInfo.e2eCiWebServerCommand,
-                }
-                : undefined,
-            ciWebServerCommand: hasRemixPlugin
-                ? e2eWebsServerInfo.e2eCiWebServerCommand
-                : undefined,
+            webServerCommands: {
+                default: e2eWebsServerInfo.e2eWebServerCommand,
+                production: e2eWebsServerInfo.e2eCiWebServerCommand,
+            },
+            ciWebServerCommand: e2eWebsServerInfo.e2eCiWebServerCommand,
             ciBaseUrl: e2eWebsServerInfo.e2eCiBaseUrl,
             addPlugin: options.addPlugin,
         });
-        if (options.addPlugin ||
-            (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
-                ? p === '@nx/cypress/plugin'
-                : p.plugin === '@nx/cypress/plugin')) {
-            let buildTarget = '^build';
-            if (hasRemixPlugin) {
-                const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, `@nx/remix/plugin`, (0, devkit_1.joinPathFragments)(options.projectRoot, 'remix.config.js'));
-                if (matchingPlugin && typeof matchingPlugin !== 'string') {
-                    buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
-                }
-            }
-            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/cypress/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `cypress.config.ts`));
-        }
         return e2eTask;
     }
     else if (options.e2eTestRunner === 'playwright') {
@@ -107,19 +88,6 @@ async function addE2E(tree, options) {
             rootProject: options.rootProject,
             addPlugin: options.addPlugin,
         });
-        if (options.addPlugin ||
-            (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
-                ? p === '@nx/playwright/plugin'
-                : p.plugin === '@nx/playwright/plugin')) {
-            let buildTarget = '^build';
-            if (hasRemixPlugin) {
-                const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, `@nx/remix/plugin`, (0, devkit_1.joinPathFragments)(options.projectRoot, 'remix.config.js'));
-                if (matchingPlugin && typeof matchingPlugin !== 'string') {
-                    buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
-                }
-            }
-            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/playwright/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `playwright.config.ts`));
-        }
         return e2eTask;
     }
     else {