@nx/js 21.0.0-beta.0 → 21.0.0-beta.2

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

@@ -0,0 +1,150 @@
+"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(useLegacyVersioning, tree, projectName, projectConfiguration, defaultOutputDirectory = 'dist') {
+    const packageRoot = (0, devkit_1.joinPathFragments)(defaultOutputDirectory, '{projectRoot}');
+    projectConfiguration.targets ??= {};
+    projectConfiguration.targets['nx-release-publish'] = {
+        options: {
+            packageRoot,
+        },
+    };
+    if (useLegacyVersioning) {
+        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',
+                },
+            },
+        };
+    }
+    else {
+        // TODO: re-evaluate this config in new versions
+        projectConfiguration.release = {
+            version: {
+                manifestRootsToUpdate: [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/generators/release-version/release-version.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
-import { ReleaseVersionGeneratorResult } from 'nx/src/command-line/release/version';
+import { ReleaseVersionGeneratorResult } from 'nx/src/command-line/release/version-legacy';
 import { ReleaseVersionGeneratorSchema } from './schema';
 export declare function releaseVersionGenerator(tree: Tree, options: ReleaseVersionGeneratorSchema): Promise<ReleaseVersionGeneratorResult>;
 export default releaseVersionGenerator;

package/src/generators/release-version/release-version.js

@@ -11,15 +11,15 @@ const config_1 = require("nx/src/command-line/release/config/config");
 const git_1 = require("nx/src/command-line/release/utils/git");
 const resolve_semver_specifier_1 = require("nx/src/command-line/release/utils/resolve-semver-specifier");
 const semver_1 = require("nx/src/command-line/release/utils/semver");
-const version_1 = require("nx/src/command-line/release/version");
+const version_legacy_1 = require("nx/src/command-line/release/version-legacy");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const ora = require("ora");
 const semver_2 = require("semver");
+const update_lock_file_1 = require("../../release/utils/update-lock-file");
 const is_locally_linked_package_version_1 = require("../../utils/is-locally-linked-package-version");
 const npm_config_1 = require("../../utils/npm-config");
 const resolve_local_package_dependencies_1 = require("./utils/resolve-local-package-dependencies");
 const sort_projects_topologically_1 = require("./utils/sort-projects-topologically");
-const update_lock_file_1 = require("./utils/update-lock-file");
 function resolvePreIdSpecifier(currentSpecifier, preid) {
     if (!currentSpecifier.startsWith('pre') && preid) {
         return `pre${currentSpecifier}`;
@@ -39,10 +39,10 @@ async function releaseVersionGenerator(tree, options) {
             options.specifier = options.specifier.replace(/^v/, '');
         }
         if (options.versionPrefix &&
-            version_1.validReleaseVersionPrefixes.indexOf(options.versionPrefix) === -1) {
+            version_legacy_1.validReleaseVersionPrefixes.indexOf(options.versionPrefix) === -1) {
             throw new Error(`Invalid value for version.generatorOptions.versionPrefix: "${options.versionPrefix}"
 
-Valid values are: ${version_1.validReleaseVersionPrefixes
+Valid values are: ${version_legacy_1.validReleaseVersionPrefixes
                 .map((s) => `"${s}"`)
                 .join(', ')}`);
         }
@@ -54,7 +54,6 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
         const updateDependents = options.updateDependents ?? 'auto';
         const updateDependentsBump = resolvePreIdSpecifier('patch', options.preid);
         // Sort the projects topologically if update dependents is enabled
-        // TODO: maybe move this sorting to the command level?
         const projects = updateDependents === 'never' ||
             options.releaseGroup.projectsRelationship !== 'independent'
             ? options.projects
@@ -191,7 +190,7 @@ To fix this you will either need to add a package.json file at that location, or
                         const releaseTagPattern = options.releaseGroup.releaseTagPattern;
                         latestMatchingGitTag = await (0, git_1.getLatestGitTagForPattern)(releaseTagPattern, {
                             projectName: project.name,
-                        });
+                        }, options.releaseGroup.releaseTagPatternCheckAllBranchesWhen);
                         if (!latestMatchingGitTag) {
                             if (options.fallbackCurrentVersionResolver === 'disk') {
                                 if (!currentVersionFromDisk &&
@@ -287,8 +286,6 @@ To fix this you will either need to add a package.json file at that location, or
                             logger.buffer(`🚫 No changes were detected using git history and the conventional commits standard.`);
                             break;
                         }
-                        // TODO: reevaluate this prerelease logic/workflow for independent projects
-                        //
                         // Always assume that if the current version is a prerelease, then the next version should be a prerelease.
                         // Users must manually graduate from a prerelease to a release by providing an explicit specifier.
                         if ((0, semver_2.prerelease)(currentVersion ?? '')) {
@@ -404,7 +401,7 @@ To fix this you will either need to add a package.json file at that location, or
             const allDependentProjects = Object.values(localPackageDependencies)
                 .flat()
                 .filter((localPackageDependency) => {
-                return localPackageDependency.target === project.name;
+                return localPackageDependency.target === projectName;
             });
             const includeTransitiveDependents = updateDependents !== 'never' &&
                 options.releaseGroup.projectsRelationship === 'independent';
@@ -423,9 +420,10 @@ To fix this you will either need to add a package.json file at that location, or
             const dependentProjectsOutsideCurrentBatch = [];
             // Track circular dependencies using value of project1:project2
             const circularDependencies = new Set();
+            const projectsDependOnCurrentProject = localPackageDependencies[projectName]?.map((localPackageDependencies) => localPackageDependencies.target) ?? [];
             for (const dependentProject of allDependentProjects) {
                 // Track circular dependencies (add both directions for easy look up)
-                if (dependentProject.target === projectName) {
+                if (projectsDependOnCurrentProject.includes(dependentProject.source)) {
                     circularDependencies.add(`${dependentProject.source}:${dependentProject.target}`);
                     circularDependencies.add(`${dependentProject.target}:${dependentProject.source}`);
                 }
@@ -489,7 +487,7 @@ To fix this you will either need to add a package.json file at that location, or
                 }
                 continue;
             }
-            const newVersion = (0, version_1.deriveNewSemverVersion)(currentVersion, specifier, options.preid);
+            const newVersion = (0, version_legacy_1.deriveNewSemverVersion)(currentVersion, specifier, options.preid);
             versionData[projectName].newVersion = newVersion;
             (0, devkit_1.writeJson)(tree, packageJsonPath, {
                 ...packageJson,
@@ -555,7 +553,7 @@ To fix this you will either need to add a package.json file at that location, or
                     }
                     // Bump the dependent's version if applicable and record it in the version data
                     if (forceVersionBump) {
-                        const newPackageVersion = (0, version_1.deriveNewSemverVersion)(currentPackageVersion, forceVersionBump, options.preid);
+                        const newPackageVersion = (0, version_legacy_1.deriveNewSemverVersion)(currentPackageVersion, forceVersionBump, options.preid);
                         json.version = newPackageVersion;
                         // Look up any dependent projects from the transitiveLocalPackageDependents list
                         const transitiveDependentProjects = transitiveLocalPackageDependents.filter((localPackageDependency) => localPackageDependency.target === dependentProject.source);
@@ -665,7 +663,10 @@ To fix this you will either need to add a package.json file at that location, or
                     deletedFiles.push(...(await cb(opts.dryRun)));
                 }
                 const cwd = tree.root;
-                changedFiles.push(...(await (0, update_lock_file_1.updateLockFile)(cwd, opts)));
+                changedFiles.push(...(await (0, update_lock_file_1.updateLockFile)(cwd, {
+                    ...opts,
+                    useLegacyVersioning: true,
+                })));
                 return { changedFiles, deletedFiles };
             },
         };
@@ -696,7 +697,8 @@ function createResolvePackageRoot(customPackageRoot) {
             return projectNode.data.root;
         }
         if (projectNode.data.root === '.') {
-            // TODO This is a temporary workaround to fix NXC-574 until NXC-573 is resolved
+            // This is a temporary workaround to fix NXC-574 until NXC-573 is resolved.
+            // This has been fixed in "versioning v2"
             return projectNode.data.root;
         }
         return (0, utils_1.interpolate)(customPackageRoot, {

package/src/generators/release-version/schema.d.ts

@@ -1 +1 @@
-export { ReleaseVersionGeneratorSchema } from 'nx/src/command-line/release/version';
+export { ReleaseVersionGeneratorSchema } from 'nx/src/command-line/release/version-legacy';

package/src/generators/release-version/schema.json

@@ -8,6 +8,8 @@
   "properties": {
     "projects": {
       "type": "array",
+      "hidden": true,
+      "$comment": "This is not configured/passed by the user. It is provided by the version command.",
       "description": "The ProjectGraphProjectNodes being versioned in the current execution.",
       "items": {
         "type": "object"
@@ -15,16 +17,33 @@
     },
     "projectGraph": {
       "type": "object",
+      "hidden": true,
+      "$comment": "This is not configured/passed by the user. It is provided by the version command.",
       "description": "ProjectGraph instance"
     },
-    "specifier": {
-      "type": "string",
-      "description": "Exact version or semver keyword to apply to the selected release group. Overrides specifierSource."
-    },
     "releaseGroup": {
       "type": "object",
+      "hidden": true,
+      "$comment": "This is not configured/passed by the user. It is provided by the version command.",
       "description": "The resolved release group configuration, including name, relevant to all projects in the current execution."
     },
+    "conventionalCommitsConfig": {
+      "type": "object",
+      "hidden": true,
+      "$comment": "This is not configured/passed by the user. It is provided by the version command.",
+      "description": "The conventional commits configuration to use when determining the next version of the project.",
+      "default": {}
+    },
+    "firstRelease": {
+      "type": "boolean",
+      "hidden": true,
+      "$comment": "This is not configured/passed by the user. It is provided by the version command.",
+      "description": "Whether this is the first release of the project (which skips some validation within the generator)."
+    },
+    "specifier": {
+      "type": "string",
+      "description": "Exact version or semver keyword to apply to the selected release group. Overrides specifierSource."
+    },
     "specifierSource": {
       "type": "string",
       "default": "prompt",

package/src/generators/setup-build/generator.js

@@ -232,6 +232,9 @@ function updatePackageJson(tree, projectName, projectRoot, main, outputPath, roo
             version: '0.0.1',
         };
     }
+    // the file must exist in the TS solution setup, which is the only case this
+    // function is called
+    const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
     packageJson = (0, update_package_json_1.getUpdatedPackageJsonContent)(packageJson, {
         main,
         outputPath,
@@ -240,6 +243,7 @@ function updatePackageJson(tree, projectName, projectRoot, main, outputPath, roo
         packageJsonPath,
         rootDir,
         format,
+        skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
     });
     (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
 }

package/src/plugins/jest/start-local-registry.js

@@ -29,20 +29,24 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorag
                 const port = parseInt(data.toString().match(new RegExp(`${listenAddress}:(?<port>\\d+)`))
                     ?.groups?.port);
                 const registry = `http://${listenAddress}:${port}`;
+                const authToken = 'secretVerdaccioToken';
                 console.log(`Local registry started on ${registry}`);
                 process.env.npm_config_registry = registry;
-                (0, child_process_1.execSync)(`npm config set //${listenAddress}:${port}/:_authToken "secretVerdaccioToken"`, {
+                (0, child_process_1.execSync)(`npm config set //${listenAddress}:${port}/:_authToken "${authToken}" --ws=false`, {
                     windowsHide: false,
                 });
+                // bun
+                process.env.BUN_CONFIG_REGISTRY = registry;
+                process.env.BUN_CONFIG_TOKEN = authToken;
                 // yarnv1
                 process.env.YARN_REGISTRY = registry;
                 // yarnv2
                 process.env.YARN_NPM_REGISTRY_SERVER = registry;
                 process.env.YARN_UNSAFE_HTTP_WHITELIST = listenAddress;
-                console.log('Set npm and yarn config registry to ' + registry);
+                console.log('Set npm, bun, and yarn config registry to ' + registry);
                 resolve(() => {
                     childProcess.kill();
-                    (0, child_process_1.execSync)(`npm config delete //${listenAddress}:${port}/:_authToken`, {
+                    (0, child_process_1.execSync)(`npm config delete //${listenAddress}:${port}/:_authToken --ws=false`, {
                         windowsHide: false,
                     });
                 });