fix(react): add release option for @nx/react:lib --publishable

nrwl · Feb 4, 2025 · 1122711 · 1122711
1 parent 7c2c046
commit 1122711
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 17 deletions.
diff --git a/e2e/release/src/publishable-libraries-release.test.ts b/e2e/release/src/publishable-libraries-release.test.ts
@@ -9,9 +9,8 @@ import {
 describe('publishable libraries release', () => {
   beforeAll(async () => {
     newProject({
-      packages: ['@nx/js'],
+      packages: ['@nx/js', '@nx/react'],
     });
-
     // Normalize git committer information so it is deterministic in snapshots
     await runCommandAsync(`git config user.email "[email protected]"`);
     await runCommandAsync(`git config user.name "Test"`);
@@ -25,14 +24,23 @@ describe('publishable libraries release', () => {
   });
   afterAll(() => cleanupProject());
 
-  it('should be able to release publishable js library', async () => {
+  it('should be able release js publishable libraries', async () => {
     const jsLib = uniq('js-lib');
     runCLI(
       `generate @nx/js:lib ${jsLib} --publishable --importPath=@proj/${jsLib}`
     );
 
-    let versionOutput = runCLI(`release --first-release`);
-    versionOutput = runCLI(`release patch`);
+    runCLI(`release --first-release`);
+    const versionOutput = runCLI(`release patch`);
+    expect(versionOutput).toContain('Executing pre-version command');
+  });
+
+  it('should be able release react publishable libraries', async () => {
+    const reactLib = uniq('react-lib');
+    runCLI(
+      `generate @nx/react:lib ${reactLib} --publishable --importPath=@proj/${reactLib}`
+    );
+    const versionOutput = runCLI(`release patch`);
     expect(versionOutput).toContain('Executing pre-version command');
   });
 });
diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts
@@ -336,8 +336,8 @@ async function configureProject(
       tree,
       options.name,
       projectConfiguration,
-      defaultOutputDirectory,
-      options.isUsingTsSolutionConfig
+      options.isUsingTsSolutionConfig,
+      defaultOutputDirectory
     );
   }
 

diff --git a/packages/js/src/generators/library/utils/add-release-config.ts b/packages/js/src/generators/library/utils/add-release-config.ts
@@ -22,8 +22,8 @@ export async function addReleaseOptionForPublishableTarget(
   tree: Tree,
   projectName: string,
   projectConfiguration: ProjectConfiguration,
-  defaultOutputDirectory: string = 'dist',
-  isUsingTsSolutionConfig: boolean = false
+  isUsingTsSolutionConfig: boolean = false,
+  defaultOutputDirectory: string = 'dist'
 ): Promise<ProjectConfiguration> {
   if (!isUsingTsSolutionConfig) {
     const packageRoot = joinPathFragments(

diff --git a/packages/react/src/generators/library/library.ts b/packages/react/src/generators/library/library.ts
@@ -6,11 +6,11 @@ import {
   GeneratorCallback,
   installPackagesTask,
   joinPathFragments,
-  readNxJson,
+  readProjectConfiguration,
   runTasksInSerial,
   Tree,
   updateJson,
-  updateNxJson,
+  updateProjectConfiguration,
   writeJson,
 } from '@nx/devkit';
 import { getRelativeCwd } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
@@ -37,6 +37,10 @@ import {
 } from '@nx/js/src/utils/typescript/ts-solution-setup';
 import { determineEntryFields } from './lib/determine-entry-fields';
 import { sortPackageJsonFields } from '@nx/js/src/utils/package-json/sort-fields';
+import {
+  addReleaseOptionForPublishableTarget,
+  releaseTasks,
+} from '@nx/js/src/generators/library/utils/add-release-config';
 
 export async function libraryGenerator(host: Tree, schema: Schema) {
   return await libraryGeneratorInternal(host, {
@@ -77,7 +81,7 @@ export async function libraryGeneratorInternal(host: Tree, schema: Schema) {
 
   if (options.isUsingTsSolutionConfig) {
     writeJson(host, `${options.projectRoot}/package.json`, {
-      name: options.importPath,
+      name: options.importPath ?? options.name,
       version: '0.0.1',
       ...determineEntryFields(options),
       nx: options.parsedTags?.length
@@ -236,11 +240,16 @@ export async function libraryGeneratorInternal(host: Tree, schema: Schema) {
     tasks.push(componentTask);
   }
 
-  if (options.publishable || options.buildable) {
-    updateJson(host, `${options.projectRoot}/package.json`, (json) => {
-      json.name = options.importPath;
-      return json;
-    });
+  if (options.publishable) {
+    const projectConfiguration = readProjectConfiguration(host, options.name);
+    await addReleaseOptionForPublishableTarget(
+      host,
+      options.name,
+      projectConfiguration,
+      options.isUsingTsSolutionConfig
+    );
+    updateProjectConfiguration(host, options.name, projectConfiguration);
+    tasks.push(await releaseTasks(host));
   }
 
   if (!options.skipPackageJson) {