@nx/remix 0.0.0-pr-28808-bceb02f → 0.0.0-pr-28808-ae8ea8d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "0.0.0-pr-28808-bceb02f",
+  "version": "0.0.0-pr-28808-ae8ea8d",
   "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": "0.0.0-pr-28808-bceb02f",
-    "@nx/js": "0.0.0-pr-28808-bceb02f",
-    "@nx/react": "0.0.0-pr-28808-bceb02f",
+    "@nx/devkit": "0.0.0-pr-28808-ae8ea8d",
+    "@nx/js": "0.0.0-pr-28808-ae8ea8d",
+    "@nx/react": "0.0.0-pr-28808-ae8ea8d",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },

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

@@ -228,7 +228,7 @@ export default {...nxPreset};
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
-        : undefined);
+        : undefined, '.');
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
     });

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

@@ -6,6 +6,7 @@ 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");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function addE2E(tree, options) {
     const hasRemixPlugin = (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
         ? p === '@nx/remix/plugin'
@@ -13,14 +14,26 @@ async function addE2E(tree, options) {
     let e2eWebsServerInfo = await getRemixE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.projectRoot, 'remix.config.js'), options.addPlugin ?? Boolean(hasRemixPlugin));
     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, {
-            projectType: 'application',
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            tags: [],
-            implicitDependencies: [options.projectName],
-        });
+        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+            (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    name: options.e2eProjectName,
+                },
+            });
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
         const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             directory: 'src',