nx 16.8.0-beta.3 → 16.8.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.8.0-beta.3",
+  "version": "16.8.0-beta.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.8.0-beta.3",
+    "@nrwl/tao": "16.8.0-beta.4",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.8.0-beta.3",
-    "@nx/nx-darwin-x64": "16.8.0-beta.3",
-    "@nx/nx-freebsd-x64": "16.8.0-beta.3",
-    "@nx/nx-linux-arm-gnueabihf": "16.8.0-beta.3",
-    "@nx/nx-linux-arm64-gnu": "16.8.0-beta.3",
-    "@nx/nx-linux-arm64-musl": "16.8.0-beta.3",
-    "@nx/nx-linux-x64-gnu": "16.8.0-beta.3",
-    "@nx/nx-linux-x64-musl": "16.8.0-beta.3",
-    "@nx/nx-win32-arm64-msvc": "16.8.0-beta.3",
-    "@nx/nx-win32-x64-msvc": "16.8.0-beta.3"
+    "@nx/nx-darwin-arm64": "16.8.0-beta.4",
+    "@nx/nx-darwin-x64": "16.8.0-beta.4",
+    "@nx/nx-freebsd-x64": "16.8.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "16.8.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "16.8.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "16.8.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "16.8.0-beta.4",
+    "@nx/nx-linux-x64-musl": "16.8.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "16.8.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "16.8.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -178,5 +178,5 @@
   },
   "main": "./bin/nx.js",
   "type": "commonjs",
-  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
+  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
 }

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

@@ -230,7 +230,7 @@ function generate(cwd, args) {
                 logger_1.logger.warn([
                     `${logger_1.NX_PREFIX}: ${opts.collectionName}:${normalizedGeneratorName} is deprecated`,
                     `${deprecated}`,
-                ].join('/n'));
+                ].join('\n'));
             }
             if (!opts.quiet && !opts.help) {
                 logger_1.logger.info(`NX Generating ${opts.collectionName}:${normalizedGeneratorName}`);

package/src/command-line/watch/watch.d.ts

@@ -1,3 +1,4 @@
+import { ChangedFile } from '../../daemon/client/client';
 export interface WatchArguments {
     projects?: string[];
     all?: boolean;
@@ -8,4 +9,15 @@ export interface WatchArguments {
     projectNameEnvName?: string;
     fileChangesEnvName?: string;
 }
+export declare class BatchFunctionRunner {
+    private callback;
+    private running;
+    private pendingProjects;
+    private pendingFiles;
+    protected get _verbose(): boolean;
+    private get hasPending();
+    constructor(callback: (projects: Set<string>, files: Set<string>) => Promise<unknown>);
+    enqueue(projectNames: string[], fileChanges: ChangedFile[]): Promise<void>;
+    private process;
+}
 export declare function watch(args: WatchArguments): Promise<void>;

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

@@ -1,23 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.watch = void 0;
+exports.watch = exports.BatchFunctionRunner = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const client_1 = require("../../daemon/client/client");
 const output_1 = require("../../utils/output");
 const DEFAULT_PROJECT_NAME_ENV = 'NX_PROJECT_NAME';
 const DEFAULT_FILE_CHANGES_ENV = 'NX_FILE_CHANGES';
-class BatchCommandRunner {
+class BatchFunctionRunner {
     get _verbose() {
         return process.env.NX_VERBOSE_LOGGING === 'true';
     }
     get hasPending() {
         return this.pendingProjects.size > 0 || this.pendingFiles.size > 0;
     }
-    constructor(command, projectNameEnv = DEFAULT_PROJECT_NAME_ENV, fileChangesEnv = DEFAULT_FILE_CHANGES_ENV) {
-        this.command = command;
-        this.projectNameEnv = projectNameEnv;
-        this.fileChangesEnv = fileChangesEnv;
+    constructor(callback) {
+        this.callback = callback;
         this.running = false;
         this.pendingProjects = new Set();
         this.pendingFiles = new Set();
@@ -35,50 +33,62 @@ class BatchCommandRunner {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.running && this.hasPending) {
                 this.running = true;
-                // process all pending commands together
-                const envs = this.createCommandEnvironments();
-                this._verbose &&
-                    output_1.output.logSingleLine('about to run commands with these environments: ' +
-                        JSON.stringify(envs));
-                return this.run(envs).then(() => {
+                // Clone the pending projects and files before clearing
+                const projects = new Set(this.pendingProjects);
+                const files = new Set(this.pendingFiles);
+                // Clear the pending projects and files
+                this.pendingProjects.clear();
+                this.pendingFiles.clear();
+                return this.callback(projects, files).then(() => {
                     this.running = false;
-                    this._verbose &&
-                        output_1.output.logSingleLine('running complete, processing the next batch');
                     this.process();
                 });
             }
             else {
                 this._verbose &&
                     this.running &&
-                    output_1.output.logSingleLine('waiting for commands to finish executing');
+                    output_1.output.logSingleLine('waiting for function to finish executing');
                 this._verbose &&
                     !this.hasPending &&
-                    output_1.output.logSingleLine('no more commands to process');
+                    output_1.output.logSingleLine('no more function to process');
             }
         });
     }
-    createCommandEnvironments() {
+}
+exports.BatchFunctionRunner = BatchFunctionRunner;
+class BatchCommandRunner extends BatchFunctionRunner {
+    constructor(command, projectNameEnv = DEFAULT_PROJECT_NAME_ENV, fileChangesEnv = DEFAULT_FILE_CHANGES_ENV) {
+        super((projects, files) => {
+            // process all pending commands together
+            const envs = this.createCommandEnvironments(projects, files);
+            return this.run(envs);
+        });
+        this.command = command;
+        this.projectNameEnv = projectNameEnv;
+        this.fileChangesEnv = fileChangesEnv;
+    }
+    createCommandEnvironments(projects, files) {
         const commandsToRun = [];
-        if (this.pendingProjects.size > 0) {
-            this.pendingProjects.forEach((projectName) => {
+        if (projects.size > 0) {
+            projects.forEach((projectName) => {
                 commandsToRun.push({
                     [this.projectNameEnv]: projectName,
-                    [this.fileChangesEnv]: Array.from(this.pendingFiles).join(' '),
+                    [this.fileChangesEnv]: Array.from(files).join(' '),
                 });
             });
         }
         else {
             commandsToRun.push({
                 [this.projectNameEnv]: '',
-                [this.fileChangesEnv]: Array.from(this.pendingFiles).join(' '),
+                [this.fileChangesEnv]: Array.from(files).join(' '),
             });
         }
-        this.pendingProjects.clear();
-        this.pendingFiles.clear();
         return commandsToRun;
     }
     run(envs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this._verbose &&
+                output_1.output.logSingleLine('about to run commands with these environments: ' + JSON.stringify(envs));
             return Promise.all(envs.map((env) => {
                 return new Promise((resolve, reject) => {
                     const commandExec = (0, child_process_1.spawn)(this.command, {
@@ -94,7 +104,11 @@ class BatchCommandRunner {
                         resolve();
                     });
                 });
-            }));
+            })).then((r) => {
+                this._verbose &&
+                    output_1.output.logSingleLine('running complete, processing the next batch');
+                return r;
+            });
         });
     }
 }

package/src/config/nx-json.d.ts

@@ -17,6 +17,7 @@ export type TargetDependencies = Record<string, (TargetDependencyConfig | string
 export interface NrwlJsPluginConfig {
     analyzeSourceFiles?: boolean;
     analyzePackageJson?: boolean;
+    analyzeLockfile?: boolean;
 }
 interface NxInstallationConfiguration {
     /**