@nx/js 22.6.0-rc.2 → 22.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.6.0-rc.2",
+  "version": "22.6.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": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.6.0-rc.2",
-    "@nx/workspace": "22.6.0-rc.2",
+    "@nx/devkit": "22.6.1",
+    "@nx/workspace": "22.6.1",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,7 +60,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.6.0-rc.2"
+    "nx": "22.6.1"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

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

@@ -20,7 +20,7 @@ async function killTree(pid, signal) {
         switch (process.platform) {
             case 'win32':
                 (0, child_process_1.exec)('taskkill /pid ' + pid + ' /T /F', {
-                    windowsHide: false,
+                    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.
@@ -30,7 +30,7 @@ async function killTree(pid, signal) {
             case 'darwin':
                 buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
                     return (0, child_process_1.spawn)('pgrep', ['-P', parentPid], {
-                        windowsHide: false,
+                        windowsHide: true,
                     });
                 }, function () {
                     killAll(tree, signal, callback);
@@ -39,7 +39,7 @@ async function killTree(pid, signal) {
             default: // Linux
                 buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
                     return (0, child_process_1.spawn)('ps', ['-o', 'pid', '--no-headers', '--ppid', parentPid], {
-                        windowsHide: false,
+                        windowsHide: true,
                     });
                 }, function () {
                     killAll(tree, signal, callback);

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

@@ -151,7 +151,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: false,
+                windowsHide: true,
             });
             const resultJson = JSON.parse(result.toString());
             const distTags = resultJson['dist-tags'] || {};
@@ -173,7 +173,7 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
                                 env: processEnv(true),
                                 cwd: context.root,
                                 stdio: 'ignore',
-                                windowsHide: false,
+                                windowsHide: true,
                             });
                             console.log(`Added the dist-tag ${tag} to v${currentVersion} for registry ${registry}.\n`);
                         }
@@ -286,7 +286,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: false,
+            windowsHide: true,
         });
         // If in dry-run mode, the version on disk will not represent the version that would be published, so we scrub it from the output to avoid confusion.
         const dryRunVersionPlaceholder = 'X.X.X-dry-run';

package/src/executors/verdaccio/verdaccio.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verdaccio.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/verdaccio/verdaccio.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAOrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAUnD;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe;;;GAqDzB;AAoTD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"verdaccio.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/verdaccio/verdaccio.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAOrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAUnD;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe;;;GAqDzB;AAkTD,eAAe,iBAAiB,CAAC"}

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

