@nx/js 19.8.0 → 19.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.8.0",
+  "version": "19.8.2",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,14 +39,15 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "19.8.0",
-    "@nx/workspace": "19.8.0",
+    "@nx/devkit": "19.8.2",
+    "@nx/workspace": "19.8.2",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
     "chalk": "^4.1.0",
     "columnify": "^1.6.0",
     "detect-port": "^1.5.1",
+    "enquirer": "~2.3.6",
     "fast-glob": "3.2.7",
     "ignore": "^5.0.4",
     "js-tokens": "^4.0.0",
@@ -60,7 +61,7 @@
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nrwl/js": "19.8.0"
+    "@nrwl/js": "19.8.2"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/node/lib/kill-tree.js

@@ -19,7 +19,9 @@ async function killTree(pid, signal) {
         };
         switch (process.platform) {
             case 'win32':
-                (0, child_process_1.exec)('taskkill /pid ' + pid + ' /T /F', (error) => {
+                (0, child_process_1.exec)('taskkill /pid ' + pid + ' /T /F', {
+                    windowsHide: true,
+                }, (error) => {
                     // Ignore Fatal errors (128) because it might be due to the process already being killed.
                     // On Linux/Mac we can check ESRCH (no such process), but on Windows we can't.
                     callback(error?.code !== 128 ? error : null);
@@ -27,20 +29,18 @@ async function killTree(pid, signal) {
                 break;
             case 'darwin':
                 buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
-                    return (0, child_process_1.spawn)('pgrep', ['-P', parentPid]);
+                    return (0, child_process_1.spawn)('pgrep', ['-P', parentPid], {
+                        windowsHide: true,
+                    });
                 }, function () {
                     killAll(tree, signal, callback);
                 });
                 break;
             default: // Linux
                 buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
-                    return (0, child_process_1.spawn)('ps', [
-                        '-o',
-                        'pid',
-                        '--no-headers',
-                        '--ppid',
-                        parentPid,
-                    ]);
+                    return (0, child_process_1.spawn)('ps', ['-o', 'pid', '--no-headers', '--ppid', parentPid], {
+                        windowsHide: true,
+                    });
                 }, function () {
                     killAll(tree, signal, callback);
                 });

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

@@ -96,6 +96,7 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
                 env: processEnv(true),
                 cwd: context.root,
                 stdio: ['ignore', 'pipe', 'pipe'],
+                windowsHide: true,
             });
             const resultJson = JSON.parse(result.toString());
             const distTags = resultJson['dist-tags'] || {};
@@ -116,6 +117,7 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
                             env: processEnv(true),
                             cwd: context.root,
                             stdio: 'ignore',
+                            windowsHide: true,
                         });
                         console.log(`Added the dist-tag ${tag} to v${currentVersion} for registry ${registry}.\n`);
                     }
@@ -202,6 +204,7 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
             env: processEnv(true),
             cwd: context.root,
             stdio: ['ignore', 'pipe', 'pipe'],
