@nx/js 18.1.0-beta.2 → 18.1.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "18.1.0-beta.2",
+  "version": "18.1.0-beta.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": {
@@ -57,9 +57,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.1.0-beta.2",
-    "@nx/workspace": "18.1.0-beta.2",
-    "@nrwl/js": "18.1.0-beta.2"
+    "@nx/devkit": "18.1.0-beta.4",
+    "@nx/workspace": "18.1.0-beta.4",
+    "@nrwl/js": "18.1.0-beta.4"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/library/library.js

@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLint = exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 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_config_1 = require("../../utils/typescript/ts-config");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
+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 minimal_publish_script_1 = require("../../utils/minimal-publish-script");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
+const create_ts_config_1 = require("../../utils/typescript/create-ts-config");
+const ts_config_1 = require("../../utils/typescript/ts-config");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const generator_1 = require("../setup-verdaccio/generator");
-const create_ts_config_1 = require("../../utils/typescript/create-ts-config");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
+const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         addPlugin: false,
@@ -25,7 +26,6 @@ async function libraryGenerator(tree, schema) {
 }
 exports.libraryGenerator = libraryGenerator;
 async function libraryGeneratorInternal(tree, schema) {
-    const filesDir = (0, path_1.join)(__dirname, './files');
     const tasks = [];
     tasks.push(await (0, init_1.default)(tree, {
         ...schema,
@@ -33,8 +33,8 @@ async function libraryGeneratorInternal(tree, schema) {
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
     }));
     const options = await normalizeOptions(tree, schema);
-    createFiles(tree, options, `${filesDir}/lib`);
-    addProject(tree, options);
+    createFiles(tree, options);
+    await addProject(tree, options);
     if (!options.skipPackageJson) {
         tasks.push(addProjectDependencies(tree, options));
     }
@@ -69,7 +69,7 @@ async function libraryGeneratorInternal(tree, schema) {
         const jestCallback = await addJest(tree, options);
         tasks.push(jestCallback);
         if (options.bundler === 'swc' || options.bundler === 'rollup') {
-            replaceJestConfig(tree, options, `${filesDir}/jest-config`);
+            replaceJestConfig(tree, options);
         }
     }
     else if (options.unitTestRunner === 'vitest' &&
@@ -102,13 +102,18 @@ async function libraryGeneratorInternal(tree, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    if (options.publishable) {
+        tasks.push(() => {
+            logNxReleaseDocsInfo();
+        });
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
-function addProject(tree, options) {
+async function addProject(tree, options) {
     const projectConfiguration = {
         root: options.projectRoot,
         sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
@@ -151,11 +156,24 @@ function addProject(tree, options) {
             projectConfiguration.targets.build.options.assets.push((0, devkit_1.joinPathFragments)(options.projectRoot, '*.md'));
         }
         if (options.publishable) {
-            const publishScriptPath = (0, minimal_publish_script_1.addMinimalPublishScript)(tree);
-            projectConfiguration.targets.publish = {
-                command: `node ${publishScriptPath} ${options.name} {args.ver} {args.tag}`,
-                dependsOn: ['build'],
+            const packageRoot = (0, path_1.join)(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',
+                    },
+                },
             };
+            await addProjectToNxReleaseConfig(tree, options, projectConfiguration);
         }
     }
     if (options.config === 'workspace' || options.config === 'project') {
@@ -284,10 +302,10 @@ function addBabelRc(tree, options) {
     };
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(options.projectRoot, filename), babelrc);
 }
-function createFiles(tree, options, filesDir) {
+function createFiles(tree, options) {
     const { className, name, propertyName } = (0, devkit_1.names)(options.projectNames.projectFileName);
     createProjectTsConfigJson(tree, options);
-    (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/lib'), options.projectRoot, {
         ...options,
         dot: '.',
         className,
@@ -301,6 +319,22 @@ function createFiles(tree, options, filesDir) {
         buildable: options.bundler && options.bundler !== 'none',
         hasUnitTestRunner: options.unitTestRunner !== 'none',
     });
+    if (!options.rootProject) {
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/readme'), options.projectRoot, {
+            ...options,
+            dot: '.',
+            className,
+            name,
+            propertyName,
+            js: !!options.js,
+            cliCommand: 'nx',
+            strict: undefined,
+            tmpl: '',
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+            buildable: options.bundler && options.bundler !== 'none',
+            hasUnitTestRunner: options.unitTestRunner !== 'none',
+        });
+    }
     if (options.bundler === 'swc' || options.bundler === 'rollup') {
         (0, add_swc_dependencies_1.addSwcDependencies)(tree);
         (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot, options.bundler === 'swc' ? 'commonjs' : 'es6');
@@ -324,6 +358,9 @@ function createFiles(tree, options, filesDir) {
             if (json.private && (options.publishable || options.rootProject)) {
                 delete json.private;
             }
+            if (!options.publishable && !options.rootProject) {
+                json.private = true;
+            }
             return {
                 ...json,
                 dependencies: {
@@ -335,12 +372,16 @@ function createFiles(tree, options, filesDir) {
         });
     }
     else {
-        (0, devkit_1.writeJson)(tree, packageJsonPath, {
+        const packageJson = {
             name: options.importPath,
             version: '0.0.1',
             dependencies: determineDependencies(options),
             ...determineEntryFields(options),
-        });
+        };
+        if (!options.publishable && !options.rootProject) {
+            packageJson.private = true;
+        }
+        (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
     }
     if (options.config === 'npm-scripts') {
         (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
@@ -377,7 +418,8 @@ async function addJest(tree, options) {
                 : undefined,
     });
 }
-function replaceJestConfig(tree, options, filesDir) {
+function replaceJestConfig(tree, options) {
+    const filesDir = (0, path_1.join)(__dirname, './files/jest-config');
     // the existing config has to be deleted otherwise the new config won't overwrite it
     const existingJestConfig = (0, devkit_1.joinPathFragments)(filesDir, `jest.config.${options.js ? 'js' : 'ts'}`);
     if (tree.exists(existingJestConfig)) {
@@ -394,7 +436,10 @@ function replaceJestConfig(tree, options, filesDir) {
     });
 }
 async function normalizeOptions(tree, options) {
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPlugin;
     /**
      * We are deprecating the compiler and the buildable options.
      * However, we want to keep the existing behavior for now.
@@ -429,7 +474,7 @@ async function normalizeOptions(tree, options) {
             options.bundler = 'tsc';
         }
     }
-    // This is to preserve old behaviour, buildable: false
+    // This is to preserve old behavior, buildable: false
     if (options.publishable === false && options.buildable === false) {
         options.bundler = 'none';
     }
@@ -521,7 +566,7 @@ function getBuildExecutor(bundler) {
     }
 }
 function getOutputPath(options) {
-    const parts = ['dist'];
+    const parts = [defaultOutputDirectory];
     if (options.projectRoot === '.') {
         parts.push(options.name);
     }
@@ -613,4 +658,94 @@ 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.`,
+    });
+}
 exports.default = libraryGenerator;

package/src/generators/library/schema.json

@@ -89,7 +89,7 @@
     "publishable": {
       "type": "boolean",
       "default": false,
-      "description": "Generate a publishable library.",
+      "description": "Configure the library ready for use with `nx release` (https://nx.dev/core-features/manage-releases).",
       "x-priority": "important"
     },
     "importPath": {

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseVersionGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const chalk = require("chalk");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
+const node_path_1 = require("node:path");
 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");
@@ -11,7 +12,6 @@ const semver_1 = require("nx/src/command-line/release/utils/semver");
 const version_1 = require("nx/src/command-line/release/version");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const ora = require("ora");
-const path_1 = require("path");
 const semver_2 = require("semver");
 const resolve_local_package_dependencies_1 = require("./utils/resolve-local-package-dependencies");
 const update_lock_file_1 = require("./utils/update-lock-file");
@@ -39,36 +39,30 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
             options.fallbackCurrentVersionResolver = 'disk';
         }
         const projects = options.projects;
-        const createResolvePackageRoot = (customPackageRoot) => (projectNode) => {
-            // Default to the project root if no custom packageRoot
-            if (!customPackageRoot) {
-                return projectNode.data.root;
-            }
-            return (0, utils_1.interpolate)(customPackageRoot, {
-                workspaceRoot: '',
-                projectRoot: projectNode.data.root,
-                projectName: projectNode.name,
-            });
-        };
         const resolvePackageRoot = createResolvePackageRoot(options.packageRoot);
         // Resolve any custom package roots for each project upfront as they will need to be reused during dependency resolution
         const projectNameToPackageRootMap = new Map();
         for (const project of projects) {
             projectNameToPackageRootMap.set(project.name, resolvePackageRoot(project));
         }
-        let currentVersion;
+        let currentVersion = undefined;
         let currentVersionResolvedFromFallback = false;
         // only used for options.currentVersionResolver === 'git-tag', but
         // must be declared here in order to reuse it for additional projects
-        let latestMatchingGitTag;
+        let latestMatchingGitTag = undefined;
         // if specifier is undefined, then we haven't resolved it yet
         // if specifier is null, then it has been resolved and no changes are necessary
-        let specifier = options.specifier ? options.specifier : undefined;
+        let specifier = options.specifier
+            ? options.specifier
+            : undefined;
         for (const project of projects) {
             const projectName = project.name;
             const packageRoot = projectNameToPackageRootMap.get(projectName);
+            if (!packageRoot) {
+                throw new Error(`The project "${projectName}" does not have a packageRoot available. Please report this issue on https://github.com/nrwl/nx`);
+            }
             const packageJsonPath = (0, devkit_1.joinPathFragments)(packageRoot, 'package.json');
-            const workspaceRelativePackageJsonPath = (0, path_1.relative)(devkit_1.workspaceRoot, packageJsonPath);
+            const workspaceRelativePackageJsonPath = (0, node_path_1.relative)(devkit_1.workspaceRoot, packageJsonPath);
             const color = getColor(projectName);
             const log = (msg) => {
                 console.log(color.instance.bold(projectName) + ' ' + msg);
@@ -102,7 +96,7 @@ To fix this you will either need to add a package.json file at that location, or
                         try {
                             // Must be non-blocking async to allow spinner to render
                             currentVersion = await new Promise((resolve, reject) => {
-                                (0, child_process_1.exec)(`npm view ${packageName} version --registry=${registry} --tag=${tag}`, (error, stdout, stderr) => {
+                                (0, node_child_process_1.exec)(`npm view ${packageName} version --registry=${registry} --tag=${tag}`, (error, stdout, stderr) => {
                                     if (error) {
                                         return reject(error);
                                     }
@@ -169,7 +163,9 @@ To fix this you will either need to add a package.json file at that location, or
                             log(`📄 Using the current version ${currentVersion} already resolved from disk fallback.`);
                         }
                         else {
-                            log(`📄 Using the current version ${currentVersion} already resolved from git tag "${latestMatchingGitTag.tag}".`);
+                            log(
+                            // In this code path we know that latestMatchingGitTag is defined, because we are not relying on the fallbackCurrentVersionResolver, so we can safely use the non-null assertion operator
+                            `📄 Using the current version ${currentVersion} already resolved from git tag "${latestMatchingGitTag.tag}".`);
                         }
                     }
                     break;
@@ -195,7 +191,7 @@ To fix this you will either need to add a package.json file at that location, or
                     !options.specifier)) {
                 const specifierSource = options.specifierSource;
                 switch (specifierSource) {
-                    case 'conventional-commits':
+                    case 'conventional-commits': {
                         if (options.currentVersionResolver !== 'git-tag') {
                             throw new Error(`Invalid currentVersionResolver "${options.currentVersionResolver}" provided for release group "${options.releaseGroup.name}". Must be "git-tag" when "specifierSource" is "conventional-commits"`);
                         }
@@ -222,7 +218,7 @@ To fix this you will either need to add a package.json file at that location, or
                         //
                         // 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)) {
+                        if ((0, semver_2.prerelease)(currentVersion ?? '')) {
                             specifier = 'prerelease';
                             log(`📄 Resolved the specifier as "${specifier}" since the current version is a prerelease.`);
                         }
@@ -230,6 +226,7 @@ To fix this you will either need to add a package.json file at that location, or
                             log(`📄 Resolved the specifier as "${specifier}" using git history and the conventional commits standard.`);
                         }
                         break;
+                    }
                     case 'prompt': {
                         // Only add the release group name to the log if it is one set by the user, otherwise it is useless noise
                         const maybeLogReleaseGroup = (log) => {
@@ -259,9 +256,13 @@ To fix this you will either need to add a package.json file at that location, or
                 .filter((localPackageDependency) => {
                 return localPackageDependency.target === project.name;
             });
+            if (!currentVersion) {
+                throw new Error(`The current version for project "${project.name}" could not be resolved. Please report this on https://github.com/nrwl/nx`);
+            }
             versionData[projectName] = {
                 currentVersion,
                 dependentProjects,
+                // @ts-ignore: The types will be updated in a future version of Nx
                 newVersion: null, // will stay as null in the final result in the case that no changes are detected
             };
             if (!specifier) {
@@ -281,7 +282,11 @@ To fix this you will either need to add a package.json file at that location, or
                     : 'package which depends'} on ${project.name}`);
             }
             for (const dependentProject of dependentProjects) {
-                (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectNameToPackageRootMap.get(dependentProject.source), 'package.json'), (json) => {
+                const dependentPackageRoot = projectNameToPackageRootMap.get(dependentProject.source);
+                if (!dependentPackageRoot) {
+                    throw new Error(`The dependent project "${dependentProject.source}" does not have a packageRoot available. Please report this issue on https://github.com/nrwl/nx`);
+                }
+                (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(dependentPackageRoot, 'package.json'), (json) => {
                     // Auto (i.e.infer existing) by default
                     let versionPrefix = options.versionPrefix ?? 'auto';
                     // For auto, we infer the prefix based on the current version of the dependent
@@ -304,7 +309,7 @@ To fix this you will either need to add a package.json file at that location, or
             }
         }
         /**
-         * Ensure that formatting is applied so that version bump diffs are as mimimal as possible
+         * Ensure that formatting is applied so that version bump diffs are as minimal as possible
          * within the context of the user's workspace.
          */
         await (0, devkit_1.formatFiles)(tree);
@@ -336,6 +341,19 @@ To fix this you will either need to add a package.json file at that location, or
 }
 exports.releaseVersionGenerator = releaseVersionGenerator;
 exports.default = releaseVersionGenerator;
+function createResolvePackageRoot(customPackageRoot) {
+    return (projectNode) => {
+        // Default to the project root if no custom packageRoot
+        if (!customPackageRoot) {
+            return projectNode.data.root;
+        }
+        return (0, utils_1.interpolate)(customPackageRoot, {
+            workspaceRoot: '',
+            projectRoot: projectNode.data.root,
+            projectName: projectNode.name,
+        });
+    };
+}
 const colors = [
     { instance: chalk.green, spinnerColor: 'green' },
     { instance: chalk.greenBright, spinnerColor: 'green' },
@@ -359,7 +377,7 @@ function getColor(projectName) {
 async function getNpmRegistry() {
     // Must be non-blocking async to allow spinner to render
     return await new Promise((resolve, reject) => {
-        (0, child_process_1.exec)('npm config get registry', (error, stdout, stderr) => {
+        (0, node_child_process_1.exec)('npm config get registry', (error, stdout, stderr) => {
             if (error) {
                 return reject(error);
             }

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

@@ -49,6 +49,18 @@
       "type": "object",
       "description": "Additional metadata to pass to the current version resolver.",
       "default": {}
+    },
+    "skipLockFileUpdate": {
+      "type": "boolean",
+      "description": "Whether to skip updating the lock file after updating the version."
+    },
+    "installArgs": {
+      "type": "string",
+      "description": "Additional arguments to pass to the package manager when updating the lock file with an install command."
+    },
+    "installIgnoreScripts": {
+      "type": "boolean",
+      "description": "Whether to ignore install lifecycle scripts when updating the lock file with an install command."
     }
   },
   "required": ["projects", "projectGraph", "releaseGroup"]

package/src/generators/release-version/utils/resolve-local-package-dependencies.d.ts

@@ -1,5 +1,11 @@
 import { ProjectGraph, ProjectGraphDependency, ProjectGraphProjectNode, Tree } from '@nx/devkit';
 interface LocalPackageDependency extends ProjectGraphDependency {
+    /**
+     * The rawVersionSpec contains the value of the version spec as it was defined in the package.json
+     * of the dependent project. This can be useful in cases where the version spec is a range, path or
+     * workspace reference, and it needs to be be reverted to that original value as part of the release.
+     */
+    rawVersionSpec: string;
     dependencyCollection: 'dependencies' | 'devDependencies' | 'optionalDependencies';
 }
 export declare function resolveLocalPackageDependencies(tree: Tree, projectGraph: ProjectGraph, filteredProjects: ProjectGraphProjectNode[], projectNameToPackageRootMap: Map<string, string>, resolvePackageRoot: (projectNode: ProjectGraphProjectNode) => string, includeAll?: boolean): Record<string, LocalPackageDependency[]>;

package/src/generators/release-version/utils/resolve-local-package-dependencies.js

@@ -64,6 +64,7 @@ function resolveLocalPackageDependencies(tree, projectGraph, filteredProjects, p
                     {
                         ...dep,
                         dependencyCollection: sourceNpmDependency.collection,
+                        rawVersionSpec: sourceNpmDependency.spec,
                     },
                 ];
             }

package/src/generators/release-version/utils/update-lock-file.js

@@ -23,6 +23,13 @@ async function updateLockFile(cwd, { dryRun, verbose, generatorOptions, }) {
         }
         return [];
     }
+    const workspacesEnabled = (0, devkit_1.isWorkspacesEnabled)(packageManager, cwd);
+    if (!workspacesEnabled) {
+        if (verbose) {
+            console.log(`\nSkipped lock file update because ${packageManager} workspaces are not enabled.`);
+        }
+        return [];
+    }
     const isDaemonEnabled = client_1.daemonClient.enabled();
     if (!dryRun && isDaemonEnabled) {
         // if not in dry-run temporarily stop the daemon, as it will error if the lock file is updated

package/src/utils/add-local-registry-scripts.js

@@ -9,6 +9,7 @@ const startLocalRegistryScript = (localRegistryTarget) => `
  */
 import { startLocalRegistry } from '@nx/js/plugins/jest/local-registry';
 import { execFileSync } from 'child_process';
+import { releasePublish, releaseVersion } from 'nx/release';
 
 export default async () => {
   // local registry target to run
@@ -21,12 +22,21 @@ export default async () => {
     storage,
     verbose: false,
   });
-  const nx = require.resolve('nx');
-  execFileSync(
-    nx,
-    ['run-many', '--targets', 'publish', '--ver', '0.0.0-e2e', '--tag', 'e2e'],
-    { env: process.env, stdio: 'inherit' }
-  );
+
+  await releaseVersion({
+    specifier: '0.0.0-e2e',
+    stageChanges: false,
+    gitCommit: false,
+    gitTag: false,
+    firstRelease: true,
+    generatorOptionsOverrides: {
+      skipLockFileUpdate: true
+    }
+  });
+  await releasePublish({
+    tag: 'e2e',
+    firstRelease: true
+  });
 };
 `;
 const stopLocalRegistryScript = `
@@ -49,6 +59,16 @@ function addLocalRegistryScripts(tree) {
     if (!tree.exists(startLocalRegistryPath)) {
         tree.write(startLocalRegistryPath, startLocalRegistryScript(localRegistryTarget));
     }
+    else {
+        const existingStartLocalRegistryScript = tree
+            .read(startLocalRegistryPath)
+            .toString();
+        if (!existingStartLocalRegistryScript.includes('nx/release')) {
+            devkit_1.output.warn({
+                title: 'Your `start-local-registry.ts` script may be outdated. To ensure that newly generated packages are published appropriately when running end to end tests, update this script to use Nx Release. See https://nx.dev/recipes/nx-release/update-local-registry-setup for details.',
+            });
+        }
+    }
     if (!tree.exists(stopLocalRegistryPath)) {
         tree.write(stopLocalRegistryPath, stopLocalRegistryScript);
     }

package/src/utils/buildable-libs-utils.js

@@ -127,7 +127,7 @@ function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, proje
         const depTask = taskGraph.tasks[taskName];
         const depProjectNode = projectGraph.nodes?.[depTask.target.project];
         if (depProjectNode?.type !== 'lib') {
-            return null;
+            continue;
         }
         let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask.target, depTask.overrides, depProjectNode);
         if (outputs.length === 0) {

package/src/utils/minimal-publish-script.d.ts

@@ -1,2 +0,0 @@
-import type { Tree } from '@nx/devkit';
-export declare function addMinimalPublishScript(tree: Tree): string;

package/src/utils/minimal-publish-script.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMinimalPublishScript = void 0;
-const publishScriptContent = `
-/**
- * This is a minimal script to publish your package to "npm".
- * This is meant to be used as-is or customize as you see fit.
- *
- * This script is executed on "dist/path/to/library" as "cwd" by default.
- *
- * You might need to authenticate with NPM before running this script.
- */
-
-import { execSync } from 'child_process';
-import { readFileSync, writeFileSync } from 'fs';
-
-import devkit from '@nx/devkit';
-const { readCachedProjectGraph } = devkit;
-
-function invariant(condition, message) {
-  if (!condition) {
-    console.error(message);
-    process.exit(1);
-  } 
-}
-
-// Executing publish script: node path/to/publish.mjs {name} --version {version} --tag {tag}
-// Default "tag" to "next" so we won't publish the "latest" tag by accident.
-const [, , name, version, tag = 'next'] = process.argv;
-
-// A simple SemVer validation to validate the version
-const validVersion = /^\\d+\\.\\d+\\.\\d+(-\\w+\\.\\d+)?/;
-invariant(
-  version && validVersion.test(version),
-  \`No version provided or version did not match Semantic Versioning, expected: #.#.#-tag.# or #.#.#, got \${version}.\`
-);
-
-
-const graph = readCachedProjectGraph();
-const project = graph.nodes[name];
-
-invariant(
-  project,
- \`Could not find project "\${name}" in the workspace. Is the project.json configured correctly?\`
-);
-
-const outputPath = project.data?.targets?.build?.options?.outputPath;
-invariant(
-  outputPath,
-  \`Could not find "build.options.outputPath" of project "\${name}". Is project.json configured  correctly?\`
-);
-
-process.chdir(outputPath);
-
-// Updating the version in "package.json" before publishing
-try {
-  const json = JSON.parse(readFileSync(\`package.json\`).toString());
-  json.version = version;
-  writeFileSync(\`package.json\`, JSON.stringify(json, null, 2));
-} catch (e) {
-  console.error(\`Error reading package.json file from library build output.\`);
-}
-
-// Execute "npm publish" to publish
-execSync(\`npm publish --access public --tag \${tag}\`);
-`;
-function addMinimalPublishScript(tree) {
-    const publishScriptPath = 'tools/scripts/publish.mjs';
-    if (!tree.exists(publishScriptPath)) {
-        tree.write(publishScriptPath, publishScriptContent);
-    }
-    return publishScriptPath;
-}
-exports.addMinimalPublishScript = addMinimalPublishScript;