@nx/js 17.3.0-beta.6 → 17.3.0-beta.8

package/package.json

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

package/src/generators/library/library.js

@@ -163,7 +163,7 @@ function addProject(tree, options) {
 async function addLint(tree, options) {
     const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-    const task = lintProjectGenerator(tree, {
+    const task = await lintProjectGenerator(tree, {
         project: options.name,
         linter: options.linter,
         skipFormat: true,

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

@@ -25,6 +25,14 @@ async function releaseVersionGenerator(tree, options) {
             // 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/, '');
         }
+        if (options.versionPrefix &&
+            version_1.validReleaseVersionPrefixes.indexOf(options.versionPrefix) === -1) {
+            throw new Error(`Invalid value for version.generatorOptions.versionPrefix: "${options.versionPrefix}"
+
+Valid values are: ${version_1.validReleaseVersionPrefixes
+                .map((s) => `"${s}"`)
+                .join(', ')}`);
+        }
         if (options.firstRelease) {
             // always use disk as a fallback for the first release
             options.fallbackCurrentVersionResolver = 'disk';
@@ -242,7 +250,7 @@ To fix this you will either need to add a package.json file at that location, or
             versionData[projectName] = {
                 currentVersion,
                 dependentProjects,
-                newVersion: null, // will stay as null in the final result the case that no changes are detected
+                newVersion: null, // will stay as null in the final result in the case that no changes are detected
             };
             if (!specifier) {
                 log(`🚫 Skipping versioning "${projectPackageJson.name}" as no changes were detected.`);
@@ -262,8 +270,23 @@ To fix this you will either need to add a package.json file at that location, or
             }
             for (const dependentProject of dependentProjects) {
                 (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectNameToPackageRootMap.get(dependentProject.source), 'package.json'), (json) => {
-                    json[dependentProject.dependencyCollection][packageName] =
-                        newVersion;
+                    // Auto (i.e.infer existing) by default
+                    let versionPrefix = options.versionPrefix ?? 'auto';
+                    // For auto, we infer the prefix based on the current version of the dependent
+                    if (versionPrefix === 'auto') {
+                        versionPrefix = ''; // we don't want to end up printing auto
+                        const current = json[dependentProject.dependencyCollection][packageName];
+                        if (current) {
+                            const prefixMatch = current.match(/^[~^]/);
+                            if (prefixMatch) {
+                                versionPrefix = prefixMatch[0];
+                            }
+                            else {
+                                versionPrefix = '';
+                            }
+                        }
+                    }
+                    json[dependentProject.dependencyCollection][packageName] = `${versionPrefix}${newVersion}`;
                     return json;
                 });
             }