nx 19.8.1 → 19.8.3

package/.eslintrc.json

@@ -5,7 +5,15 @@
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "name": "fs-extra",
+            "message": "Please use equivalent utilities from `node:fs` instead."
+          }
+        ]
+      }
     },
     {
       "files": ["*.ts"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.8.1",
+  "version": "19.8.3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -49,7 +49,6 @@
     "figures": "3.2.0",
     "flat": "^5.0.2",
     "front-matter": "^4.0.2",
-    "fs-extra": "^11.1.0",
     "ignore": "^5.0.4",
     "jest-diff": "^29.4.1",
     "jsonc-parser": "3.2.0",
@@ -68,7 +67,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.8.1"
+    "@nrwl/tao": "19.8.3"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -83,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.8.1",
-    "@nx/nx-darwin-arm64": "19.8.1",
-    "@nx/nx-linux-x64-gnu": "19.8.1",
-    "@nx/nx-linux-x64-musl": "19.8.1",
-    "@nx/nx-win32-x64-msvc": "19.8.1",
-    "@nx/nx-linux-arm64-gnu": "19.8.1",
-    "@nx/nx-linux-arm64-musl": "19.8.1",
-    "@nx/nx-linux-arm-gnueabihf": "19.8.1",
-    "@nx/nx-win32-arm64-msvc": "19.8.1",
-    "@nx/nx-freebsd-x64": "19.8.1"
+    "@nx/nx-darwin-x64": "19.8.3",
+    "@nx/nx-darwin-arm64": "19.8.3",
+    "@nx/nx-linux-x64-gnu": "19.8.3",
+    "@nx/nx-linux-x64-musl": "19.8.3",
+    "@nx/nx-win32-x64-msvc": "19.8.3",
+    "@nx/nx-linux-arm64-gnu": "19.8.3",
+    "@nx/nx-linux-arm64-musl": "19.8.3",
+    "@nx/nx-linux-arm-gnueabihf": "19.8.3",
+    "@nx/nx-win32-arm64-msvc": "19.8.3",
+    "@nx/nx-freebsd-x64": "19.8.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/graph/graph.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateGraph = generateGraph;
 const crypto_1 = require("crypto");
 const node_child_process_1 = require("node:child_process");
-const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const http = require("http");
 const minimatch_1 = require("minimatch");
 const node_url_1 = require("node:url");
@@ -225,7 +224,7 @@ async function generateGraph(args, affectedProjects) {
             process.exit(1);
         }
     }
-    let html = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../core/graph/index.html'), 'utf-8');
+    let html = (0, node_fs_1.readFileSync)((0, path_1.join)(__dirname, '../../core/graph/index.html'), 'utf-8');
     prunedGraph = filterGraph(prunedGraph, args.focus || null, args.exclude || []);
     if (args.file) {
         // stdout is a magical constant that doesn't actually write a file
@@ -243,7 +242,7 @@ async function generateGraph(args, affectedProjects) {
         if (ext === '.html') {
             const assetsFolder = (0, path_1.join)(fileFolderPath, 'static');
             const assets = [];
-            (0, fs_extra_1.copySync)((0, path_1.join)(__dirname, '../../core/graph'), assetsFolder, {
+            (0, node_fs_1.cpSync)((0, path_1.join)(__dirname, '../../core/graph'), assetsFolder, {
                 filter: (_src, dest) => {
                     const isntHtml = !/index\.html/.test(dest);
                     if (isntHtml && dest.includes('.')) {
@@ -251,6 +250,7 @@ async function generateGraph(args, affectedProjects) {
                     }
                     return isntHtml;
                 },
+                recursive: true,
             });
             const { projectGraphClientResponse } = await createProjectGraphAndSourceMapClientResponse(affectedProjects);
             const taskGraphClientResponse = await createTaskGraphClientResponse();
@@ -260,15 +260,15 @@ async function generateGraph(args, affectedProjects) {
             html = html.replace(/href="styles/g, 'href="static/styles');
             html = html.replace(/<base href="\/".*>/g, '');
             html = html.replace(/type="module"/g, '');
-            (0, fs_1.writeFileSync)(fullFilePath, html);
-            (0, fs_1.writeFileSync)((0, path_1.join)(assetsFolder, 'environment.js'), environmentJs);
+            (0, node_fs_1.writeFileSync)(fullFilePath, html);
+            (0, node_fs_1.writeFileSync)((0, path_1.join)(assetsFolder, 'environment.js'), environmentJs);
             output_1.output.success({
                 title: `HTML output created in ${fileFolderPath}`,
                 bodyLines: [fileFolderPath, ...assets],
             });
         }
         else if (ext === '.json') {
-            (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(fullFilePath));
+            (0, node_fs_1.mkdirSync)((0, path_1.dirname)(fullFilePath), { recursive: true });
             const json = await createJsonOutput(prunedGraph, rawGraph, args.projects, args.targets);
             (0, fileutils_1.writeJsonFile)(fullFilePath, json);
             output_1.output.success({
@@ -394,13 +394,13 @@ async function startServer(html, environmentJs, host, port = 4211, watchForChang
         }
         let pathname = (0, path_1.join)(__dirname, '../../core/graph/', sanitizePath);
         // if the file is not found or is a directory, return index.html
-        if (!(0, fs_1.existsSync)(pathname) || (0, fs_1.statSync)(pathname).isDirectory()) {
+        if (!(0, node_fs_1.existsSync)(pathname) || (0, node_fs_1.statSync)(pathname).isDirectory()) {
             res.writeHead(200, { 'Content-Type': 'text/html' });
             res.end(html);
             return;
         }
         try {
-            const data = (0, fs_1.readFileSync)(pathname);
+            const data = (0, node_fs_1.readFileSync)(pathname);
             const ext = (0, path_1.parse)(pathname).ext;
             res.setHeader('Content-type', mimeType[ext] || 'text/plain');
             res.end(data);

package/src/command-line/import/utils/prepare-source-repo.js

@@ -6,15 +6,20 @@ const path_1 = require("path");
 async function prepareSourceRepo(gitClient, ref, source, relativeDestination, tempImportBranch, sourceRemoteUrl) {
     const spinner = createSpinner().start(`Fetching ${ref} from ${sourceRemoteUrl}`);
     const relativeSourceDir = (0, path_1.relative)(gitClient.root, (0, path_1.join)(gitClient.root, source));
+    const message = relativeSourceDir.trim()
+        ? `Filtering git history to only include files in ${relativeSourceDir}`
+        : `Filtering git history`;
     if (await gitClient.hasFilterRepoInstalled()) {
-        spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
+        spinner.start(message);
         await gitClient.filterRepo(relativeSourceDir, relativeDestination);
     }
     else {
-        spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
+        spinner.start(`${message} (this might take a few minutes -- install git-filter-repo for faster performance)`);
         await gitClient.filterBranch(relativeSourceDir, relativeDestination, tempImportBranch);
     }
-    spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
+    spinner.succeed(relativeSourceDir.trim()
+        ? `Filtered git history to only include files in ${relativeSourceDir}`
+        : `Filtered git history`);
     spinner.succeed(`${sourceRemoteUrl} has been prepared to be imported into this workspace on a temporary branch: ${tempImportBranch} in ${gitClient.root}`);
 }
 function wait(ms) {

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNxToNest = addNxToNest;
 const enquirer = require("enquirer");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
@@ -214,7 +214,7 @@ function getJestOptions(isE2E, repoRoot, packageName, existingOptions) {
 function tryCreateJestPreset(repoRoot) {
     const jestPresetPath = (0, path_1.join)(repoRoot, 'jest.preset.js');
     if (!(0, fileutils_1.fileExists)(jestPresetPath)) {
-        (0, fs_extra_1.writeFileSync)(jestPresetPath, `
+        (0, node_fs_1.writeFileSync)(jestPresetPath, `
 const nxPreset = require('@nx/jest/preset').default;
 module.exports = {...nxPreset};
 `, 'utf8');
@@ -231,8 +231,8 @@ function addJestTargets(repoRoot, packageName, projectJson, packageJson) {
     if (isPresetCreated) {
         unitTestOptions['preset'] = e2eTestOptions['preset'] = './jest.preset.js';
     }
-    (0, fs_extra_1.writeFileSync)(unitTestConfigPath, `export default ${JSON.stringify(unitTestOptions, null, 2)}`, 'utf8');
-    (0, fs_extra_1.writeFileSync)(e2eTestConfigPath, `export default ${JSON.stringify(e2eTestOptions, null, 2)}`, 'utf8');
+    (0, node_fs_1.writeFileSync)(unitTestConfigPath, `export default ${JSON.stringify(unitTestOptions, null, 2)}`, 'utf8');
+    (0, node_fs_1.writeFileSync)(e2eTestConfigPath, `export default ${JSON.stringify(e2eTestOptions, null, 2)}`, 'utf8');
     projectJson.targets['test'] = {
         executor: '@nx/jest:jest',
         outputs: [`{workspaceRoot}/coverage/${packageName}`],
@@ -312,7 +312,7 @@ function updateTsConfig(repoRoot, sourceRoot) {
 }
 function removeFile(repoRoot, file) {
     const path = (0, path_1.join)(repoRoot, file);
-    (0, fs_extra_1.unlinkSync)(path);
+    (0, node_fs_1.unlinkSync)(path);
 }
 function mergeWithDefaultConfig(config) {
     const defaultNestCliConfigurations = {

package/src/command-line/init/implementation/react/clean-up-files.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanUpFiles = cleanUpFiles;
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const fileutils_1 = require("../../../../utils/fileutils");
 function cleanUpFiles(appName, isStandalone) {
     // Delete targets from project since we delegate to npm scripts.
@@ -19,12 +19,12 @@ function cleanUpFiles(appName, isStandalone) {
         }
     }
     (0, fileutils_1.writeJsonFile)(projectJsonPath, json);
-    (0, fs_extra_1.removeSync)('temp-workspace');
+    (0, node_fs_1.rmSync)('temp-workspace', { recursive: true, force: true });
     if (isStandalone) {
-        (0, fs_extra_1.removeSync)('babel.config.json');
-        (0, fs_extra_1.removeSync)('jest.preset.js');
-        (0, fs_extra_1.removeSync)('jest.config.ts');
-        (0, fs_extra_1.removeSync)('libs');
-        (0, fs_extra_1.removeSync)('tools');
+        (0, node_fs_1.rmSync)('babel.config.json', { recursive: true, force: true });
+        (0, node_fs_1.rmSync)('jest.preset.js', { recursive: true, force: true });
+        (0, node_fs_1.rmSync)('jest.config.ts', { recursive: true, force: true });
+        (0, node_fs_1.rmSync)('libs', { recursive: true, force: true });
+        (0, node_fs_1.rmSync)('tools', { recursive: true, force: true });
     }
 }

package/src/command-line/init/implementation/react/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNxToCraRepo = addNxToCraRepo;
 const child_process_1 = require("child_process");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const fileutils_1 = require("../../../../utils/fileutils");
 const output_1 = require("../../../../utils/output");
@@ -116,13 +116,16 @@ async function reorgnizeWorkspaceStructure(options) {
     }
 }
 function createTempWorkspace(options) {
-    (0, fs_extra_1.removeSync)('temp-workspace');
+    (0, node_fs_1.rmSync)('temp-workspace', { recursive: true, force: true });
     (0, child_process_1.execSync)(`npx ${options.npxYesFlagNeeded ? '-y' : ''} create-nx-workspace@latest temp-workspace --appName=${options.reactAppName} --preset=react-monorepo --style=css --bundler=${options.isVite ? 'vite' : 'webpack'} --packageManager=${options.packageManager} ${options.nxCloud ? '--nxCloud=yes' : '--nxCloud=skip'} ${options.addE2e ? '--e2eTestRunner=playwright' : '--e2eTestRunner=none'}`, { stdio: [0, 1, 2], windowsHide: true });
     output_1.output.log({ title: '👋 Welcome to Nx!' });
     output_1.output.log({ title: '🧹 Clearing unused files' });
-    (0, fs_extra_1.copySync)((0, path_1.join)('temp-workspace', 'apps', options.reactAppName, 'project.json'), 'project.json');
-    (0, fs_extra_1.removeSync)((0, path_1.join)('temp-workspace', 'apps', options.reactAppName));
-    (0, fs_extra_1.removeSync)('node_modules');
+    (0, node_fs_1.cpSync)((0, path_1.join)('temp-workspace', 'apps', options.reactAppName, 'project.json'), 'project.json', { recursive: true });
+    (0, node_fs_1.rmSync)((0, path_1.join)('temp-workspace', 'apps', options.reactAppName), {
+        recursive: true,
+        force: true,
+    });
+    (0, node_fs_1.rmSync)('node_modules', { recursive: true, force: true });
 }
 function copyPackageJsonDepsFromTempWorkspace() {
     const repoRoot = process.cwd();
@@ -151,6 +154,12 @@ function overridePackageDeps(depConfigName, base, override) {
     });
     return base;
 }
+function moveSync(src, dest) {
+    const destParentDir = (0, path_1.dirname)(dest);
+    (0, node_fs_1.mkdirSync)(destParentDir, { recursive: true });
+    (0, node_fs_1.rmSync)(dest, { recursive: true, force: true });
+    return (0, node_fs_1.renameSync)(src, dest);
+}
 function moveFilesToTempWorkspace(options) {
     output_1.output.log({ title: '🚚 Moving your React app in your new Nx workspace' });
     copyPackageJsonDepsFromTempWorkspace();
@@ -169,11 +178,9 @@ function moveFilesToTempWorkspace(options) {
     const filesToMove = [...requiredCraFiles, ...optionalCraFiles].filter(Boolean);
     filesToMove.forEach((f) => {
         try {
-            (0, fs_extra_1.moveSync)(f, options.isStandalone
+            moveSync(f, options.isStandalone
                 ? (0, path_1.join)('temp-workspace', f)
-                : (0, path_1.join)('temp-workspace', 'apps', options.reactAppName, f), {
-                overwrite: true,
-            });
+                : (0, path_1.join)('temp-workspace', 'apps', options.reactAppName, f));
         }
         catch (error) {
             if (requiredCraFiles.includes(f)) {
@@ -208,8 +215,8 @@ async function addBundler(options) {
 }
 function copyFromTempWorkspaceToRoot() {
     output_1.output.log({ title: '🚚 Folder restructuring.' });
-    (0, fs_extra_1.readdirSync)('temp-workspace').forEach((f) => {
-        (0, fs_extra_1.moveSync)((0, path_1.join)('temp-workspace', f), f, { overwrite: true });
+    (0, node_fs_1.readdirSync)('temp-workspace').forEach((f) => {
+        moveSync((0, path_1.join)('temp-workspace', f), f);
     });
 }
 function cleanUpUnusedFilesAndAddConfigFiles(options) {
@@ -218,6 +225,6 @@ function cleanUpUnusedFilesAndAddConfigFiles(options) {
     output_1.output.log({ title: "📃 Extend the app's tsconfig.json from the base" });
     (0, tsconfig_setup_1.setupTsConfig)(options.reactAppName, options.isStandalone);
     if (options.isStandalone) {
-        (0, fs_extra_1.removeSync)('apps');
+        (0, node_fs_1.rmSync)('apps', { recursive: true, force: true });
     }
 }

package/src/command-line/init/implementation/react/rename-js-to-jsx.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renameJsToJsx = renameJsToJsx;
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const workspace_context_1 = require("../../../../utils/workspace-context");
 const fileutils_1 = require("../../../../utils/fileutils");
 // Vite cannot process JSX like <div> or <Header> unless the file is named .jsx or .tsx
@@ -11,11 +11,11 @@ async function renameJsToJsx(appName, isStandalone) {
     ]);
     files.forEach((file) => {
         if ((0, fileutils_1.fileExists)(file)) {
-            const content = (0, fs_extra_1.readFileSync)(file).toString();
+            const content = (0, node_fs_1.readFileSync)(file).toString();
             // Try to detect JSX before renaming to .jsx
             // Files like setupTests.js from CRA should not be renamed
             if (/<[a-zA-Z0-9]+/.test(content)) {
-                (0, fs_extra_1.renameSync)(file, `${file}x`);
+                (0, node_fs_1.renameSync)(file, `${file}x`);
             }
         }
     });

package/src/command-line/release/changelog.js

@@ -5,7 +5,6 @@ exports.createAPI = createAPI;
 exports.shouldCreateGitHubRelease = shouldCreateGitHubRelease;
 const chalk = require("chalk");
 const enquirer_1 = require("enquirer");
-const fs_extra_1 = require("fs-extra");
 const node_fs_1 = require("node:fs");
 const semver_1 = require("semver");
 const tmp_1 = require("tmp");
@@ -620,7 +619,7 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
             if (group.resolvedVersionPlans) {
                 group.resolvedVersionPlans.forEach((plan) => {
                     if (!args.dryRun) {
-                        (0, fs_extra_1.removeSync)(plan.absolutePath);
+                        (0, node_fs_1.rmSync)(plan.absolutePath, { recursive: true, force: true });
                         if (args.verbose) {
                             console.log(`Removing ${plan.relativePath}`);
                         }

package/src/command-line/release/config/version-plans.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readRawVersionPlans = readRawVersionPlans;
 exports.setResolvedVersionPlansOnGroups = setResolvedVersionPlansOnGroups;
 exports.getVersionPlansAbsolutePath = getVersionPlansAbsolutePath;
-const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
 const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const workspace_root_1 = require("../../../utils/workspace-root");
@@ -14,16 +14,15 @@ const fm = require('front-matter');
 const versionPlansDirectory = (0, path_1.join)('.nx', 'version-plans');
 async function readRawVersionPlans() {
     const versionPlansPath = getVersionPlansAbsolutePath();
-    const versionPlansPathExists = await (0, fs_extra_1.pathExists)(versionPlansPath);
-    if (!versionPlansPathExists) {
+    if (!(0, node_fs_1.existsSync)(versionPlansPath)) {
         return [];
     }
     const versionPlans = [];
-    const versionPlanFiles = (0, fs_1.readdirSync)(versionPlansPath);
+    const versionPlanFiles = (0, node_fs_1.readdirSync)(versionPlansPath);
     for (const versionPlanFile of versionPlanFiles) {
         const filePath = (0, path_1.join)(versionPlansPath, versionPlanFile);
-        const versionPlanContent = (0, fs_1.readFileSync)(filePath).toString();
-        const versionPlanStats = await (0, fs_extra_1.stat)(filePath);
+        const versionPlanContent = (0, node_fs_1.readFileSync)(filePath).toString();
+        const versionPlanStats = await (0, promises_1.stat)(filePath);
         const parsedContent = fm(versionPlanContent);
         versionPlans.push({
             absolutePath: filePath,

package/src/command-line/release/plan.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.releasePlanCLIHandler = void 0;
 exports.createAPI = createAPI;
 const enquirer_1 = require("enquirer");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const semver_1 = require("semver");
 const tmp_1 = require("tmp");
@@ -193,8 +194,8 @@ async function createVersionPlanFileForBumps(args, versionPlanBumps) {
         output_1.output.logSingleLine(`Creating version plan file "${versionPlanFileName}"`);
         (0, print_changes_1.printDiff)('', versionPlanFileContent, 1);
         const versionPlansAbsolutePath = (0, version_plans_1.getVersionPlansAbsolutePath)();
-        await (0, fs_extra_1.ensureDir)(versionPlansAbsolutePath);
-        await (0, fs_extra_1.writeFile)((0, node_path_1.join)(versionPlansAbsolutePath, versionPlanFileName), versionPlanFileContent);
+        await (0, promises_1.mkdir)(versionPlansAbsolutePath, { recursive: true });
+        await (0, promises_1.writeFile)((0, node_path_1.join)(versionPlansAbsolutePath, versionPlanFileName), versionPlanFileContent);
     }
 }
 async function promptForVersion(message) {
@@ -236,9 +237,9 @@ async function _promptForMessage(versionPlanName) {
         if (!message.length) {
             const tmpDir = (0, tmp_1.dirSync)().name;
             const messageFilePath = (0, node_path_1.join)(tmpDir, `DRAFT_MESSAGE__${versionPlanName}.md`);
-            (0, fs_extra_1.writeFileSync)(messageFilePath, '');
+            (0, node_fs_1.writeFileSync)(messageFilePath, '');
             await (0, launch_editor_1.launchEditor)(messageFilePath);
-            message = (0, fs_extra_1.readFileSync)(messageFilePath, 'utf-8');
+            message = (0, node_fs_1.readFileSync)(messageFilePath, 'utf-8');
         }
         message = message.trim();
         if (!message) {

package/src/command-line/release/release.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseCLIHandler = void 0;
 exports.createAPI = createAPI;
 const enquirer_1 = require("enquirer");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const nx_json_1 = require("../../config/nx-json");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
@@ -106,7 +106,7 @@ function createAPI(overrideReleaseConfig) {
                 }
                 group.resolvedVersionPlans.forEach((plan) => {
                     if (!args.dryRun) {
-                        (0, fs_extra_1.removeSync)(plan.absolutePath);
+                        (0, node_fs_1.rmSync)(plan.absolutePath, { recursive: true, force: true });
                         if (args.verbose) {
                             console.log(`Removing ${plan.relativePath}`);
                         }

package/src/command-line/reset/reset.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetHandler = resetHandler;
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const client_1 = require("../../daemon/client/client");
 const cache_directory_1 = require("../../utils/cache-directory");
 const output_1 = require("../../utils/output");
@@ -37,16 +37,16 @@ async function resetHandler(args) {
         try {
             await killDaemon();
         }
-        catch {
-            errors.push('Failed to stop the Nx Daemon.');
+        catch (e) {
+            errors.push('Failed to stop the Nx Daemon.', e.toString());
         }
     }
     if (all || args.onlyCache) {
         try {
             await cleanupCacheEntries();
         }
-        catch {
-            errors.push('Failed to clean up the cache directory.');
+        catch (e) {
+            errors.push('Failed to clean up the cache directory.', e.toString());
         }
     }
     if (all || args.onlyWorkspaceData) {
@@ -59,12 +59,17 @@ async function resetHandler(args) {
         try {
             await cleanupWorkspaceData();
         }
-        catch {
-            errors.push('Failed to clean up the workspace data directory.');
+        catch (e) {
+            errors.push('Failed to clean up the workspace data directory.', e.toString());
         }
     }
     if (all || args.onlyCloud) {
-        await resetCloudClient();
+        try {
+            await resetCloudClient();
+        }
+        catch (e) {
+            errors.push('Failed to reset the Nx Cloud client.', e.toString());
+        }
     }
     if (errors.length > 0) {
         output_1.output.error({
@@ -79,8 +84,10 @@ async function resetHandler(args) {
         });
     }
 }
-function killDaemon() {
-    return client_1.daemonClient.stop();
+async function killDaemon() {
+    if (client_1.daemonClient.enabled()) {
+        return client_1.daemonClient.stop();
+    }
 }
 async function resetCloudClient() {
     // Remove nx cloud marker files. This helps if the use happens to run `nx-cloud start-ci-run` or
@@ -92,17 +99,17 @@ async function resetCloudClient() {
 }
 function cleanupCacheEntries() {
     return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
-        (0, fs_extra_1.rmSync)(cache_directory_1.cacheDir, { recursive: true, force: true });
+        (0, node_fs_1.rmSync)(cache_directory_1.cacheDir, { recursive: true, force: true });
     });
 }
 function cleanupNativeFileCache() {
     return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
-        (0, fs_extra_1.rmSync)((0, native_file_cache_location_1.getNativeFileCacheLocation)(), { recursive: true, force: true });
+        (0, node_fs_1.rmSync)((0, native_file_cache_location_1.getNativeFileCacheLocation)(), { recursive: true, force: true });
     });
 }
 function cleanupWorkspaceData() {
     return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
-        (0, fs_extra_1.rmSync)(cache_directory_1.workspaceDataDirectory, { recursive: true, force: true });
+        (0, node_fs_1.rmSync)(cache_directory_1.workspaceDataDirectory, { recursive: true, force: true });
     });
 }
 async function incrementalBackoff(ms, maxDuration, callback) {