@nx/js 17.3.0-beta.1 → 17.3.0-beta.2

package/migrations.json

@@ -123,6 +123,15 @@
           "version": "~5.2.2"
         }
       }
+    },
+    "17.3.0": {
+      "version": "17.3.0-beta.3",
+      "packages": {
+        "@types/node": {
+          "version": "^18.16.9",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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

package/src/executors/release-publish/release-publish.impl.js

@@ -17,6 +17,11 @@ function processEnv(color) {
     return env;
 }
 async function runExecutor(options, context) {
+    /**
+     * We need to check both the env var and the option because the executor may have been triggered
+     * indirectly via dependsOn, in which case the env var will be set, but the option will not.
+     */
+    const isDryRun = process.env.NX_DRY_RUN === 'true' || options.dryRun || false;
     const projectConfig = context.projectsConfigurations.projects[context.projectName];
     const packageRoot = (0, devkit_1.joinPathFragments)(context.root, options.packageRoot ?? projectConfig.root);
     const packageJsonPath = (0, devkit_1.joinPathFragments)(packageRoot, 'package.json');
@@ -46,7 +51,7 @@ async function runExecutor(options, context) {
     if (options.otp) {
         npmPublishCommandSegments.push(`--otp=${options.otp}`);
     }
-    if (options.dryRun) {
+    if (isDryRun) {
         npmPublishCommandSegments.push(`--dry-run`);
     }
     // Resolve values using the `npm config` command so that things like environment variables and `publishConfig`s are accounted for
@@ -60,7 +65,7 @@ async function runExecutor(options, context) {
      * Therefore, so as to not produce misleading output in dry around dist-tags being altered, we do not
      * perform the npm view step, and just show npm publish's dry-run output.
      */
-    if (!options.dryRun) {
+    if (!isDryRun) {
         const currentVersion = projectPackageJson.version;
         try {
             const result = (0, child_process_1.execSync)(npmViewCommandSegments.join(' '), {
@@ -78,7 +83,7 @@ async function runExecutor(options, context) {
             }
             if (resultJson.versions.includes(currentVersion)) {
                 try {
-                    if (!options.dryRun) {
+                    if (!isDryRun) {
                         (0, child_process_1.execSync)(`npm dist-tag add ${packageName}@${currentVersion} ${tag} --registry=${registry}`, {
                             env: processEnv(true),
                             cwd: packageRoot,
@@ -96,20 +101,26 @@ async function runExecutor(options, context) {
                 catch (err) {
                     try {
                         const stdoutData = JSON.parse(err.stdout?.toString() || '{}');
-                        console.error('npm dist-tag add error:');
-                        if (stdoutData.error.summary) {
-                            console.error(stdoutData.error.summary);
-                        }
-                        if (stdoutData.error.detail) {
-                            console.error(stdoutData.error.detail);
-                        }
-                        if (context.isVerbose) {
-                            console.error('npm dist-tag add stdout:');
-                            console.error(JSON.stringify(stdoutData, null, 2));
+                        // If the error is that the package doesn't exist, then we can ignore it because we will be publishing it for the first time in the next step
+                        if (!(stdoutData.error?.code?.includes('E404') &&
+                            stdoutData.error?.summary?.includes('no such package available')) &&
+                            !(err.stderr?.toString().includes('E404') &&
+                                err.stderr?.toString().includes('no such package available'))) {
+                            console.error('npm dist-tag add error:');
+                            if (stdoutData.error.summary) {
+                                console.error(stdoutData.error.summary);
+                            }
+                            if (stdoutData.error.detail) {
+                                console.error(stdoutData.error.detail);
+                            }
+                            if (context.isVerbose) {
+                                console.error('npm dist-tag add stdout:');
+                                console.error(JSON.stringify(stdoutData, null, 2));
+                            }
+                            return {
+                                success: false,
+                            };
                         }
-                        return {
-                            success: false,
-                        };
                     }
                     catch (err) {
                         console.error('Something unexpected went wrong when processing the npm dist-tag add output\n', err);
@@ -124,9 +135,9 @@ async function runExecutor(options, context) {
             const stdoutData = JSON.parse(err.stdout?.toString() || '{}');
             // If the error is that the package doesn't exist, then we can ignore it because we will be publishing it for the first time in the next step
             if (!(stdoutData.error?.code?.includes('E404') &&
-                stdoutData.error?.summary?.includes('no such package available')) &&
+                stdoutData.error?.summary?.toLowerCase().includes('not found')) &&
                 !(err.stderr?.toString().includes('E404') &&
-                    err.stderr?.toString().includes('no such package available'))) {
+                    err.stderr?.toString().toLowerCase().includes('not found'))) {
                 console.error(`Something unexpected went wrong when checking for existing dist-tags.\n`, err);
                 return {
                     success: false,
@@ -145,7 +156,7 @@ async function runExecutor(options, context) {
         // If npm workspaces are in use, the publish output will nest the data under the package name, so we normalize it first
         const normalizedStdoutData = stdoutData[packageName] ?? stdoutData;
         (0, log_tar_1.logTar)(normalizedStdoutData);
-        if (options.dryRun) {
+        if (isDryRun) {
             console.log(`Would publish to ${registry} with tag "${tag}", but ${chalk.keyword('orange')('[dry-run]')} was set`);
         }
         else {

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

@@ -153,7 +153,10 @@ To fix this you will either need to add a package.json file at that location, or
                         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"`);
                         }
-                        specifier = await (0, resolve_semver_specifier_1.resolveSemverSpecifierFromConventionalCommits)(latestMatchingGitTag.tag, options.projectGraph, projects.map((p) => p.name));
+                        const affectedProjects = options.releaseGroup.projectsRelationship === 'independent'
+                            ? [projectName]
+                            : projects.map((p) => p.name);
+                        specifier = await (0, resolve_semver_specifier_1.resolveSemverSpecifierFromConventionalCommits)(latestMatchingGitTag.tag, options.projectGraph, affectedProjects);
                         if (!specifier) {
                             log(`🚫 No changes were detected using git history and the conventional commits standard.`);
                             break;

package/src/utils/inline.js

@@ -177,7 +177,7 @@ function recursiveUpdateImport(dirPath, importRegex, inlinedDepsDestOutputRecord
             const updatedContent = fileContent.replace(importRegex, (matched) => {
                 const result = matched.replace(/['"]/g, '');
                 // If a match is the same as the rootParentDir, we're checking its own files so we return the matched as in no changes.
-                if (result === rootParentDir)
+                if (result === rootParentDir || !inlinedDepsDestOutputRecord[result])
                     return matched;
                 const importPath = `"${(0, path_1.relative)(dirPath, inlinedDepsDestOutputRecord[result])}"`;
                 return (0, devkit_1.normalizePath)(importPath);

package/src/utils/versions.d.ts

@@ -6,7 +6,7 @@ export declare const swcCoreVersion = "~1.3.85";
 export declare const swcHelpersVersion = "~0.5.2";
 export declare const swcNodeVersion = "~1.6.7";
 export declare const tsLibVersion = "^2.3.0";
-export declare const typesNodeVersion = "18.7.1";
+export declare const typesNodeVersion = "18.16.9";
 export declare const verdaccioVersion = "^5.0.4";
 export declare const typescriptVersion = "~5.2.2";
 /**

package/src/utils/versions.js

@@ -9,7 +9,7 @@ exports.swcCoreVersion = '~1.3.85';
 exports.swcHelpersVersion = '~0.5.2';
 exports.swcNodeVersion = '~1.6.7';
 exports.tsLibVersion = '^2.3.0';
-exports.typesNodeVersion = '18.7.1';
+exports.typesNodeVersion = '18.16.9';
 exports.verdaccioVersion = '^5.0.4';
 // Typescript
 exports.typescriptVersion = '~5.2.2';