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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "17.3.0-beta.4",
+  "version": "17.3.0-beta.6",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -52,14 +52,14 @@
     "tsconfig-paths": "^4.1.2",
     "ignore": "^5.0.4",
     "js-tokens": "^4.0.0",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "ora": "5.3.0",
     "semver": "7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.3.0-beta.4",
-    "@nx/workspace": "17.3.0-beta.4",
-    "@nrwl/js": "17.3.0-beta.4"
+    "@nx/devkit": "17.3.0-beta.6",
+    "@nx/workspace": "17.3.0-beta.6",
+    "@nrwl/js": "17.3.0-beta.6"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/verdaccio/verdaccio.impl.js

@@ -149,7 +149,7 @@ function getYarnUnsafeHttpWhitelist(isYarnV1) {
         : null;
 }
 function setYarnUnsafeHttpWhitelist(currentWhitelist, options) {
-    if (currentWhitelist.size > 1) {
+    if (currentWhitelist.size > 0) {
         (0, child_process_1.execSync)(`yarn config set unsafeHttpWhitelist --json '${JSON.stringify(Array.from(currentWhitelist))}'` + (options.location === 'user' ? ' --home' : ''));
     }
     else {

package/src/generators/init/init.js

@@ -50,7 +50,7 @@ async function initGenerator(tree, schema) {
         '@swc-node/register': versions_1.swcNodeVersion,
         '@swc/core': versions_1.swcCoreVersion,
     };
-    if (!schema.js) {
+    if (!schema.js && !schema.keepExistingVersions) {
         const installedTsVersion = await getInstalledTypescriptVersion(tree);
         if (!installedTsVersion ||
             !(0, semver_2.satisfies)(installedTsVersion, versions_1.supportedTypescriptVersions, {
@@ -96,7 +96,7 @@ async function initGenerator(tree, schema) {
         });
     }
     const installTask = !schema.skipPackageJson
-        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies)
+        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, schema.keepExistingVersions)
         : () => { };
     tasks.push(installTask);
     (0, devkit_1.ensurePackage)('prettier', versions_1.prettierVersion);

package/src/generators/init/schema.d.ts

@@ -2,5 +2,6 @@ export interface InitSchema {
   js?: boolean;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
   tsConfigName?: string;
 }

package/src/generators/init/schema.json

@@ -21,6 +21,12 @@
       "description": "Skip adding package.json dependencies",
       "x-priority": "internal"
     },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
+    },
     "tsConfigName": {
       "type": "string",
       "description": "Customize the generated tsconfig file name.",

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

@@ -25,6 +25,10 @@ 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.firstRelease) {
+            // always use disk as a fallback for the first release
+            options.fallbackCurrentVersionResolver = 'disk';
+        }
         const projects = options.projects;
         const createResolvePackageRoot = (customPackageRoot) => (projectNode) => {
             // Default to the project root if no custom packageRoot
@@ -44,6 +48,7 @@ async function releaseVersionGenerator(tree, options) {
             projectNameToPackageRootMap.set(project.name, resolvePackageRoot(project));
         }
         let currentVersion;
+        let currentVersionResolvedFromFallback = false;
         // only used for options.currentVersionResolver === 'git-tag', but
         // must be declared here in order to reuse it for additional projects
         let latestMatchingGitTag;
@@ -85,23 +90,41 @@ To fix this you will either need to add a package.json file at that location, or
                         spinner.color =
                             color.spinnerColor;
                         spinner.start();
-                        // Must be non-blocking async to allow spinner to render
-                        currentVersion = await new Promise((resolve, reject) => {
-                            (0, child_process_1.exec)(`npm view ${packageName} version --registry=${registry} --tag=${tag}`, (error, stdout, stderr) => {
-                                if (error) {
-                                    return reject(error);
-                                }
-                                if (stderr) {
-                                    return reject(stderr);
-                                }
-                                return resolve(stdout.trim());
+                        try {
+                            // Must be non-blocking async to allow spinner to render
+                            currentVersion = await new Promise((resolve, reject) => {
+                                (0, child_process_1.exec)(`npm view ${packageName} version --registry=${registry} --tag=${tag}`, (error, stdout, stderr) => {
+                                    if (error) {
+                                        return reject(error);
+                                    }
+                                    if (stderr) {
+                                        return reject(stderr);
+                                    }
+                                    return resolve(stdout.trim());
+                                });
                             });
-                        });
-                        spinner.stop();
-                        log(`📄 Resolved the current version as ${currentVersion} for tag "${tag}" from registry ${registry}`);
+                            spinner.stop();
+                            log(`📄 Resolved the current version as ${currentVersion} for tag "${tag}" from registry ${registry}`);
+                        }
+                        catch (e) {
+                            spinner.stop();
+                            if (options.fallbackCurrentVersionResolver === 'disk') {
+                                log(`📄 Unable to resolve the current version from the registry ${registry}. Falling back to the version on disk of ${currentVersionFromDisk}`);
+                                currentVersion = currentVersionFromDisk;
+                                currentVersionResolvedFromFallback = true;
+                            }
+                            else {
+                                throw new Error(`Unable to resolve the current version from the registry ${registry}. Please ensure that the package exists in the registry in order to use the "registry" currentVersionResolver. Alternatively, you can set the "version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when the registry lookup fails.`);
+                            }
+                        }
                     }
                     else {
-                        log(`📄 Using the current version ${currentVersion} already resolved from the registry ${registry}`);
+                        if (currentVersionResolvedFromFallback) {
+                            log(`📄 Using the current version ${currentVersion} already resolved from disk fallback.`);
+                        }
+                        else {
+                            log(`📄 Using the current version ${currentVersion} already resolved from the registry ${registry}`);
+                        }
                     }
                     break;
                 }
@@ -118,13 +141,27 @@ To fix this you will either need to add a package.json file at that location, or
                             projectName: project.name,
                         });
                         if (!latestMatchingGitTag) {
-                            throw new Error(`No git tags matching pattern "${releaseTagPattern}" for project "${project.name}" were found. You will need to create an initial matching tag to use as a base for determining the next version.`);
+                            if (options.fallbackCurrentVersionResolver === 'disk') {
+                                log(`📄 Unable to resolve the current version from git tag using pattern "${releaseTagPattern}". Falling back to the version on disk of ${currentVersionFromDisk}`);
+                                currentVersion = currentVersionFromDisk;
+                                currentVersionResolvedFromFallback = true;
+                            }
+                            else {
+                                throw new Error(`No git tags matching pattern "${releaseTagPattern}" for project "${project.name}" were found. You will need to create an initial matching tag to use as a base for determining the next version. Alternatively, you can set the "version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when no matching git tags are found.`);
+                            }
+                        }
+                        else {
+                            currentVersion = latestMatchingGitTag.extractedVersion;
+                            log(`📄 Resolved the current version as ${currentVersion} from git tag "${latestMatchingGitTag.tag}".`);
                         }
-                        currentVersion = latestMatchingGitTag.extractedVersion;
-                        log(`📄 Resolved the current version as ${currentVersion} from git tag "${latestMatchingGitTag.tag}".`);
                     }
                     else {
-                        log(`📄 Using the current version ${currentVersion} already resolved from git tag "${latestMatchingGitTag.tag}".`);
+                        if (currentVersionResolvedFromFallback) {
+                            log(`📄 Using the current version ${currentVersion} already resolved from disk fallback.`);
+                        }
+                        else {
+                            log(`📄 Using the current version ${currentVersion} already resolved from git tag "${latestMatchingGitTag.tag}".`);
+                        }
                     }
                     break;
                 }

