@nx/remix 19.5.6 → 19.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "19.5.6",
+  "version": "19.6.0-beta.0",
   "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,12 +29,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.5.6",
-    "@nx/js": "19.5.6",
-    "@nx/react": "19.5.6",
+    "@nx/devkit": "19.6.0-beta.0",
+    "@nx/js": "19.6.0-beta.0",
+    "@nx/react": "19.6.0-beta.0",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "19.5.6"
+    "@nrwl/remix": "19.6.0-beta.0"
   },
   "peerDependencies": {},
   "publishConfig": {

package/src/generators/application/application.impl.js

@@ -9,7 +9,7 @@ const lib_1 = require("./lib");
 const update_dependencies_1 = require("../utils/update-dependencies");
 const init_1 = require("../init/init");
 const js_1 = require("@nx/js");
-const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const testing_config_utils_1 = require("../../utils/testing-config-utils");
 function remixApplicationGenerator(tree, options) {
@@ -27,7 +27,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
         }),
         await (0, js_1.initGenerator)(tree, { skipFormat: true }),
     ];
-    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, '@nx/remix:build');
+    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/remix:build');
     (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
         root: options.projectRoot,
         sourceRoot: `${options.projectRoot}`,

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

@@ -3,7 +3,12 @@ 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");
 async function addE2E(tree, options) {
+    const hasRemixPlugin = (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
+        ? p === '@nx/remix/plugin'
+        : p.plugin === '@nx/remix/plugin');
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', (0, versions_1.getPackageVersion)(tree, 'nx'));
         (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -14,7 +19,7 @@ async function addE2E(tree, options) {
             tags: [],
             implicitDependencies: [options.projectName],
         });
-        return await configurationGenerator(tree, {
+        const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             directory: 'src',
             skipFormat: true,
@@ -22,6 +27,20 @@ async function addE2E(tree, options) {
             baseUrl: options.e2eWebServerAddress,
             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.${options.js ? 'js' : 'ts'}`));
+        }
+        return e2eTask;
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', (0, versions_1.getPackageVersion)(tree, 'nx'));
@@ -33,7 +52,7 @@ async function addE2E(tree, options) {
             tags: [],
             implicitDependencies: [options.projectName],
         });
-        return configurationGenerator(tree, {
+        const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             skipFormat: true,
             skipPackageJson: false,
@@ -46,6 +65,20 @@ 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 {
         return () => { };