@nx/remix 20.5.0-rc.3 → 20.5.0-rc.4

package/package.json

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

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

@@ -81,6 +81,16 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     }
     if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/ts-solution'), options.projectRoot, vars);
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
+            if (options.projectName !== options.importPath) {
+                json.nx = { name: options.projectName };
+            }
+            if (options.parsedTags?.length) {
+                json.nx ??= {};
+                json.nx.tags = options.parsedTags;
+            }
+            return json;
+        });
     }
     if (options.unitTestRunner !== 'none') {
         if (options.unitTestRunner === 'vitest') {

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

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "<%= projectName %>",
+  "name": "<%= importPath %>",
   "scripts": {},
   "type": "module",
   "dependencies": {
@@ -19,8 +19,5 @@
   "engines": {
     "node": ">=20"
   },
-  "sideEffects": false<% if (isUsingTsSolutionConfig && parsedTags?.length) { %>,
-  "nx": {
-    "tags": <%- JSON.stringify(parsedTags) %>
-  }<% } %>
+  "sideEffects": false
 }

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

@@ -20,8 +20,6 @@ async function addE2E(tree, options) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    projectType: 'application',
-                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     implicitDependencies: [options.projectName],
                 },
             });
@@ -77,8 +75,6 @@ async function addE2E(tree, options) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    projectType: 'application',
-                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     implicitDependencies: [options.projectName],
                 },
             });

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

@@ -3,6 +3,7 @@ import { type NxRemixGeneratorSchema } from '../schema';
 export interface NormalizedSchema extends NxRemixGeneratorSchema {
     projectName: string;
     projectRoot: string;
+    importPath: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
     parsedTags: string[];

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

@@ -5,10 +5,9 @@ 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, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -19,23 +18,23 @@ async function normalizeOptions(tree, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const e2eProjectName = options.rootProject ? 'e2e' : `${projectName}-e2e`;
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
+    const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${projectRoot}-e2e`;
     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: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(tree, projectName)
-            : projectName,
+        projectName: appProjectName,
         projectRoot,
+        importPath,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
-        useTsSolution: options.useTsSolution ?? isUsingTsSolutionConfig,
+        useTsSolution: isUsingTsSolutionConfig,
         isUsingTsSolutionConfig,
     };
 }

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

@@ -3,19 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTsconfigEntryPoints = addTsconfigEntryPoints;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-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");
 function addTsconfigEntryPoints(tree, options) {
     const { root: projectRoot, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-    const serverFilePath = (0, devkit_1.joinPathFragments)(...(sourceRoot ? [sourceRoot] : [projectRoot, 'src']), 'server.ts');
+    const projectSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(tree, sourceRoot, projectRoot);
+    const serverFilePath = (0, devkit_1.joinPathFragments)(projectSourceRoot, '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
-    const importPath = (0, project_name_and_root_utils_1.resolveImportPath)(tree, options.name, projectRoot);
     (0, devkit_1.updateJson)(tree, baseTsConfig, (json) => {
-        if (json.compilerOptions.paths && json.compilerOptions.paths[importPath]) {
-            json.compilerOptions.paths[(0, devkit_1.joinPathFragments)(importPath, 'server')] = [
-                serverFilePath,
-            ];
+        if (json.compilerOptions.paths &&
+            json.compilerOptions.paths[options.importPath]) {
+            json.compilerOptions.paths[(0, devkit_1.joinPathFragments)(options.importPath, 'server')] = [serverFilePath];
         }
         return json;
     });

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

@@ -4,10 +4,9 @@ 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, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
@@ -20,10 +19,9 @@ async function normalizeOptions(tree, options) {
     return {
         ...options,
         unitTestRunner: options.unitTestRunner ?? 'vitest',
-        projectName: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(tree, projectName)
-            : projectName,
+        projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectRoot,
+        importPath,
         isUsingTsSolutionConfig,
     };
 }

package/src/generators/library/lib/update-buildable-config.js

@@ -13,7 +13,7 @@ function updateBuildableConfig(tree, options) {
         format: ['cjs'],
         outputPath: (0, devkit_1.joinPathFragments)(project.root, 'dist'),
     };
-    (0, devkit_1.updateProjectConfiguration)(tree, options.name, project);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
     // Point to nested dist for yarn/npm/pnpm workspaces
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'package.json'), (json) => {
         json.main = './dist/index.cjs.js';