@nx/js 17.2.5 → 17.2.7

package/README.md

@@ -1,9 +1,4 @@
-<p style="text-align: center;">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
-  </picture>
-</p>
+<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
 <div style="text-align: center;">
 
@@ -20,9 +15,9 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart, Fast and Extensible Build System
 
-Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
+Nx is a next generation build system with first class monorepo support and powerful integrations.
 
 This package is a [JavaScript/TypeScript plugin for Nx](https://nx.dev/js/overview).
 
@@ -64,5 +59,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "v17.2.5",
+  "version": "17.2.7",
   "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": "v17.2.5",
-    "@nx/workspace": "v17.2.5",
-    "@nrwl/js": "v17.2.5"
+    "@nx/devkit": "17.2.7",
+    "@nx/workspace": "17.2.7",
+    "@nrwl/js": "17.2.7"
   },
   "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);
@@ -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/library/files/lib/README.md

@@ -14,6 +14,6 @@ Run `<%= cliCommand %> build <%= name %>` to build the library.
 
 ## Running unit tests
 
-Run `<%= cliCommand %> test <%= name %>` to execute the unit tests via [Jest](https://jestjs.io).
+Run `<%= cliCommand %> test <%= name %>` to execute the unit tests via <% if(unitTestRunner === 'jest') { %>[Jest](https://jestjs.io)<% } else { %>[Vitest](https://vitest.dev/)<% } %>.
 
 <% } %>

package/src/generators/library/files/lib/tsconfig.lib.json__tmpl__

@@ -6,5 +6,9 @@
     "types": ["node"]
   },
   "include": ["src/**/*.ts"<% if (js) { %>, "src/**/*.js"<% } %>],
-  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"<% if (js) { %>, "src/**/*.spec.js", "src/**/*.test.js"<% } %>]
+  "exclude": [
+    <% if (hasUnitTestRunner && unitTestRunner === 'jest') { %>"jest.config.ts", 
+    <% } else if (hasUnitTestRunner) { %>"vite.config.ts", 
+    <% } %>"src/**/*.spec.ts", "src/**/*.test.ts"<% if (js) { %>, "src/**/*.spec.js", "src/**/*.test.js"<% } %>
+  ]
 }

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

@@ -18,8 +18,12 @@ async function releaseVersionGenerator(tree, options) {
     try {
         const versionData = {};
         // If the user provided a specifier, validate that it is valid semver or a relative semver keyword
-        if (options.specifier && !(0, semver_1.isValidSemverSpecifier)(options.specifier)) {
-            throw new Error(`The given version specifier "${options.specifier}" is not valid. You provide an exact version or a valid semver keyword such as "major", "minor", "patch", etc.`);
+        if (options.specifier) {
+            if (!(0, semver_1.isValidSemverSpecifier)(options.specifier)) {
+                throw new Error(`The given version specifier "${options.specifier}" is not valid. You provide an exact version or a valid semver keyword such as "major", "minor", "patch", etc.`);
+            }
+            // The node semver library classes a leading `v` as valid, but we want to ensure it is not present in the final version
+            options.specifier = options.specifier.replace(/^v/, '');
         }
         const projects = options.projects;
         const createResolvePackageRoot = (customPackageRoot) => (projectNode) => {