@nx/js 17.3.0-rc.0 → 17.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "17.3.0-rc.0",
+  "version": "17.3.0",
   "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": "17.3.0-rc.0",
-    "@nx/workspace": "17.3.0-rc.0",
-    "@nrwl/js": "17.3.0-rc.0"
+    "@nx/devkit": "17.3.0",
+    "@nx/workspace": "17.3.0",
+    "@nrwl/js": "17.3.0"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

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

@@ -9,7 +9,6 @@ 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 client_1 = require("nx/src/daemon/client/client");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const ora = require("ora");
 const path_1 = require("path");
@@ -124,7 +123,7 @@ To fix this you will either need to add a package.json file at that location, or
                                 currentVersionResolvedFromFallback = true;
                             }
                             else {
-                                throw new Error(`Unable to resolve the current version from the registry ${registry}. Please ensure that the package exists in the registry in order to use the "registry" currentVersionResolver. Alternatively, you can use the --first-release option or set "version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when the registry lookup fails.`);
+                                throw new Error(`Unable to resolve the current version from the registry ${registry}. Please ensure that the package exists in the registry in order to use the "registry" currentVersionResolver. Alternatively, you can use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when the registry lookup fails.`);
                             }
                         }
                     }
@@ -157,7 +156,7 @@ To fix this you will either need to add a package.json file at that location, or
                                 currentVersionResolvedFromFallback = true;
                             }
                             else {
-                                throw new Error(`No git tags matching pattern "${releaseTagPattern}" for project "${project.name}" were found. You will need to create an initial matching tag to use as a base for determining the next version. Alternatively, you can use the --first-release option or set "version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when no matching git tags are found.`);
+                                throw new Error(`No git tags matching pattern "${releaseTagPattern}" for project "${project.name}" were found. You will need to create an initial matching tag to use as a base for determining the next version. Alternatively, you can use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when no matching git tags are found.`);
                             }
                         }
                         else {
@@ -314,26 +313,7 @@ To fix this you will either need to add a package.json file at that location, or
             data: versionData,
             callback: async (tree, opts) => {
                 const cwd = tree.root;
-                const isDaemonEnabled = client_1.daemonClient.enabled();
-                if (isDaemonEnabled) {
-                    // temporarily stop the daemon, as it will error if the lock file is updated
-                    await client_1.daemonClient.stop();
-                }
-                const updatedFiles = (0, update_lock_file_1.updateLockFile)(cwd, opts);
-                if (isDaemonEnabled) {
-                    try {
-                        await client_1.daemonClient.startInBackground();
-                    }
-                    catch (e) {
-                        // If the daemon fails to start, we don't want to prevent the user from continuing, so we just log the error and move on
-                        if (opts.verbose) {
-                            devkit_1.output.warn({
-                                title: 'Unable to restart the Nx Daemon. It will be disabled until you run "nx reset"',
-                                bodyLines: [e.message],
-                            });
-                        }
-                    }
-                }
+                const updatedFiles = await (0, update_lock_file_1.updateLockFile)(cwd, opts);
                 return updatedFiles;
             },
         };

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

@@ -2,4 +2,4 @@ export declare function updateLockFile(cwd: string, { dryRun, verbose, generator
     dryRun?: boolean;
     verbose?: boolean;
     generatorOptions?: Record<string, unknown>;
-}): string[];
+}): Promise<string[]>;

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

@@ -3,16 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateLockFile = void 0;
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
+const client_1 = require("nx/src/daemon/client/client");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
 const semver_1 = require("semver");
-function updateLockFile(cwd, { dryRun, verbose, generatorOptions, }) {
+async function updateLockFile(cwd, { dryRun, verbose, generatorOptions, }) {
     if (generatorOptions?.skipLockFileUpdate) {
         if (verbose) {
             console.log('\nSkipped lock file update because skipLockFileUpdate was set.');
         }
         return [];
     }
+    const isDaemonEnabled = client_1.daemonClient.enabled();
+    if (isDaemonEnabled) {
+        // temporarily stop the daemon, as it will error if the lock file is updated
+        await client_1.daemonClient.stop();
+    }
     const packageManager = (0, devkit_1.detectPackageManager)(cwd);
     const packageManagerCommands = (0, devkit_1.getPackageManagerCommand)(packageManager);
     let installArgs = generatorOptions?.installArgs || '';
@@ -43,6 +49,20 @@ function updateLockFile(cwd, { dryRun, verbose, generatorOptions, }) {
         return [];
     }
     execLockFileUpdate(command, cwd, env);
+    if (isDaemonEnabled) {
+        try {
+            await client_1.daemonClient.startInBackground();
+        }
+        catch (e) {
+            // If the daemon fails to start, we don't want to prevent the user from continuing, so we just log the error and move on
+            if (verbose) {
+                devkit_1.output.warn({
+                    title: 'Unable to restart the Nx Daemon. It will be disabled until you run "nx reset"',
+                    bodyLines: [e.message],
+                });
+            }
+        }
+    }
     return [lockFile];
 }
 exports.updateLockFile = updateLockFile;

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

@@ -84,7 +84,8 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
 exports.calculateProjectDependencies = calculateProjectDependencies;
 function collectDependencies(project, projGraph, acc, shallow, areTopLevelDeps = true) {
     (projGraph.dependencies[project] || []).forEach((dependency) => {
-        if (!acc.some((dep) => dep.name === dependency.target)) {
+        const existingEntry = acc.find((dep) => dep.name === dependency.target);
+        if (!existingEntry) {
             // Temporary skip this. Currently the set of external nodes is built from package.json, not lock file.
             // As a result, some nodes might be missing. This should not cause any issues, we can just skip them.
             if (dependency.target.startsWith('npm:') &&
@@ -96,6 +97,9 @@ function collectDependencies(project, projGraph, acc, shallow, areTopLevelDeps =
                 collectDependencies(dependency.target, projGraph, acc, shallow, false);
             }
         }
+        else if (areTopLevelDeps && !existingEntry.isTopLevel) {
+            existingEntry.isTopLevel = true;
+        }
     });
     return acc;
 }

package/src/utils/typescript/ts-config.js

@@ -46,6 +46,7 @@ function getRootTsConfigFileName(tree) {
 exports.getRootTsConfigFileName = getRootTsConfigFileName;
 function addTsConfigPath(tree, importPath, lookupPaths) {
     (0, devkit_1.updateJson)(tree, getRootTsConfigPathInTree(tree), (json) => {
+        json.compilerOptions ??= {};
         const c = json.compilerOptions;
         c.paths ??= {};
         if (c.paths[importPath]) {