+            windowsHide: true,
         });
         /**
          * We cannot JSON.parse the output directly because if the user is using lifecycle scripts, npm/pnpm will mix its publish output with the JSON output all on stdout.

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

@@ -113,7 +113,7 @@ function createVerdaccioOptions(options, workspaceRoot) {
 }
 function setupNpm(options) {
     try {
-        (0, child_process_1.execSync)('npm --version', { env });
+        (0, child_process_1.execSync)('npm --version', { env, windowsHide: true });
     }
     catch (e) {
         return () => { };
@@ -124,13 +124,13 @@ function setupNpm(options) {
         scopes.forEach((scope) => {
             const registryName = scope ? `${scope}:registry` : 'registry';
             try {
-                npmRegistryPaths.push((0, child_process_1.execSync)(`npm config get ${registryName} --location ${options.location}`, { env })
+                npmRegistryPaths.push((0, child_process_1.execSync)(`npm config get ${registryName} --location ${options.location}`, { env, windowsHide: true })
                     ?.toString()
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', '') // strip out ansi codes
                 );
-                (0, child_process_1.execSync)(`npm config set ${registryName} http://localhost:${options.port}/ --location ${options.location}`, { env });
-                (0, child_process_1.execSync)(`npm config set //localhost:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env });
+                (0, child_process_1.execSync)(`npm config set ${registryName} http://localhost:${options.port}/ --location ${options.location}`, { env, windowsHide: true });
+                (0, child_process_1.execSync)(`npm config set //localhost:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env, windowsHide: true });
                 devkit_1.logger.info(`Set npm ${registryName} to http://localhost:${options.port}/`);
             }
             catch (e) {
@@ -139,7 +139,7 @@ function setupNpm(options) {
         });
         return () => {
             try {
-                const currentNpmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`, { env })
+                const currentNpmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`, { env, windowsHide: true })
                     ?.toString()
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
@@ -147,17 +147,18 @@ function setupNpm(options) {
                     const registryName = scope ? `${scope}:registry` : 'registry';
                     if (npmRegistryPaths[index] &&
                         currentNpmRegistryPath.includes('localhost')) {
-                        (0, child_process_1.execSync)(`npm config set ${registryName} ${npmRegistryPaths[index]} --location ${options.location}`, { env });
+                        (0, child_process_1.execSync)(`npm config set ${registryName} ${npmRegistryPaths[index]} --location ${options.location}`, { env, windowsHide: true });
                         devkit_1.logger.info(`Reset npm ${registryName} to ${npmRegistryPaths[index]}`);
                     }
                     else {
                         (0, child_process_1.execSync)(`npm config delete ${registryName} --location ${options.location}`, {
                             env,
+                            windowsHide: true,
                         });
                         devkit_1.logger.info('Cleared custom npm registry');
                     }
                 });
-                (0, child_process_1.execSync)(`npm config delete //localhost:${options.port}/:_authToken  --location ${options.location}`, { env });
+                (0, child_process_1.execSync)(`npm config delete //localhost:${options.port}/:_authToken  --location ${options.location}`, { env, windowsHide: true });
             }
             catch (e) {
                 throw new Error(`Failed to reset npm registry: ${e.message}`);
@@ -172,16 +173,17 @@ function getYarnUnsafeHttpWhitelist(isYarnV1) {
     return !isYarnV1
         ? new Set(JSON.parse((0, child_process_1.execSync)(`yarn config get unsafeHttpWhitelist --json`, {
             env,
+            windowsHide: true,
         }).toString()))
         : null;
 }
 function setYarnUnsafeHttpWhitelist(currentWhitelist, options) {
     if (currentWhitelist.size > 0) {
-        (0, child_process_1.execSync)(`yarn config set unsafeHttpWhitelist --json '${JSON.stringify(Array.from(currentWhitelist))}'` + (options.location === 'user' ? ' --home' : ''), { env });
+        (0, child_process_1.execSync)(`yarn config set unsafeHttpWhitelist --json '${JSON.stringify(Array.from(currentWhitelist))}'` + (options.location === 'user' ? ' --home' : ''), { env, windowsHide: true });
     }
     else {
         (0, child_process_1.execSync)(`yarn config unset unsafeHttpWhitelist` +
-            (options.location === 'user' ? ' --home' : ''), { env });
+            (options.location === 'user' ? ' --home' : ''), { env, windowsHide: true });
     }
 }
 function setupYarn(options) {
@@ -190,7 +192,7 @@ function setupYarn(options) {
     const scopes = ['', ...(options.scopes || [])];
     try {
         isYarnV1 =
-            (0, semver_1.major)((0, child_process_1.execSync)('yarn --version', { env }).toString().trim()) === 1;
+            (0, semver_1.major)((0, child_process_1.execSync)('yarn --version', { env, windowsHide: true }).toString().trim()) === 1;
     }
     catch {
         // This would fail if yarn is not installed which is okay
@@ -202,13 +204,14 @@ function setupYarn(options) {
             const scopeName = scope ? `${scope}:` : '';
             yarnRegistryPaths.push((0, child_process_1.execSync)(`yarn config get ${scopeName}${registryConfigName}`, {
                 env,
+                windowsHide: true,
             })
                 ?.toString()
                 ?.trim()
                 ?.replace('\u001b[2K\u001b[1G', '') // strip out ansi codes
             );
             (0, child_process_1.execSync)(`yarn config set ${scopeName}${registryConfigName} http://localhost:${options.port}/` +
-                (options.location === 'user' ? ' --home' : ''), { env });
+                (options.location === 'user' ? ' --home' : ''), { env, windowsHide: true });
             devkit_1.logger.info(`Set yarn ${scopeName}registry to http://localhost:${options.port}/`);
         });
         const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
@@ -221,7 +224,7 @@ function setupYarn(options) {
         }
         return () => {
             try {
-                const currentYarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`, { env })
+                const currentYarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`, { env, windowsHide: true })
                     ?.toString()
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
@@ -232,12 +235,15 @@ function setupYarn(options) {
                     if (yarnRegistryPaths[index] &&
                         currentYarnRegistryPath.includes('localhost')) {
                         (0, child_process_1.execSync)(`yarn config set ${registryName} ${yarnRegistryPaths[index]}` +
-                            (options.location === 'user' ? ' --home' : ''), { env });
+                            (options.location === 'user' ? ' --home' : ''), {
+                            env,
+                            windowsHide: true,
+                        });
                         devkit_1.logger.info(`Reset yarn ${registryName} to ${yarnRegistryPaths[index]}`);
                     }
                     else {
                         (0, child_process_1.execSync)(`yarn config ${isYarnV1 ? 'delete' : 'unset'} ${registryName}` +
-                            (options.location === 'user' ? ' --home' : ''), { env });
+                            (options.location === 'user' ? ' --home' : ''), { env, windowsHide: true });
                         devkit_1.logger.info(`Cleared custom yarn ${registryConfigName}`);
                     }
                 });

package/src/generators/init/init.js

@@ -109,6 +109,15 @@ async function initGeneratorInternal(tree, schema) {
             return json;
         });
     }
+    const rootTsConfigFileName = (0, ts_config_1.getRootTsConfigFileName)(tree);
+    // If the root tsconfig file uses `importHelpers` then we must install tslib
+    // in order to run tsc for build and typecheck.
+    if (rootTsConfigFileName) {
+        const rootTsConfig = (0, devkit_1.readJson)(tree, rootTsConfigFileName);
+        if (rootTsConfig.compilerOptions?.importHelpers) {
+            devDependencies['tslib'] = versions_1.tsLibVersion;
+        }
+    }
     const installTask = !schema.skipPackageJson
         ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, schema.keepExistingVersions)
         : () => { };

package/src/generators/library/library.js

@@ -105,9 +105,6 @@ async function libraryGeneratorInternal(tree, schema) {
             (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
         ]);
     }
-    if (options.bundler !== 'none') {
-        addBundlerDependencies(tree, options);
-    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -269,23 +266,6 @@ async function addLint(tree, options) {
     }
     return task;
 }
-function addBundlerDependencies(tree, options) {
-    (0, devkit_1.updateJson)(tree, `${options.projectRoot}/package.json`, (json) => {
-        if (options.bundler === 'tsc') {
-            json.dependencies = {
-                ...json.dependencies,
-                tslib: versions_1.tsLibVersion,
-            };
-        }
-        else if (options.bundler === 'swc') {
-            json.dependencies = {
-                ...json.dependencies,
-                '@swc/helpers': versions_1.swcHelpersVersion,
-            };
-        }
-        return json;
-    });
-}
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'tsconfig.json'), (json) => {
         if (options.strict) {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseVersionGenerator = releaseVersionGenerator;
 const devkit_1 = require("@nx/devkit");
 const chalk = require("chalk");
+const enquirer_1 = require("enquirer");
 const node_child_process_1 = require("node:child_process");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
@@ -118,7 +119,9 @@ To fix this you will either need to add a package.json file at that location, or
                         try {
                             // Must be non-blocking async to allow spinner to render
                             currentVersion = await new Promise((resolve, reject) => {
-                                (0, node_child_process_1.exec)(`npm view ${packageName} version --"${registryConfigKey}=${registry}" --tag=${tag}`, (error, stdout, stderr) => {
+                                (0, node_child_process_1.exec)(`npm view ${packageName} version --"${registryConfigKey}=${registry}" --tag=${tag}`, {
+                                    windowsHide: true,
+                                }, (error, stdout, stderr) => {
                                     if (error) {
                                         return reject(error);
                                     }
@@ -134,9 +137,23 @@ To fix this you will either need to add a package.json file at that location, or
                         catch (e) {
                             spinner.stop();
                             if (options.fallbackCurrentVersionResolver === 'disk') {
-                                logger.buffer(`📄 Unable to resolve the current version from the registry ${registry}. Falling back to the version on disk of ${currentVersionFromDisk}`);
-                                currentVersion = currentVersionFromDisk;
-                                currentVersionResolvedFromFallback = true;
+                                if (!currentVersionFromDisk &&
+                                    (options.specifierSource === 'conventional-commits' ||
+                                        options.specifierSource === 'version-plans')) {
+                                    currentVersion = await handleNoAvailableDiskFallback({
+                                        logger,
+                                        projectName,
+                                        packageJsonPath,
+                                        specifierSource: options.specifierSource,
+                                        currentVersionSourceMessage: `from the registry ${registry}`,
+                                        resolutionSuggestion: `you should publish an initial version to the registry`,
+                                    });
+                                }
+                                else {
+                                    logger.buffer(`📄 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 use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when the registry lookup fails.`);
@@ -156,7 +173,7 @@ To fix this you will either need to add a package.json file at that location, or
                 case 'disk':
                     currentVersion = currentVersionFromDisk;
                     if (!currentVersion) {
-                        throw new Error(`Unable to determine the current version for project "${project.name}" from ${packageJsonPath}`);
+                        throw new Error(`Unable to determine the current version for project "${project.name}" from ${packageJsonPath}, please ensure that the "version" field is set within the file`);
                     }
                     logger.buffer(`📄 Resolved the current version as ${currentVersion} from ${packageJsonPath}`);
                     break;
@@ -170,9 +187,23 @@ To fix this you will either need to add a package.json file at that location, or
                         });
                         if (!latestMatchingGitTag) {
                             if (options.fallbackCurrentVersionResolver === 'disk') {
-                                logger.buffer(`📄 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;
+                                if (!currentVersionFromDisk &&
+                                    (options.specifierSource === 'conventional-commits' ||
+                                        options.specifierSource === 'version-plans')) {
+                                    currentVersion = await handleNoAvailableDiskFallback({
+                                        logger,
+                                        projectName,
+                                        packageJsonPath,
+                                        specifierSource: options.specifierSource,
+                                        currentVersionSourceMessage: `from git tag using pattern "${releaseTagPattern}"`,
+                                        resolutionSuggestion: `you should set an initial git tag on a relevant commit`,
+                                    });
+                                }
+                                else {
+                                    logger.buffer(`📄 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 use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when no matching git tags are found.`);
@@ -675,3 +706,35 @@ class ProjectLogger {
         });
     }
 }
+/**
+ * Allow users to be unblocked when locally running releases for the very first time with certain combinations that require an initial
+ * version in order to function (e.g. a relative semver bump derived via conventional commits or version plans) by providing an interactive
+ * prompt to let them opt into using 0.0.0 as the implied current version.
+ */
+async function handleNoAvailableDiskFallback({ logger, projectName, packageJsonPath, specifierSource, currentVersionSourceMessage, resolutionSuggestion, }) {
+    const unresolvableCurrentVersionError = new Error(`Unable to resolve the current version ${currentVersionSourceMessage} and there is no version on disk to fall back to. This is invalid with ${specifierSource} because the new version is determined by relatively bumping the current version. To resolve this, ${resolutionSuggestion}, or set an appropriate value for "version" in ${packageJsonPath}`);
+    if (process.env.CI === 'true') {
+        // We can't prompt in CI, so error immediately
+        throw unresolvableCurrentVersionError;
+    }
+    try {
+        const reply = await (0, enquirer_1.prompt)([
+            {
+                name: 'useZero',
+                message: `\n${chalk.yellow(`Warning: Unable to resolve the current version for "${projectName}" ${currentVersionSourceMessage} and there is no version on disk to fall back to. This is invalid with ${specifierSource} because the new version is determined by relatively bumping the current version.\n\nTo resolve this, ${resolutionSuggestion}, or set an appropriate value for "version" in ${packageJsonPath}`)}. \n\nAlternatively, would you like to continue now by using 0.0.0 as the current version?`,
+                type: 'confirm',
+                initial: false,
+            },
+        ]);
+        if (!reply.useZero) {
+            // Throw any error to skip the fallback to 0.0.0, may as well use the one we already have
+            throw unresolvableCurrentVersionError;
+        }
+        const currentVersion = '0.0.0';
+        logger.buffer(`📄 Forcibly resolved the current version as "${currentVersion}" based on your response to the prompt above.`);
+        return currentVersion;
+    }
+    catch {
+        throw unresolvableCurrentVersionError;
+    }
+}

