@nx/react-native 0.0.0-pr-29993-f89d4dd → 0.0.0-pr-3-e51e28c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-29993-f89d4dd",
+  "version": "0.0.0-pr-3-e51e28c",
   "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-29993-f89d4dd",
-    "@nx/jest": "0.0.0-pr-29993-f89d4dd",
-    "@nx/js": "0.0.0-pr-29993-f89d4dd",
-    "@nx/eslint": "0.0.0-pr-29993-f89d4dd",
-    "@nx/react": "0.0.0-pr-29993-f89d4dd",
-    "@nx/workspace": "0.0.0-pr-29993-f89d4dd"
+    "@nx/devkit": "0.0.0-pr-3-e51e28c",
+    "@nx/jest": "0.0.0-pr-3-e51e28c",
+    "@nx/js": "0.0.0-pr-3-e51e28c",
+    "@nx/eslint": "0.0.0-pr-3-e51e28c",
+    "@nx/react": "0.0.0-pr-3-e51e28c",
+    "@nx/workspace": "0.0.0-pr-3-e51e28c"
   },
   "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/component/component.js

@@ -11,9 +11,7 @@ async function reactNativeComponentGenerator(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
     addExportsToBarrel(host, options);
-    if (!options.skipFormat) {
-        await (0, devkit_1.formatFiles)(host);
-    }
+    await (0, devkit_1.formatFiles)(host);
 }
 function createComponentFiles(host, options) {
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files', options.fileExtensionType), options.directory, {
@@ -33,9 +31,7 @@ function addExportsToBarrel(host, options) {
     const proj = workspace.get(options.projectName);
     const isApp = (0, ts_solution_setup_1.getProjectType)(host, proj.root, proj.projectType) === 'application';
     if (options.export && !isApp) {
-        const indexFilePath = (0, devkit_1.joinPathFragments)(...(options.projectSourceRoot
-            ? [options.projectSourceRoot]
-            : [options.projectRoot, 'src']), options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
+        const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
         if (!host.exists(indexFilePath)) {
             return;
         }

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

@@ -10,6 +10,5 @@ export interface NormalizedSchema extends Omit<Schema, 'js'> {
     fileExtension: string;
     fileExtensionType: FileExtensionType;
     projectName: string;
-    projectRoot: string;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -31,6 +31,5 @@ async function normalizeOptions(host, options) {
         fileExtensionType,
         projectSourceRoot,
         projectName,
-        projectRoot: root,
     };
 }

package/src/generators/component/schema.d.ts

@@ -7,7 +7,6 @@ export interface Schema {
   skipTests?: boolean;
   export?: boolean;
   classComponent?: boolean;
-  skipFormat?: boolean;
 
   /**
    * @deprecated Provide the full file path including the file extension in the `path` option. This option will be removed in Nx v21.

package/src/generators/component/schema.json

@@ -59,12 +59,6 @@
       "alias": "C",
       "description": "Use class components instead of functional component.",
       "default": false
-    },
-    "skipFormat": {
-      "description": "Skip formatting files.",
-      "type": "boolean",
-      "default": false,
-      "x-priority": "internal"
     }
   },
   "required": ["path"]

package/src/generators/library/files/lib/package.json.template

@@ -0,0 +1,4 @@
+{
+  "name": "<%= name %>",
+  "version": "0.0.1"
+}

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
+            ? (0, get_import_path_1.getImportPath)(host, projectName)
+            : projectName,
         projectRoot,
         parsedTags,
         importPath,

package/src/generators/library/library.js

@@ -7,16 +7,12 @@ const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
-const component_1 = require("../component/component");
+const versions_1 = require("../../utils/versions");
 const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
-const add_rollup_build_target_1 = require("@nx/react/src/generators/library/lib/add-rollup-build-target");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const path_1 = require("path");
-const versions_1 = require("../../utils/versions");
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
         addPlugin: false,
@@ -44,9 +40,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,
@@ -57,16 +50,9 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     tasks.push(lintTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin, 'tsconfig.lib.json');
     tasks.push(jestTask);
-    const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
-    const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
-    const componentTask = await (0, component_1.default)(host, {
-        path: relativeCwd ? (0, path_1.relative)(relativeCwd, path) : path,
-        skipTests: options.unitTestRunner === 'none',
-        export: true,
-        skipFormat: true,
-        js: options.js,
-    });
-    tasks.push(() => componentTask);
+    if (options.publishable || options.buildable) {
+        updateLibPackageNpmScope(host, options);
+    }
     if (!options.skipTsConfig && !options.isUsingTsSolutionConfig) {
         (0, js_1.addTsConfigPath)(host, options.importPath, [
             (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
@@ -79,6 +65,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);
@@ -100,54 +89,61 @@ async function addProject(host, options) {
         tags: options.parsedTags,
         targets: {},
     };
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
     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),
-            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
-            peerDependencies: {
-                react: versions_1.reactVersion,
-                'react-native': versions_1.reactNativeVersion,
+            nx: {
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
             },
-        };
-        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);
     }
-    if (options.publishable || options.buildable) {
-        const external = new Set([
-            'react/jsx-runtime',
-            'react-native',
-            'react',
-            'react-dom',
-        ]);
-        const rollupTask = await (0, add_rollup_build_target_1.addRollupBuildTarget)(host, {
-            ...options,
-            format: ['cjs', 'esm'],
-            style: 'none',
-            js: options.js,
-            skipFormat: true,
-        }, external);
-        (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
-            json.peerDependencies = {
-                ...json.peerDependencies,
-                react: versions_1.reactVersion,
-                'react-native': versions_1.reactNativeVersion,
-            };
-            return json;
-        });
-        return rollupTask;
+    if (!options.publishable && !options.buildable) {
+        return () => { };
     }
-    return () => { };
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+    const rollupConfigTask = await configurationGenerator(host, {
+        ...options,
+        project: options.name,
+        skipFormat: true,
+    });
+    (0, devkit_1.updateJson)(host, packageJsonPath, (json) => {
+        if (json.type === 'module') {
+            // The @nx/rollup:configuration generator can set the type to 'module' which would
+            // potentially break this library.
+            delete json.type;
+        }
+        return json;
+    });
+    const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
+    project.targets.build = {
+        executor: '@nx/rollup:rollup',
+        outputs: ['{options.outputPath}'],
+        options: {
+            outputPath: options.isUsingTsSolutionConfig
+                ? `${options.projectRoot}/dist`
+                : `dist/${options.projectRoot}`,
+            tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
+            project: `${options.projectRoot}/package.json`,
+            entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
+            external,
+            rollupConfig: `@nx/react/plugins/bundle-rollup`,
+            assets: [
+                {
+                    glob: `${options.projectRoot}/README.md`,
+                    input: '.',
+                    output: '.',
+                },
+            ],
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
+    return rollupConfigTask;
 }
 function updateTsConfig(tree, options) {
     if (options.isUsingTsSolutionConfig) {
@@ -173,12 +169,33 @@ function createFiles(host, options) {
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
     });
+    if (!options.publishable && !options.buildable) {
+        host.delete(`${options.projectRoot}/package.json`);
+    }
     if (options.js) {
         (0, devkit_1.toJS)(host);
     }
     updateTsConfig(host, options);
 }
+function updateLibPackageNpmScope(host, options) {
+    return (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
+        json.name = options.importPath;
+        json.peerDependencies = {
+            react: versions_1.reactVersion,
+            'react-native': versions_1.reactNativeVersion,
+        };
+        return json;
+    });
+}
+function maybeJs(options, path) {
+    return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
+        ? path.replace(/\.tsx?$/, '.js')
+        : path;
+}
 function determineEntryFields(options) {
+    if (options.buildable) {
+        return {};
+    }
     return {
         main: options.js ? './src/index.js' : './src/index.ts',
         types: options.js ? './src/index.js' : './src/index.ts',