@nx/remix 0.0.0-pr-29314-e664f92 → 0.0.0-pr-29314-bfd9d0c

package/package.json

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

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

@@ -134,7 +134,6 @@ export default function Index() {
 
 exports[`Remix Application Integrated Repo --e2eTestRunner should generate a cypress e2e application for the app 1`] = `
 "import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
-
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
@@ -386,7 +385,6 @@ export default function Index() {
 
 exports[`Remix Application Standalone Project Repo --e2eTestRunner should generate a cypress e2e application for the app 1`] = `
 "import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
-
 import { defineConfig } from 'cypress';
 
 export default defineConfig({

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

@@ -229,6 +229,11 @@ export default {...nxPreset};
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined, '.');
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.useTsSolution) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
     });

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

@@ -3,5 +3,6 @@ import type { NxRemixGeneratorSchema } from '../schema';
 export interface RemixLibraryOptions extends NxRemixGeneratorSchema {
     projectName: string;
     projectRoot: string;
+    isUsingTsSolutionConfig: boolean;
 }
 export declare function normalizeOptions(tree: Tree, options: NxRemixGeneratorSchema): Promise<RemixLibraryOptions>;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(tree, options) {
     await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
     const { projectName, projectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
@@ -19,5 +20,6 @@ async function normalizeOptions(tree, options) {
         unitTestRunner: options.unitTestRunner ?? 'vitest',
         projectName,
         projectRoot,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
     };
 }

package/src/generators/library/library.impl.js

@@ -49,6 +49,9 @@ async function remixLibraryGeneratorInternal(tree, schema) {
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }