@nx/react-native 0.0.0-pr-30111-5026d75 → 0.0.0-pr-30250-ec5f231

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-30111-5026d75",
+  "version": "0.0.0-pr-30250-ec5f231",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -35,12 +35,12 @@
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-30111-5026d75",
-    "@nx/jest": "0.0.0-pr-30111-5026d75",
-    "@nx/js": "0.0.0-pr-30111-5026d75",
-    "@nx/eslint": "0.0.0-pr-30111-5026d75",
-    "@nx/react": "0.0.0-pr-30111-5026d75",
-    "@nx/workspace": "0.0.0-pr-30111-5026d75"
+    "@nx/devkit": "0.0.0-pr-30250-ec5f231",
+    "@nx/jest": "0.0.0-pr-30250-ec5f231",
+    "@nx/js": "0.0.0-pr-30250-ec5f231",
+    "@nx/eslint": "0.0.0-pr-30250-ec5f231",
+    "@nx/react": "0.0.0-pr-30250-ec5f231",
+    "@nx/workspace": "0.0.0-pr-30250-ec5f231"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/application.js

@@ -43,11 +43,6 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     }
     await (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
-    // 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.isTsSolutionSetup) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
-    }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectRoot: options.appProjectRoot,
@@ -93,6 +88,11 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     }, 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)(host, options.appProjectRoot);
+    }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

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

@@ -14,7 +14,6 @@ async function addE2e(host, options) {
                 styledModule: null,
                 hasStyles: false,
                 unitTestRunner: 'none',
-                names: (0, devkit_1.names)(options.name),
             });
         case 'playwright':
             return (0, add_e2e_1.addE2e)(host, {
@@ -24,7 +23,6 @@ async function addE2e(host, options) {
                 styledModule: null,
                 hasStyles: false,
                 unitTestRunner: 'none',
-                names: (0, devkit_1.names)(options.name),
             });
         case 'detox':
             const { detoxApplicationGenerator } = (0, devkit_1.ensurePackage)('@nx/detox', versions_1.nxVersion);

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

@@ -16,23 +16,15 @@ function addProject(host, options) {
         tags: options.parsedTags,
     };
     if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        const packageJson = {
-            name: options.importPath,
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: options.projectName,
             version: '0.0.1',
             private: true,
-        };
-        if (options.projectName !== options.importPath) {
-            packageJson.nx = { name: options.projectName };
-        }
-        if (!hasPlugin) {
-            packageJson.nx ??= {};
-            packageJson.nx.targets = getTargets(options);
-        }
-        if (options.parsedTags?.length) {
-            packageJson.nx ??= {};
-            packageJson.nx.tags = options.parsedTags;
-        }
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+            nx: {
+                targets: hasPlugin ? {} : getTargets(options),
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, {

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

@@ -1,6 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
-export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
+export interface NormalizedSchema extends Schema {
     className: string;
     fileName: string;
     projectName: string;
@@ -13,7 +13,6 @@ export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
     rootProject: boolean;
     e2eProjectName: string;
     e2eProjectRoot: string;
-    importPath: string;
     isTsSolutionSetup: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -4,9 +4,10 @@ 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(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, names: projectNames, projectRoot: appProjectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -15,18 +16,17 @@ async function normalizeOptions(host, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const { className, fileName } = (0, devkit_1.names)(projectNames.projectSimpleName);
+    const { className, fileName } = (0, devkit_1.names)(options.name);
     const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
     const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');
     const rootProject = appProjectRoot === '.';
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
     const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const entryFile = options.js ? 'src/main.js' : 'src/main.tsx';
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         name: projectNames.projectSimpleName,
@@ -34,9 +34,10 @@ async function normalizeOptions(host, options) {
         fileName,
         lowerCaseName: className.toLowerCase(),
         displayName: options.displayName || className,
-        projectName: appProjectName,
+        projectName: isTsSolutionSetup
+            ? (0, get_import_path_1.getImportPath)(host, appProjectName)
+            : appProjectName,
         appProjectRoot,
-        importPath,
         iosProjectRoot,
         androidProjectRoot,
         parsedTags,

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

@@ -4,7 +4,6 @@ export interface NormalizedSchema extends Schema {
     name: string;
     fileName: string;
     projectRoot: string;
-    importPath: string;
     routePath: string;
     parsedTags: string[];
     appMain?: string;

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

@@ -4,8 +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(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
@@ -24,7 +25,9 @@ async function normalizeOptions(host, options) {
         ...options,
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
-        name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
+        name: isUsingTsSolutionConfig
+            ? options.importPath ?? (0, get_import_path_1.getImportPath)(host, projectName)
+            : projectName,
         projectRoot,
         parsedTags,
         importPath,

package/src/generators/library/library.js

@@ -44,9 +44,6 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     if (addProjectTask) {
         tasks.push(addProjectTask);
     }
-    if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
-    }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectName: options.name,
@@ -79,6 +76,9 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+    }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -101,24 +101,19 @@ async function addProject(host, options) {
         targets: {},
     };
     if (options.isUsingTsSolutionConfig) {
-        const packageJson = {
-            name: options.importPath,
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+            name: options.name,
             version: '0.0.1',
             ...determineEntryFields(options),
+            nx: {
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
             files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
             peerDependencies: {
                 react: versions_1.reactVersion,
                 'react-native': versions_1.reactNativeVersion,
             },
-        };
-        if (options.name !== options.importPath) {
-            packageJson.nx = { name: options.name };
-        }
-        if (options.parsedTags?.length) {
-            packageJson.nx ??= {};
-            packageJson.nx.tags = options.parsedTags;
-        }
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
+        });
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.name, project);