@nx/js 20.4.2 → 20.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.4.2",
+  "version": "20.4.4",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "20.4.2",
-    "@nx/workspace": "20.4.2",
+    "@nx/devkit": "20.4.4",
+    "@nx/workspace": "20.4.4",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",

package/src/generators/library/library.js

@@ -8,7 +8,6 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
 const prompt_1 = require("@nx/devkit/src/generators/prompt");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-const find_matching_projects_1 = require("nx/src/utils/find-matching-projects");
 const path_1 = require("path");
 const generator_prompts_1 = require("../../utils/generator-prompts");
 const update_package_json_1 = require("../../utils/package-json/update-package-json");
@@ -22,9 +21,9 @@ const ts_config_1 = require("../../utils/typescript/ts-config");
 const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
-const generator_1 = require("../setup-verdaccio/generator");
 const sort_fields_1 = require("../../utils/package-json/sort-fields");
 const get_import_path_1 = require("../../utils/get-import-path");
+const add_release_config_1 = require("./utils/add-release-config");
 const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
@@ -54,9 +53,6 @@ async function libraryGeneratorInternal(tree, schema) {
     if (!options.skipPackageJson) {
         tasks.push(addProjectDependencies(tree, options));
     }
-    if (options.publishable) {
-        tasks.push(await (0, generator_1.default)(tree, { ...options, skipFormat: true }));
-    }
     if (options.bundler === 'rollup') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
         await configurationGenerator(tree, {
@@ -151,9 +147,7 @@ async function libraryGeneratorInternal(tree, schema) {
         await (0, devkit_1.formatFiles)(tree);
     }
     if (options.publishable) {
-        tasks.push(() => {
-            logNxReleaseDocsInfo();
-        });
+        tasks.push(await (0, add_release_config_1.releaseTasks)(tree));
     }
     // Always run install to link packages.
     if (options.isUsingTsSolutionConfig) {
@@ -220,26 +214,12 @@ async function configureProject(tree, options) {
         }
     }
     if (options.publishable) {
-        if (!options.isUsingTsSolutionConfig) {
-            const packageRoot = (0, devkit_1.joinPathFragments)(defaultOutputDirectory, '{projectRoot}');
-            projectConfiguration.targets ??= {};
-            projectConfiguration.targets['nx-release-publish'] = {
-                options: {
-                    packageRoot,
-                },
-            };
-            projectConfiguration.release = {
-                version: {
-                    generatorOptions: {
-                        packageRoot,
-                        // using git tags to determine the current version is required here because
-                        // the version in the package root is overridden with every build
-                        currentVersionResolver: 'git-tag',
-                    },
-                },
-            };
+        if (options.isUsingTsSolutionConfig) {
+            await (0, add_release_config_1.addReleaseConfigForTsSolution)(tree, options.name, projectConfiguration);
+        }
+        else {
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(tree, options.name, projectConfiguration, defaultOutputDirectory);
         }
-        await addProjectToNxReleaseConfig(tree, options, projectConfiguration);
     }
     if (!options.useProjectJson) {
         // we want the package.json as clean as possible, with the bare minimum
@@ -930,96 +910,6 @@ function determineEntryFields(options) {
         }
     }
 }
-function projectsConfigMatchesProject(projectsConfig, project) {
-    if (!projectsConfig) {
-        return false;
-    }
-    if (typeof projectsConfig === 'string') {
-        projectsConfig = [projectsConfig];
-    }
-    const graph = {
-        [project.name]: project,
-    };
-    const matchingProjects = (0, find_matching_projects_1.findMatchingProjects)(projectsConfig, graph);
-    return matchingProjects.includes(project.name);
-}
-async function addProjectToNxReleaseConfig(tree, options, projectConfiguration) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPreVersionCommand = () => {
-        const pmc = (0, devkit_1.getPackageManagerCommand)();
-        nxJson.release = {
-            ...nxJson.release,
-            version: {
-                preVersionCommand: `${pmc.dlx} nx run-many -t build`,
-                ...nxJson.release?.version,
-            },
-        };
-    };
-    if (!nxJson.release || (!nxJson.release.projects && !nxJson.release.groups)) {
-        // skip adding any projects configuration since the new project should be
-        // automatically included by nx release's default project detection logic
-        addPreVersionCommand();
-        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
-        return;
-    }
-    const project = {
-        name: options.name,
-        type: 'lib',
-        data: {
-            root: projectConfiguration.root,
-            tags: projectConfiguration.tags,
-        },
-    };
-    if (projectsConfigMatchesProject(nxJson.release.projects, project)) {
-        devkit_1.output.log({
-            title: `Project already included in existing release configuration`,
-        });
-        addPreVersionCommand();
-        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
-        return;
-    }
-    if (Array.isArray(nxJson.release.projects)) {
-        nxJson.release.projects.push(options.name);
-        addPreVersionCommand();
-        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
-        devkit_1.output.log({
-            title: `Added project to existing release configuration`,
-        });
-    }
-    if (nxJson.release.groups) {
-        const allGroups = Object.entries(nxJson.release.groups);
-        for (const [name, group] of allGroups) {
-            if (projectsConfigMatchesProject(group.projects, project)) {
-                addPreVersionCommand();
-                (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
-                return `Project already included in existing release configuration for group ${name}`;
-            }
-        }
-        devkit_1.output.warn({
-            title: `Could not find a release group that includes ${options.name}`,
-            bodyLines: [
-                `Ensure that ${options.name} is included in a release group's "projects" list in nx.json so it can be published with "nx release"`,
-            ],
-        });
-        addPreVersionCommand();
-        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
-        return;
-    }
-    if (typeof nxJson.release.projects === 'string') {
-        nxJson.release.projects = [nxJson.release.projects, options.name];
-        addPreVersionCommand();
-        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
-        devkit_1.output.log({
-            title: `Added project to existing release configuration`,
-        });
-        return;
-    }
-}
-function logNxReleaseDocsInfo() {
-    devkit_1.output.log({
-        title: `📦 To learn how to publish this library, see https://nx.dev/core-features/manage-releases.`,
-    });
-}
 function findRootJestPreset(tree) {
     const ext = ['js', 'cjs', 'mjs'].find((ext) => tree.exists(`jest.preset.${ext}`));
     return ext ? `jest.preset.${ext}` : null;

package/src/generators/library/utils/add-release-config.d.ts

@@ -0,0 +1,11 @@
+import { GeneratorCallback, ProjectConfiguration, Tree } from '@nx/devkit';
+/**
+ * Adds release option in nx.json to build the project before versioning
+ */
+export declare function addReleaseConfigForTsSolution(tree: Tree, projectName: string, projectConfiguration: ProjectConfiguration): Promise<void>;
+/**
+ * Add release configuration for non-ts solution projects
+ * Add release option in project.json and add packageRoot to nx-release-publish target
+ */
+export declare function addReleaseConfigForNonTsSolution(tree: Tree, projectName: string, projectConfiguration: ProjectConfiguration, defaultOutputDirectory?: string): Promise<ProjectConfiguration>;
+export declare function releaseTasks(tree: Tree): Promise<GeneratorCallback>;

package/src/generators/library/utils/add-release-config.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addReleaseConfigForTsSolution = addReleaseConfigForTsSolution;
+exports.addReleaseConfigForNonTsSolution = addReleaseConfigForNonTsSolution;
+exports.releaseTasks = releaseTasks;
+const devkit_1 = require("@nx/devkit");
+const find_matching_projects_1 = require("nx/src/utils/find-matching-projects");
+const generator_1 = require("../../setup-verdaccio/generator");
+/**
+ * Adds release option in nx.json to build the project before versioning
+ */
+async function addReleaseConfigForTsSolution(tree, projectName, projectConfiguration) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPreVersionCommand = () => {
+        const pmc = (0, devkit_1.getPackageManagerCommand)();
+        nxJson.release = {
+            ...nxJson.release,
+            version: {
+                preVersionCommand: `${pmc.dlx} nx run-many -t build`,
+                ...nxJson.release?.version,
+            },
+        };
+    };
+    // if the release configuration does not exist, it will be created
+    if (!nxJson.release || (!nxJson.release.projects && !nxJson.release.groups)) {
+        // skip adding any projects configuration since the new project should be
+        // automatically included by nx release's default project detection logic
+        addPreVersionCommand();
+        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
+        return;
+    }
+    const project = {
+        name: projectName,
+        type: 'lib',
+        data: {
+            root: projectConfiguration.root,
+            tags: projectConfiguration.tags,
+        },
+    };
+    // if the project is already included in the release configuration, it will not be added again
+    if (projectsConfigMatchesProject(nxJson.release.projects, project)) {
+        devkit_1.output.log({
+            title: `Project already included in existing release configuration`,
+        });
+        addPreVersionCommand();
+        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
+        return;
+    }
+    // if the release configuration is a string, it will be converted to an array and added to it
+    if (Array.isArray(nxJson.release.projects)) {
+        nxJson.release.projects.push(projectName);
+        addPreVersionCommand();
+        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
+        devkit_1.output.log({
+            title: `Added project to existing release configuration`,
+        });
+    }
+    if (nxJson.release.groups) {
+        const allGroups = Object.entries(nxJson.release.groups);
+        for (const [name, group] of allGroups) {
+            if (projectsConfigMatchesProject(group.projects, project)) {
+                addPreVersionCommand();
+                (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
+                devkit_1.output.log({
+                    title: `Project already included in existing release configuration for group ${name}`,
+                });
+                return;
+            }
+        }
+        devkit_1.output.warn({
+            title: `Could not find a release group that includes ${projectName}`,
+            bodyLines: [
+                `Ensure that ${projectName} is included in a release group's "projects" list in nx.json so it can be published with "nx release"`,
+            ],
+        });
+        addPreVersionCommand();
+        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
+        return;
+    }
+    if (typeof nxJson.release.projects === 'string') {
+        nxJson.release.projects = [nxJson.release.projects, projectName];
+        addPreVersionCommand();
+        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
+        devkit_1.output.log({
+            title: `Added project to existing release configuration`,
+        });
+        return;
+    }
+}
+/**
+ * Add release configuration for non-ts solution projects
+ * Add release option in project.json and add packageRoot to nx-release-publish target
+ */
+async function addReleaseConfigForNonTsSolution(tree, projectName, projectConfiguration, defaultOutputDirectory = 'dist') {
+    const packageRoot = (0, devkit_1.joinPathFragments)(defaultOutputDirectory, '{projectRoot}');
+    projectConfiguration.targets ??= {};
+    projectConfiguration.targets['nx-release-publish'] = {
+        options: {
+            packageRoot,
+        },
+    };
+    projectConfiguration.release = {
+        version: {
+            generatorOptions: {
+                packageRoot,
+                // using git tags to determine the current version is required here because
+                // the version in the package root is overridden with every build
+                currentVersionResolver: 'git-tag',
+                fallbackCurrentVersionResolver: 'disk',
+            },
+        },
+    };
+    await addReleaseConfigForTsSolution(tree, projectName, projectConfiguration);
+    return projectConfiguration;
+}
+function projectsConfigMatchesProject(projectsConfig, project) {
+    if (!projectsConfig) {
+        return false;
+    }
+    if (typeof projectsConfig === 'string') {
+        projectsConfig = [projectsConfig];
+    }
+    const graph = {
+        [project.name]: project,
+    };
+    const matchingProjects = (0, find_matching_projects_1.findMatchingProjects)(projectsConfig, graph);
+    return matchingProjects.includes(project.name);
+}
+async function releaseTasks(tree) {
+    return (0, devkit_1.runTasksInSerial)(await (0, generator_1.default)(tree, { skipFormat: true }), () => logNxReleaseDocsInfo());
+}
+function logNxReleaseDocsInfo() {
+    devkit_1.output.log({
+        title: `📦 To learn how to publish this library, see https://nx.dev/core-features/manage-releases.`,
+    });
+}

package/src/utils/npm-config.js

@@ -78,10 +78,7 @@ async function execAsync(command, cwd) {
     return new Promise((resolve, reject) => {
         (0, child_process_1.exec)(command, { cwd, windowsHide: false }, (error, stdout, stderr) => {
             if (error) {
-                return reject(error);
-            }
-            if (stderr) {
-                return reject(stderr);
+                return reject((stderr ? `${stderr}\n` : '') + error);
             }
             return resolve(stdout.trim());
         });