@nx/js 17.2.5 → 17.3.0-beta.1

package/package.json

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

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) => {

package/src/utils/typescript/ast-utils.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findNodes = exports.findClass = exports.addMethod = exports.addParameterToConstructor = exports.replaceNodeValue = exports.getImport = exports.addGlobal = exports.insertImport = exports.removeChange = exports.replaceChange = exports.insertChange = exports.resolveModuleByImport = void 0;
-// TODO(colum): replace when https://github.com/nrwl/nx/pull/15497 is merged
-const typescript_1 = require("@nx/workspace/src/utilities/typescript");
 const ensure_typescript_1 = require("./ensure-typescript");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const get_source_nodes_1 = require("./get-source-nodes");
 const normalizedAppRoot = devkit_1.workspaceRoot.replace(/\\/g, '/');
 let tsModule;
 let compilerHost;
@@ -228,7 +227,7 @@ function findClass(source, className, silent = false) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const nodes = (0, typescript_1.getSourceNodes)(source);
+    const nodes = (0, get_source_nodes_1.getSourceNodes)(source);
     const clazz = nodes.filter((n) => n.kind === tsModule.SyntaxKind.ClassDeclaration &&
         n.name.text === className)[0];
     if (!clazz && !silent) {