nx 19.8.1 → 19.8.3

package/src/tasks-runner/tasks-schedule.d.ts

@@ -19,6 +19,7 @@ export declare class TasksSchedule {
     private completedTasks;
     private scheduleRequestsExecutionChain;
     private estimatedTaskTimings;
+    private projectDependencies;
     constructor(projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions);
     init(): Promise<void>;
     scheduleNextTasks(): Promise<void>;

package/src/tasks-runner/tasks-schedule.js

@@ -20,12 +20,16 @@ class TasksSchedule {
         this.completedTasks = new Set();
         this.scheduleRequestsExecutionChain = Promise.resolve();
         this.estimatedTaskTimings = {};
+        this.projectDependencies = {};
     }
     async init() {
         if (this.taskHistory) {
             this.estimatedTaskTimings =
                 await this.taskHistory.getEstimatedTaskTimings(Object.values(this.taskGraph.tasks).map((t) => t.target));
         }
+        for (const project of Object.values(this.taskGraph.tasks).map((t) => t.target.project)) {
+            this.projectDependencies[project] ??= (0, project_graph_utils_1.findAllProjectNodeDependencies)(project, this.reverseProjectGraph).length;
+        }
     }
     async scheduleNextTasks() {
         this.scheduleRequestsExecutionChain =
@@ -90,8 +94,8 @@ class TasksSchedule {
             // Most likely tasks with no dependencies such as test
             const project1 = this.taskGraph.tasks[taskId1].target.project;
             const project2 = this.taskGraph.tasks[taskId2].target.project;
-            const project1NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project1, this.reverseProjectGraph).length;
-            const project2NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project2, this.reverseProjectGraph).length;
+            const project1NodeDependencies = this.projectDependencies[project1];
+            const project2NodeDependencies = this.projectDependencies[project2];
             const dependenciesDiff = project2NodeDependencies - project1NodeDependencies;
             if (dependenciesDiff !== 0) {
                 return dependenciesDiff;

package/src/utils/fileutils.d.ts

@@ -1,5 +1,5 @@
 import type { JsonParseOptions, JsonSerializeOptions } from './json';
-import { PathLike } from 'fs';
+import { PathLike } from 'node:fs';
 export interface JsonReadOptions extends JsonParseOptions {
     /**
      * mutable field recording whether JSON ends with new line
@@ -43,6 +43,14 @@ export declare function readYamlFile<T extends object = any>(path: string, optio
  * @param options JSON serialize options
  */
 export declare function writeJsonFile<T extends object = object>(path: string, data: T, options?: JsonWriteOptions): void;
+/**
+ * Serializes the given data to JSON and writes it to a file asynchronously.
+ *
+ * @param path A path to a file.
+ * @param data data which should be serialized to JSON and written to the file
+ * @param options JSON serialize options
+ */
+export declare function writeJsonFileAsync<T extends object = object>(path: string, data: T, options?: JsonWriteOptions): Promise<void>;
 /**
  * Check if a directory exists
  * @param path Path to directory

package/src/utils/fileutils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readJsonFile = readJsonFile;
 exports.readYamlFile = readYamlFile;
 exports.writeJsonFile = writeJsonFile;
+exports.writeJsonFileAsync = writeJsonFileAsync;
 exports.directoryExists = directoryExists;
 exports.fileExists = fileExists;
 exports.createDirectory = createDirectory;
@@ -10,7 +11,8 @@ exports.isRelativePath = isRelativePath;
 exports.extractFileFromTarball = extractFileFromTarball;
 exports.readFileIfExisting = readFileIfExisting;
 const json_1 = require("./json");
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const path_1 = require("path");
 const tar = require("tar-stream");
 const zlib_1 = require("zlib");
@@ -22,7 +24,7 @@ const zlib_1 = require("zlib");
  * @returns Object the JSON content of the file represents
  */
 function readJsonFile(path, options) {
-    const content = (0, fs_1.readFileSync)(path, 'utf-8');
+    const content = (0, node_fs_1.readFileSync)(path, 'utf-8');
     if (options) {
         options.endsWithNewline = content.charCodeAt(content.length - 1) === 10;
     }
@@ -41,7 +43,7 @@ function readJsonFile(path, options) {
  * @returns
  */
 function readYamlFile(path, options) {
-    const content = (0, fs_1.readFileSync)(path, 'utf-8');
+    const content = (0, node_fs_1.readFileSync)(path, 'utf-8');
     const { load } = require('@zkochan/js-yaml');
     return load(content, { ...options, filename: path });
 }
@@ -53,12 +55,27 @@ function readYamlFile(path, options) {
  * @param options JSON serialize options
  */
 function writeJsonFile(path, data, options) {
-    (0, fs_1.mkdirSync)((0, path_1.dirname)(path), { recursive: true });
+    (0, node_fs_1.mkdirSync)((0, path_1.dirname)(path), { recursive: true });
     const serializedJson = (0, json_1.serializeJson)(data, options);
     const content = options?.appendNewLine
         ? `${serializedJson}\n`
         : serializedJson;
-    (0, fs_1.writeFileSync)(path, content, { encoding: 'utf-8' });
+    (0, node_fs_1.writeFileSync)(path, content, { encoding: 'utf-8' });
+}
+/**
+ * Serializes the given data to JSON and writes it to a file asynchronously.
+ *
+ * @param path A path to a file.
+ * @param data data which should be serialized to JSON and written to the file
+ * @param options JSON serialize options
+ */
+async function writeJsonFileAsync(path, data, options) {
+    await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true });
+    const serializedJson = (0, json_1.serializeJson)(data, options);
+    const content = options?.appendNewLine
+        ? `${serializedJson}\n`
+        : serializedJson;
+    await (0, promises_1.writeFile)(path, content, { encoding: 'utf-8' });
 }
 /**
  * Check if a directory exists
@@ -66,7 +83,7 @@ function writeJsonFile(path, data, options) {
  */
 function directoryExists(path) {
     try {
-        return (0, fs_1.statSync)(path).isDirectory();
+        return (0, node_fs_1.statSync)(path).isDirectory();
     }
     catch {
         return false;
@@ -78,14 +95,14 @@ function directoryExists(path) {
  */
 function fileExists(path) {
     try {
-        return (0, fs_1.statSync)(path).isFile();
+        return (0, node_fs_1.statSync)(path).isFile();
     }
     catch {
         return false;
     }
 }
 function createDirectory(path) {
-    (0, fs_1.mkdirSync)(path, { recursive: true });
+    (0, node_fs_1.mkdirSync)(path, { recursive: true });
 }
 function isRelativePath(path) {
     return (path === '.' ||
@@ -102,9 +119,9 @@ function isRelativePath(path) {
  */
 async function extractFileFromTarball(tarballPath, file, destinationFilePath) {
     return new Promise((resolve, reject) => {
-        (0, fs_1.mkdirSync)((0, path_1.dirname)(destinationFilePath), { recursive: true });
+        (0, node_fs_1.mkdirSync)((0, path_1.dirname)(destinationFilePath), { recursive: true });
         var tarExtractStream = tar.extract();
-        const destinationFileStream = (0, fs_1.createWriteStream)(destinationFilePath);
+        const destinationFileStream = (0, node_fs_1.createWriteStream)(destinationFilePath);
         let isFileExtracted = false;
         tarExtractStream.on('entry', function (header, stream, next) {
             if (header.name === file) {
@@ -126,9 +143,9 @@ async function extractFileFromTarball(tarballPath, file, destinationFilePath) {
                 reject();
             }
         });
-        (0, fs_1.createReadStream)(tarballPath).pipe((0, zlib_1.createGunzip)()).pipe(tarExtractStream);
+        (0, node_fs_1.createReadStream)(tarballPath).pipe((0, zlib_1.createGunzip)()).pipe(tarExtractStream);
     });
 }
 function readFileIfExisting(path) {
-    return (0, fs_1.existsSync)(path) ? (0, fs_1.readFileSync)(path, 'utf-8') : '';
+    return (0, node_fs_1.existsSync)(path) ? (0, node_fs_1.readFileSync)(path, 'utf-8') : '';
 }

package/src/utils/ignore.js

@@ -4,7 +4,7 @@ exports.ALWAYS_IGNORE = void 0;
 exports.getIgnoredGlobs = getIgnoredGlobs;
 exports.getAlwaysIgnore = getAlwaysIgnore;
 exports.getIgnoreObject = getIgnoreObject;
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const ignore_1 = require("ignore");
 const fileutils_1 = require("./fileutils");
 const path_1 = require("./path");
@@ -48,7 +48,7 @@ function getIgnoreObject(root = workspace_root_1.workspaceRoot) {
 function getIgnoredGlobsFromFile(file, root) {
     try {
         const results = [];
-        const contents = (0, fs_extra_1.readFileSync)(file, 'utf-8');
+        const contents = (0, node_fs_1.readFileSync)(file, 'utf-8');
         const lines = contents.split('\n');
         for (const line of lines) {
             const trimmed = line.trim();

package/src/utils/package-manager.js

@@ -15,7 +15,7 @@ exports.packageRegistryView = packageRegistryView;
 exports.packageRegistryPack = packageRegistryPack;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
+const promises_1 = require("node:fs/promises");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const tmp_1 = require("tmp");
@@ -301,7 +301,7 @@ function createTempNpmDirectory() {
     copyPackageManagerConfigurationFiles(workspace_root_1.workspaceRoot, dir);
     const cleanup = async () => {
         try {
-            await (0, fs_extra_1.remove)(dir);
+            await (0, promises_1.rm)(dir, { recursive: true, force: true });
         }
         catch {
             // It's okay if this fails, the OS will clean it up eventually

package/src/utils/plugins/output.js

@@ -47,7 +47,7 @@ function listAlsoAvailableCorePlugins(installedPlugins) {
     }
 }
 function listPowerpackPlugins() {
-    const powerpackLink = 'https://nx.dev/plugin-registry';
+    const powerpackLink = 'https://nx.dev/plugin-registry#powerpack';
     output_1.output.log({
         title: `Available Powerpack Plugins: ${powerpackLink}`,
     });