@nx/remix 20.4.0-beta.1 → 20.4.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "20.4.0-beta.1",
+  "version": "20.4.0-beta.2",
   "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": "20.4.0-beta.1",
-    "@nx/js": "20.4.0-beta.1",
-    "@nx/react": "20.4.0-beta.1",
+    "@nx/devkit": "20.4.0-beta.2",
+    "@nx/js": "20.4.0-beta.2",
+    "@nx/react": "20.4.0-beta.2",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },

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

@@ -37,8 +37,12 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     if (!options.addPlugin) {
         throw new Error(`To generate a new Remix Vite application, you must use Inference Plugins. Check you do not have NX_ADD_PLUGINS=false or useInferencePlugins: false in your nx.json.`);
     }
-    const isUsingTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
-    if (!isUsingTsSolution) {
+    // 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.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+    }
+    if (!options.isUsingTsSolutionConfig) {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
             root: options.projectRoot,
             sourceRoot: `${options.projectRoot}`,
@@ -65,7 +69,6 @@ async function remixApplicationGeneratorInternal(tree, _options) {
         eslintVersion: versions_1.eslintVersion,
         typescriptVersion: versions_1.typescriptVersion,
         viteVersion: versions_1.viteVersion,
-        isUsingTsSolution,
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/common'), options.projectRoot, vars);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/nx-welcome', onBoardingStatus), options.projectRoot, { ...vars, connectCloudUrl });
@@ -76,7 +79,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     else {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/non-root'), options.projectRoot, vars);
     }
-    if (isUsingTsSolution) {
+    if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/ts-solution'), options.projectRoot, vars);
     }
     if (options.unitTestRunner !== 'none') {
@@ -197,11 +200,6 @@ 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);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

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

@@ -19,13 +19,8 @@
   "engines": {
     "node": ">=20"
   },
-  "sideEffects": false<% if (isUsingTsSolution) { %>,
+  "sideEffects": false<% if (isUsingTsSolutionConfig && parsedTags?.length) { %>,
   "nx": {
-  <%_ if (name !== projectName) { _%>
-    "name": "<%= name %>",<%_ } _%>
-    "projectType": "application",
-    "sourceRoot": "<%- projectRoot %>"<%_ if (parsedTags?.length) { _%>,
     "tags": <%- JSON.stringify(parsedTags) %>
-    <%_ } _%>
   }<% } %>
 }

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

@@ -6,5 +6,6 @@ export interface NormalizedSchema extends NxRemixGeneratorSchema {
     e2eProjectName: string;
     e2eProjectRoot: string;
     parsedTags: string[];
+    isUsingTsSolutionConfig: boolean;
 }
 export declare function normalizeOptions(tree: Tree, options: NxRemixGeneratorSchema): Promise<NormalizedSchema>;

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

@@ -4,6 +4,8 @@ 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 eslint_1 = require("@nx/eslint");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 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, {
@@ -22,13 +24,18 @@ async function normalizeOptions(tree, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     return {
         ...options,
         linter: options.linter ?? eslint_1.Linter.EsLint,
-        projectName,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(tree, projectName)
+            : projectName,
         projectRoot,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
+        useTsSolution: options.useTsSolution ?? isUsingTsSolutionConfig,
+        isUsingTsSolutionConfig,
     };
 }

package/src/generators/library/lib/add-tsconfig-entry-points.js

@@ -6,7 +6,7 @@ const js_1 = require("@nx/js");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function addTsconfigEntryPoints(tree, options) {
     const { root: projectRoot, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-    const serverFilePath = (0, devkit_1.joinPathFragments)(sourceRoot, 'server.ts');
+    const serverFilePath = (0, devkit_1.joinPathFragments)(sourceRoot ?? 'src', 'server.ts');
     tree.write(serverFilePath, `// This file should be used to export ONLY server-code from the library.`);
     const baseTsConfig = (0, js_1.getRootTsConfigPathInTree)(tree);
     // Use same logic as `determineProjectNameAndRootOptions` to get the import path

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

@@ -4,6 +4,7 @@ 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");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 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, {
@@ -15,11 +16,14 @@ async function normalizeOptions(tree, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     return {
         ...options,
         unitTestRunner: options.unitTestRunner ?? 'vitest',
-        projectName,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(tree, projectName)
+            : projectName,
         projectRoot,
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
+        isUsingTsSolutionConfig,
     };
 }

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

@@ -14,6 +14,9 @@ async function remixLibraryGenerator(tree, schema) {
 async function remixLibraryGeneratorInternal(tree, schema) {
     const tasks = [];
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+    }
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         js: options.js,
         skipFormat: true,
@@ -50,9 +53,6 @@ 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);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);