@nx/remix 0.0.0-pr-28808-ae8ea8d → 0.0.0-pr-28808-41aa4e0

package/package.json

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

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

@@ -67,16 +67,16 @@ async function remixApplicationGeneratorInternal(tree, _options) {
         isUsingTsSolution,
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/common'), options.projectRoot, vars);
-    if (isUsingTsSolution) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/ts-solution'), options.projectRoot, vars);
-    }
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/nx-welcome', onBoardingStatus), options.projectRoot, { ...vars, connectCloudUrl });
     if (options.rootProject) {
         const gitignore = tree.read('.gitignore', 'utf-8');
         tree.write('.gitignore', `${gitignore}\n.cache\nbuild\npublic/build\n.env\n`);
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/integrated'), options.projectRoot, vars);
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/non-root'), options.projectRoot, vars);
+    }
+    if (isUsingTsSolution) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/ts-solution'), options.projectRoot, vars);
     }
     if (options.unitTestRunner !== 'none') {
         if (options.unitTestRunner === 'vitest') {

package/src/generators/application/files/{integrated → non-root}/package.json__tmpl__

@@ -17,14 +17,10 @@
     "@types/react-dom": "<%= typesReactDomVersion %>",
     "eslint": "<%= eslintVersion %>",
     "typescript": "<%= typescriptVersion %>",
-    "vite": "<%= viteVersion %>"
+    "vite": "<%= viteVersion %>",
   },
   "engines": {
     "node": ">=20"
   },
-  "sideEffects": false<% if (isUsingTsSolution) { %>,
-  "nx": {
-    "name": "<%= name %>"
-  }
-  <% } %>
+  "sideEffects": false
 }

package/src/generators/application/files/ts-solution/package.json__tmpl__

@@ -0,0 +1,28 @@
+{
+  "private": true,
+  "name": "<%= projectName %>",
+  "scripts": {},
+  "type": "module",
+  "dependencies": {
+    "@remix-run/node": "<%= remixVersion %>",
+    "@remix-run/react": "<%= remixVersion %>",
+    "@remix-run/serve": "<%= remixVersion %>",
+    "isbot": "<%= isbotVersion %>",
+    "react": "<%= reactVersion %>",
+    "react-dom": "<%= reactDomVersion %>"
+  },
+  "devDependencies": {
+    "@remix-run/dev": "<%= remixVersion %>",
+    "@types/react": "<%= typesReactVersion %>",
+    "@types/react-dom": "<%= typesReactDomVersion %>"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "sideEffects": false<% if (isUsingTsSolution) { %>,
+  "nx": {<%_ if (name !== projectName) { _%>
+    "name": "<%= name %>",
+    <%_ } _%>"projectType": "application"
+  }
+  <% } %>
+}

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

@@ -20,7 +20,8 @@ async function addE2E(tree, options) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    name: options.e2eProjectName,
+                    projectType: 'application',
+                    implicitDependencies: [options.projectName],
                 },
             });
         }
@@ -69,14 +70,27 @@ async function addE2E(tree, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', (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: {
+                    projectType: 'application',
+                    implicitDependencies: [options.projectName],
+                },
+            });
+        }
+        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,
             skipFormat: true,