package/src/generators/release-version/utils/update-lock-file.js

@@ -89,6 +89,7 @@ function execLockFileUpdate(command, cwd, env = {}) {
                 ...process.env,
                 ...env,
             },
+            windowsHide: true,
         });
     }
     catch (e) {

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

@@ -8,8 +8,11 @@ const child_process_1 = require("child_process");
 async function setupVerdaccio(tree, options) {
     if (!tree.exists('.verdaccio/config.yml')) {
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), '.verdaccio', {
-            npmUplinkRegistry: (0, child_process_1.execSync)('npm config get registry')?.toString()?.trim() ??
-                'https://registry.npmjs.org',
+            npmUplinkRegistry: (0, child_process_1.execSync)('npm config get registry', {
+                windowsHide: true,
+            })
+                ?.toString()
+                ?.trim() ?? 'https://registry.npmjs.org',
         });
     }
     const verdaccioTarget = {

package/src/plugins/jest/start-local-registry.js

@@ -27,7 +27,9 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorag
                 console.log('Local registry started on port ' + port);
                 const registry = `http://localhost:${port}`;
                 process.env.npm_config_registry = registry;
-                (0, child_process_1.execSync)(`npm config set //localhost:${port}/:_authToken "secretVerdaccioToken"`);
+                (0, child_process_1.execSync)(`npm config set //localhost:${port}/:_authToken "secretVerdaccioToken"`, {
+                    windowsHide: true,
+                });
                 // yarnv1
                 process.env.YARN_REGISTRY = registry;
                 // yarnv2
@@ -36,7 +38,9 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorag
                 console.log('Set npm and yarn config registry to ' + registry);
                 resolve(() => {
                     childProcess.kill();
-                    (0, child_process_1.execSync)(`npm config delete //localhost:${port}/:_authToken`);
+                    (0, child_process_1.execSync)(`npm config delete //localhost:${port}/:_authToken`, {
+                        windowsHide: true,
+                    });
                 });
                 childProcess?.stdout?.off('data', listener);
             }