package/src/generators/setup-build/generator.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
 const versions_1 = require("../../utils/versions");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 async function setupBuildGenerator(tree, options) {
     const tasks = [];
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -101,6 +102,7 @@ async function setupBuildGenerator(tree, options) {
             break;
         }
         case 'tsc': {
+            (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, '@nx/js:tsc');
             const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
             project.targets[buildTarget] = {
                 executor: `@nx/js:tsc`,
@@ -116,6 +118,7 @@ async function setupBuildGenerator(tree, options) {
             break;
         }
         case 'swc': {
+            (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, '@nx/js:swc');
             const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
             project.targets[buildTarget] = {
                 executor: `@nx/js:swc`,

package/src/utils/assets/copy-assets-handler.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyAssetsHandler = exports.defaultFileEventHandler = void 0;
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const path = require("path");
 const fse = require("fs-extra");
 const ignore_1 = require("ignore");
@@ -114,8 +114,8 @@ class CopyAssetsHandler {
         for (const event of events) {
             const pathFromRoot = path.relative(this.rootDir, event.path);
             for (const ag of this.assetGlobs) {
-                if (minimatch(pathFromRoot, ag.pattern) &&
-                    !ag.ignore?.some((ig) => minimatch(pathFromRoot, ig)) &&
+                if ((0, minimatch_1.minimatch)(pathFromRoot, ag.pattern) &&
+                    !ag.ignore?.some((ig) => (0, minimatch_1.minimatch)(pathFromRoot, ig)) &&
                     !this.ignore.ignores(pathFromRoot)) {
                     const relPath = path.relative(ag.input, pathFromRoot);
                     const destPath = relPath.startsWith('..') ? pathFromRoot : relPath;
@@ -134,7 +134,7 @@ class CopyAssetsHandler {
     }
     filesToEvent(files, assetGlob) {
         return files.reduce((acc, src) => {
-            if (!assetGlob.ignore?.some((ig) => minimatch(src, ig)) &&
+            if (!assetGlob.ignore?.some((ig) => (0, minimatch_1.minimatch)(src, ig)) &&
                 !this.ignore.ignores(src)) {
                 const relPath = path.relative(assetGlob.input, src);
                 const dest = relPath.startsWith('..') ? src : relPath;