@nx/js 17.2.0-beta.5 → 17.2.0-beta.8

package/package.json

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

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

@@ -27,14 +27,18 @@ async function runExecutor(options, context) {
         ? `package "${packageName}"`
         : `package "${packageName}" from project "${context.projectName}"`;
     if (projectPackageJson.private === true) {
-        console.warn(`Skipping ${packageTxt}, because it has \`"private": true\` in ${packageJsonPath}`);
+        console.warn(`Skipped ${packageTxt}, because it has \`"private": true\` in ${packageJsonPath}`);
         return {
             success: true,
         };
     }
     const npmPublishCommandSegments = [`npm publish --json`];
+    const npmViewCommandSegments = [
+        `npm view ${packageName} versions dist-tags --json`,
+    ];
     if (options.registry) {
         npmPublishCommandSegments.push(`--registry=${options.registry}`);
+        npmViewCommandSegments.push(`--registry=${options.registry}`);
     }
     if (options.tag) {
         npmPublishCommandSegments.push(`--tag=${options.tag}`);
@@ -48,6 +52,76 @@ async function runExecutor(options, context) {
     // Resolve values using the `npm config` command so that things like environment variables and `publishConfig`s are accounted for
     const registry = options.registry ?? (0, child_process_1.execSync)(`npm config get registry`).toString().trim();
     const tag = options.tag ?? (0, child_process_1.execSync)(`npm config get tag`).toString().trim();
+    const currentVersion = projectPackageJson.version;
+    try {
+        const result = (0, child_process_1.execSync)(npmViewCommandSegments.join(' '), {
+            env: processEnv(true),
+            cwd: packageRoot,
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        const resultJson = JSON.parse(result.toString());
+        const distTags = resultJson['dist-tags'] || {};
+        if (distTags[tag] === currentVersion) {
+            console.warn(`Skipped ${packageTxt} because v${currentVersion} already exists in ${registry} with tag "${tag}"`);
+            return {
+                success: true,
+            };
+        }
+        if (resultJson.versions.includes(currentVersion)) {
+            try {
+                if (!options.dryRun) {
+                    (0, child_process_1.execSync)(`npm dist-tag add ${packageName}@${currentVersion} ${tag} --registry=${registry}`, {
+                        env: processEnv(true),
+                        cwd: packageRoot,
+                        stdio: 'ignore',
+                    });
+                    console.log(`Added the dist-tag ${tag} to v${currentVersion} for registry ${registry}.\n`);
+                }
+                else {
+                    console.log(`Would add the dist-tag ${tag} to v${currentVersion} for registry ${registry}, but ${chalk.keyword('orange')('[dry-run]')} was set.\n`);
+                }
+                return {
+                    success: true,
+                };
+            }
+            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));
+                    }
+                    return {
+                        success: false,
+                    };
+                }
+                catch (err) {
+                    console.error('Something unexpected went wrong when processing the npm dist-tag add output\n', err);
+                    return {
+                        success: false,
+                    };
+                }
+            }
+        }
+    }
+    catch (err) {
+        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'))) {
+            console.error(`Something unexpected went wrong when checking for existing dist-tags.\n`, err);
+            return {
+                success: false,
+            };
+        }
+    }
     try {
         const output = (0, child_process_1.execSync)(npmPublishCommandSegments.join(' '), {
             maxBuffer: LARGE_BUFFER,
@@ -71,22 +145,7 @@ async function runExecutor(options, context) {
     }
     catch (err) {
         try {
-            const currentVersion = projectPackageJson.version;
             const stdoutData = JSON.parse(err.stdout?.toString() || '{}');
-            if (
-            // handle npm conflict error
-            stdoutData.error?.code === 'EPUBLISHCONFLICT' ||
-                // handle npm conflict error when the package has a scope
-                (stdoutData.error?.code === 'E403' &&
-                    stdoutData.error?.summary?.includes('You cannot publish over the previously published versions')) ||
-                // handle verdaccio conflict error
-                (stdoutData.error?.code === 'E409' &&
-                    stdoutData.error?.summary?.includes('this package is already present'))) {
-                console.warn(`Skipping ${packageTxt}, as v${currentVersion} has already been published to ${registry} with tag "${tag}"`);
-                return {
-                    success: true,
-                };
-            }
             console.error('npm publish error:');
             if (stdoutData.error.summary) {
                 console.error(stdoutData.error.summary);
@@ -103,8 +162,6 @@ async function runExecutor(options, context) {
             };
         }
         catch (err) {
-            // npm v9 onwards seems to guarantee stdout will be well formed JSON when --json is used, so maybe we need to
-            // specify that as minimum supported version? (comes with node 18 and 20 by default)
             console.error('Something unexpected went wrong when processing the npm publish output\n', err);
             return {
                 success: false,

package/src/generators/library/library.js

@@ -162,9 +162,6 @@ function addProject(tree, options) {
 }
 async function addLint(tree, options) {
     const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
-    const { mapLintPattern } = 
-    // nx-ignore-next-line
-    require('@nx/eslint/src/generators/lint-project/lint-project');
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
     const task = lintProjectGenerator(tree, {
         project: options.name,
@@ -174,9 +171,6 @@ async function addLint(tree, options) {
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
         ],
         unitTestRunner: options.unitTestRunner,
-        eslintFilePatterns: [
-            mapLintPattern(options.projectRoot, options.js ? 'js' : 'ts', options.rootProject),
-        ],
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,
     });

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

@@ -186,25 +186,31 @@ To fix this you will either need to add a package.json file at that location, or
                         throw new Error(`Invalid specifierSource "${specifierSource}" provided. Must be one of "prompt" or "conventional-commits"`);
                 }
             }
+            // Resolve any local package dependencies for this project (before applying the new version or updating the versionData)
+            const localPackageDependencies = (0, resolve_local_package_dependencies_1.resolveLocalPackageDependencies)(tree, options.projectGraph, projects, projectNameToPackageRootMap, resolvePackageRoot, 
+            // includeAll when the release group is independent, as we may be filtering to a specific subset of projects, but we still want to update their dependents
+            options.releaseGroup.projectsRelationship === 'independent');
+            const dependentProjects = Object.values(localPackageDependencies)
+                .flat()
+                .filter((localPackageDependency) => {
+                return localPackageDependency.target === project.name;
+            });
+            versionData[projectName] = {
+                currentVersion,
+                dependentProjects,
+                newVersion: null, // will stay as null in the final result the case that no changes are detected
+            };
             if (!specifier) {
                 log(`🚫 Skipping versioning "${projectPackageJson.name}" as no changes were detected.`);
                 continue;
             }
-            // Resolve any local package dependencies for this project (before applying the new version)
-            const localPackageDependencies = (0, resolve_local_package_dependencies_1.resolveLocalPackageDependencies)(tree, options.projectGraph, projects, projectNameToPackageRootMap, resolvePackageRoot, 
-            // includeAll when the release group is independent, as we may be filtering to a specific subset of projects, but we still want to update their dependents
-            options.releaseGroup.projectsRelationship === 'independent');
             const newVersion = (0, version_1.deriveNewSemverVersion)(currentVersion, specifier, options.preid);
+            versionData[projectName].newVersion = newVersion;
             (0, devkit_1.writeJson)(tree, packageJsonPath, {
                 ...projectPackageJson,
                 version: newVersion,
             });
             log(`✍️  New version ${newVersion} written to ${workspaceRelativePackageJsonPath}`);
-            const dependentProjects = Object.values(localPackageDependencies)
-                .flat()
-                .filter((localPackageDependency) => {
-                return localPackageDependency.target === project.name;
-            });
             if (dependentProjects.length > 0) {
                 log(`✍️  Applying new version ${newVersion} to ${dependentProjects.length} ${dependentProjects.length > 1
                     ? 'packages which depend'
@@ -217,11 +223,6 @@ To fix this you will either need to add a package.json file at that location, or
                     return json;
                 });
             }
-            versionData[projectName] = {
-                currentVersion,
-                newVersion,
-                dependentProjects,
-            };
         }
         /**
          * Ensure that formatting is applied so that version bump diffs are as mimimal as possible