package/src/utils/npm-config.js

@@ -76,7 +76,7 @@ async function getNpmConfigValue(key, cwd) {
 async function execAsync(command, cwd) {
     // Must be non-blocking async to allow spinner to render
     return new Promise((resolve, reject) => {
-        (0, child_process_1.exec)(command, { cwd }, (error, stdout, stderr) => {
+        (0, child_process_1.exec)(command, { cwd, windowsHide: true }, (error, stdout, stderr) => {
             if (error) {
                 return reject(error);
             }

package/src/utils/swc/compile-swc.js

@@ -62,6 +62,7 @@ async function compileSwc(context, normalizedOptions, postCompilationCallback) {
     const swcCmdLog = (0, node_child_process_1.execSync)(getSwcCmd(normalizedOptions), {
         encoding: 'utf8',
         cwd: normalizedOptions.swcCliOptions.swcCwd,
+        windowsHide: true,
     });
     devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
     const isCompileSuccess = swcCmdLog.includes('Successfully compiled');
@@ -98,6 +99,7 @@ async function* compileSwcWatch(context, normalizedOptions, postCompilationCallb
         let watcherOnExit;
         const swcWatcher = (0, node_child_process_1.exec)(getSwcCmd(normalizedOptions, true), {
             cwd: normalizedOptions.swcCliOptions.swcCwd,
+            windowsHide: true,
         });
         processOnExit = () => {
             swcWatcher.kill();