@@ -116,7 +116,7 @@ function createVerdaccioOptions(options, workspaceRoot) {
 }
 function setupNpm(options) {
     try {
-        (0, child_process_1.execSync)('npm --version', { env, windowsHide: false });
+        (0, child_process_1.execSync)('npm --version', { env, windowsHide: true });
     }
     catch (e) {
         return () => { };
@@ -127,13 +127,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, windowsHide: false })
+                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://${options.listenAddress}:${options.port}/ --location ${options.location}`, { env, windowsHide: false });
-                (0, child_process_1.execSync)(`npm config set //${options.listenAddress}:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env, windowsHide: false });
+                (0, child_process_1.execSync)(`npm config set ${registryName} http://${options.listenAddress}:${options.port}/ --location ${options.location}`, { env, windowsHide: true });
+                (0, child_process_1.execSync)(`npm config set //${options.listenAddress}:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env, windowsHide: true });
                 devkit_1.logger.info(`Set npm ${registryName} to http://${options.listenAddress}:${options.port}/`);
             }
             catch (e) {
@@ -142,7 +142,7 @@ function setupNpm(options) {
         });
         return () => {
             try {
-                const currentNpmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`, { env, windowsHide: false })
+                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
@@ -150,18 +150,18 @@ function setupNpm(options) {
                     const registryName = scope ? `${scope}:registry` : 'registry';
                     if (npmRegistryPaths[index] &&
                         currentNpmRegistryPath.includes(options.listenAddress)) {
-                        (0, child_process_1.execSync)(`npm config set ${registryName} ${npmRegistryPaths[index]} --location ${options.location}`, { env, windowsHide: false });
+                        (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: false,
+                            windowsHide: true,
                         });
                         devkit_1.logger.info('Cleared custom npm registry');
                     }
                 });
-                (0, child_process_1.execSync)(`npm config delete //${options.listenAddress}:${options.port}/:_authToken  --location ${options.location}`, { env, windowsHide: false });
+                (0, child_process_1.execSync)(`npm config delete //${options.listenAddress}:${options.port}/:_authToken  --location ${options.location}`, { env, windowsHide: true });
             }
             catch (e) {
                 throw new Error(`Failed to reset npm registry: ${e.message}`);
@@ -176,17 +176,17 @@ function getYarnUnsafeHttpWhitelist(isYarnV1) {
     return !isYarnV1
         ? new Set(JSON.parse((0, child_process_1.execSync)(`yarn config get unsafeHttpWhitelist --json`, {
             env,
-            windowsHide: false,
+            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, windowsHide: false });
+        (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, windowsHide: false });
+            (options.location === 'user' ? ' --home' : ''), { env, windowsHide: true });
     }
 }
 function setupYarn(options) {
@@ -195,9 +195,7 @@ function setupYarn(options) {
     const scopes = ['', ...(options.scopes || [])];
     try {
         isYarnV1 =
-            (0, semver_1.major)((0, child_process_1.execSync)('yarn --version', { env, windowsHide: false })
-                .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
@@ -209,14 +207,14 @@ function setupYarn(options) {
             const scopeName = scope ? `${scope}:` : '';
             yarnRegistryPaths.push((0, child_process_1.execSync)(`yarn config get ${scopeName}${registryConfigName}`, {
                 env,
-                windowsHide: false,
+                windowsHide: true,
             })
                 ?.toString()
                 ?.trim()
                 ?.replace('\u001b[2K\u001b[1G', '') // strip out ansi codes
             );
             (0, child_process_1.execSync)(`yarn config set ${scopeName}${registryConfigName} http://${options.listenAddress}:${options.port}/` +
-                (options.location === 'user' ? ' --home' : ''), { env, windowsHide: false });
+                (options.location === 'user' ? ' --home' : ''), { env, windowsHide: true });
             devkit_1.logger.info(`Set yarn ${scopeName}registry to http://${options.listenAddress}:${options.port}/`);
         });
         const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
@@ -229,7 +227,7 @@ function setupYarn(options) {
         }
         return () => {
             try {
-                const currentYarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`, { env, windowsHide: false })
+                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
@@ -242,13 +240,13 @@ function setupYarn(options) {
                         (0, child_process_1.execSync)(`yarn config set ${registryName} ${yarnRegistryPaths[index]}` +
                             (options.location === 'user' ? ' --home' : ''), {
                             env,
-                            windowsHide: false,
+                            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, windowsHide: false });
+                            (options.location === 'user' ? ' --home' : ''), { env, windowsHide: true });
                         devkit_1.logger.info(`Cleared custom yarn ${registryConfigName}`);
                     }
                 });

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

@@ -10,7 +10,7 @@ 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', {
-                windowsHide: false,
+                windowsHide: true,
             })
                 ?.toString()
                 ?.trim() ?? 'https://registry.npmjs.org',

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

@@ -34,7 +34,7 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorag
                 console.log(`Local registry started on ${registry}`);
                 process.env.npm_config_registry = registry;
                 (0, child_process_1.execSync)(`npm config set //${listenAddress}:${port}/:_authToken "${authToken}" --ws=false`, {
-                    windowsHide: false,
+                    windowsHide: true,
                 });
                 // bun
                 process.env.BUN_CONFIG_REGISTRY = registry;
@@ -48,7 +48,7 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorag
                 resolve(() => {
                     childProcess.kill();
                     (0, child_process_1.execSync)(`npm config delete //${listenAddress}:${port}/:_authToken --ws=false`, {
-                        windowsHide: false,
+                        windowsHide: true,
                     });
                 });
                 childProcess?.stdout?.off('data', listener);

package/src/plugins/typescript/plugin.js

@@ -13,7 +13,7 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
 const util_1 = require("./util");
 let ts;
 const pmc = (0, devkit_1.getPackageManagerCommand)();
-const TSCONFIG_CACHE_VERSION = 1;
+const TSCONFIG_CACHE_VERSION = 2;
 const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, 'tsconfig-files.hash');
 // Module-level cache store — each invocation gets a unique Symbol key
 const cacheStore = new Map();
@@ -281,7 +281,7 @@ function buildTscTargets(config, options, context, configFiles, cache) {
             targets[targetName] = {
                 dependsOn,
                 command,
-                options: { cwd: config.project.root },
+                options: { cwd: config.project.normalized },
                 cache: true,
                 inputs: getInputs(namedInputs, config, tsConfig, internalProjectReferences, context.workspaceRoot, cache),
                 outputs: getOutputs(config, tsConfig, internalProjectReferences, context.workspaceRoot, 
@@ -311,7 +311,7 @@ function buildTscTargets(config, options, context, configFiles, cache) {
         targets[targetName] = {
             dependsOn: [`^${targetName}`],
             command: `${compiler} --build ${options.build.configName}${options.verboseOutput ? ' --verbose' : ''}`,
-            options: { cwd: config.project.root },
+            options: { cwd: config.project.normalized },
             cache: true,
             inputs: getInputs(namedInputs, config, tsConfig, internalProjectReferences, context.workspaceRoot, cache),
             outputs: getOutputs(config, tsConfig, internalProjectReferences, context.workspaceRoot, 
@@ -889,12 +889,28 @@ function readFile(filePath, workspaceRoot, cache) {
 function toAbsolutePaths(cache, workspaceRoot) {
     const updatedCache = {};
     for (const [key, { data, extendedFilesHash, hash }] of Object.entries(cache)) {
+        const raw = {
+            nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+        };
+        if (data.raw?.include) {
+            raw.include = data.raw.include;
+        }
+        if (data.raw?.exclude) {
+            raw.exclude = data.raw.exclude;
+        }
+        if (data.raw?.files) {
+            raw.files = data.raw.files;
+        }
         updatedCache[key] = {
             data: {
-                options: { noEmit: data.options.noEmit },
-                raw: {
-                    nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+                options: {
+                    noEmit: data.options.noEmit,
+                    allowJs: data.options.allowJs,
+                    resolveJsonModule: data.options.resolveJsonModule,
+                    emitDeclarationOnly: data.options.emitDeclarationOnly,
+                    declarationMap: data.options.declarationMap,
                 },
+                raw,
                 extendedConfigFiles: data.extendedConfigFiles,
             },
             extendedFilesHash,
@@ -926,12 +942,28 @@ function toAbsolutePaths(cache, workspaceRoot) {
 function toRelativePaths(cache, workspaceRoot) {
     const updatedCache = {};
     for (const [key, { data, extendedFilesHash, hash }] of Object.entries(cache)) {
+        const raw = {
+            nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+        };
+        if (data.raw?.include) {
+            raw.include = data.raw.include;
+        }
+        if (data.raw?.exclude) {
+            raw.exclude = data.raw.exclude;
+        }
+        if (data.raw?.files) {
+            raw.files = data.raw.files;
+        }
         updatedCache[key] = {
             data: {
-                options: { noEmit: data.options.noEmit },
-                raw: {
-                    nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+                options: {
+                    noEmit: data.options.noEmit,
+                    allowJs: data.options.allowJs,
+                    resolveJsonModule: data.options.resolveJsonModule,
+                    emitDeclarationOnly: data.options.emitDeclarationOnly,
+                    declarationMap: data.options.declarationMap,
                 },
+                raw,
                 extendedConfigFiles: data.extendedConfigFiles,
             },
             extendedFilesHash,

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

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

package/src/release/version-actions.js

@@ -62,7 +62,7 @@ class JsVersionActions extends release_1.VersionActions {
             // 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}`, {
-                    windowsHide: false,
+                    windowsHide: true,
                 }, (error, stdout, stderr) => {
                     if (error) {
                         return reject(error);

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, windowsHide: false }, (error, stdout, stderr) => {
+        (0, child_process_1.exec)(command, { cwd, windowsHide: true }, (error, stdout, stderr) => {
             if (error) {
                 return reject((stderr ? `${stderr}\n` : '') + error);
             }

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

@@ -60,7 +60,7 @@ async function compileSwc(context, normalizedOptions, postCompilationCallback) {
         const swcCmdLog = (0, node_child_process_1.execSync)(getSwcCmd(normalizedOptions), {
             encoding: 'utf8',
             cwd: normalizedOptions.swcCliOptions.swcCwd,
-            windowsHide: false,
+            windowsHide: true,
             stdio: 'pipe',
         });
         devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
@@ -109,7 +109,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: false,
+            windowsHide: true,
         });
         processOnExit = () => {
             swcWatcher.kill();