nx 20.1.0-beta.3 → 20.1.0-beta.5

package/src/project-graph/plugins/internal-api.d.ts

@@ -18,9 +18,5 @@ export type CreateNodesResultWithContext = CreateNodesResult & {
     file: string;
     pluginName: string;
 };
-export declare const nxPluginCache: Map<unknown, [
-    Promise<LoadedNxPlugin>,
-    () => void
-]>;
 export declare function loadNxPlugins(plugins: PluginConfiguration[], root?: string): Promise<readonly [LoadedNxPlugin[], () => void]>;
 export declare function getDefaultPlugins(root: string): Promise<string[]>;

package/src/project-graph/plugins/internal-api.js

@@ -2,7 +2,7 @@
 // This file contains the bits and bobs of the internal API for loading and interacting with Nx plugins.
 // For the public API, used by plugin authors, see `./public-api.ts`.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxPluginCache = exports.LoadedNxPlugin = void 0;
+exports.LoadedNxPlugin = void 0;
 exports.loadNxPlugins = loadNxPlugins;
 exports.getDefaultPlugins = getDefaultPlugins;
 const path_1 = require("path");
@@ -65,11 +65,6 @@ class LoadedNxPlugin {
     }
 }
 exports.LoadedNxPlugin = LoadedNxPlugin;
-// Short lived cache (cleared between cmd runs)
-// holding resolved nx plugin objects.
-// Allows loaded plugins to not be reloaded when
-// referenced multiple times.
-exports.nxPluginCache = new Map();
 function isIsolationEnabled() {
     // Explicitly enabled, regardless of further conditions
     if (process.env.NX_ISOLATE_PLUGINS === 'true') {

package/src/project-graph/plugins/isolation/messaging.d.ts

@@ -86,11 +86,7 @@ export interface PluginCreateMetadataResult {
         tx: string;
     };
 }
-export interface PluginWorkerShutdownMessage {
-    type: 'shutdown';
-    payload: {};
-}
-export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerShutdownMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginCreateMetadataMessage;
+export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginCreateMetadataMessage;
 export type PluginWorkerResult = PluginWorkerLoadResult | PluginWorkerCreateNodesResult | PluginCreateDependenciesResult | PluginCreateMetadataResult;
 export declare function isPluginWorkerMessage(message: Serializable): message is PluginWorkerMessage;
 export declare function isPluginWorkerResult(message: Serializable): message is PluginWorkerResult;

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -4,12 +4,8 @@ exports.loadRemoteNxPlugin = loadRemoteNxPlugin;
 const child_process_1 = require("child_process");
 const path = require("path");
 const net_1 = require("net");
-// TODO (@AgentEnder): After scoped verbose logging is implemented, re-add verbose logs here.
-// import { logger } from '../../utils/logger';
-const internal_api_1 = require("../internal-api");
 const socket_utils_1 = require("../../../daemon/socket-utils");
 const consume_messages_from_socket_1 = require("../../../utils/consume-messages-from-socket");
-const exit_codes_1 = require("../../../utils/exit-codes");
 const messaging_1 = require("./messaging");
 const cleanupFunctions = new Set();
 const pluginNames = new Map();
@@ -29,7 +25,6 @@ async function loadRemoteNxPlugin(plugin, root) {
     const exitHandler = createWorkerExitHandler(worker, pendingPromises);
     const cleanupFunction = () => {
         worker.off('exit', exitHandler);
-        shutdownPluginWorker(socket);
         socket.destroy();
         nxPluginWorkerCache.delete(cacheKey);
     };
@@ -55,9 +50,6 @@ async function loadRemoteNxPlugin(plugin, root) {
     nxPluginWorkerCache.set(cacheKey, pluginPromise);
     return [pluginPromise, cleanupFunction];
 }
-function shutdownPluginWorker(socket) {
-    (0, messaging_1.sendMessageOverSocket)(socket, { type: 'shutdown', payload: {} });
-}
 /**
  * Creates a message handler for the given worker.
  * @param worker Instance of plugin-worker
@@ -172,20 +164,6 @@ function createWorkerExitHandler(worker, pendingPromises) {
         }
     };
 }
-let cleanedUp = false;
-const exitHandler = () => {
-    internal_api_1.nxPluginCache.clear();
-    for (const fn of cleanupFunctions) {
-        fn();
-    }
-    cleanedUp = true;
-};
-process.on('exit', exitHandler);
-process.on('SIGINT', () => {
-    exitHandler();
-    process.exit((0, exit_codes_1.signalToCode)('SIGINT'));
-});
-process.on('SIGTERM', exitHandler);
 function registerPendingPromise(tx, pending, callback, context) {
     let resolver, rejector, timeout;
     const promise = new Promise((res, rej) => {

package/src/project-graph/plugins/isolation/plugin-worker.js

@@ -49,21 +49,6 @@ const server = (0, net_1.createServer)((socket) => {
                     };
                 }
             },
-            shutdown: async () => {
-                // Stops accepting new connections, but existing connections are
-                // not closed immediately.
-                server.close(() => {
-                    try {
-                        (0, fs_1.unlinkSync)(socketPath);
-                    }
-                    catch (e) { }
-                    process.exit(0);
-                });
-                // Closes existing connection.
-                socket.end();
-                // Destroys the socket once it's fully closed.
-                socket.destroySoon();
-            },
             createNodes: async ({ configFiles, context, tx }) => {
                 try {
                     const result = await plugin.createNodes[1](configFiles, context);
@@ -123,6 +108,22 @@ const server = (0, net_1.createServer)((socket) => {
             },
         });
     }));
+    // There should only ever be one host -> worker connection
+    // since the worker is spawned per host process. As such,
+    // we can safely close the worker when the host disconnects.
+    socket.on('end', () => {
+        // Stops accepting new connections, but existing connections are
+        // not closed immediately.
+        server.close(() => {
+            try {
+                (0, fs_1.unlinkSync)(socketPath);
+            }
+            catch (e) { }
+            process.exit(0);
+        });
+        // Destroys the socket once it's fully closed.
+        socket.destroySoon();
+    });
 });
 server.listen(socketPath);
 const exitHandler = (exitCode) => () => {

package/src/utils/assert-workspace-validity.js

@@ -75,6 +75,10 @@ function detectAndSetInvalidProjectGlobValues(map, sourceName, desiredImplicitDe
         const projectName = implicit.startsWith('!')
             ? implicit.substring(1)
             : implicit;
+        // Do not error on cross-workspace implicit dependency references
+        if (projectName.startsWith('nx-cloud:')) {
+            return false;
+        }
         return !(projectConfigurations[projectName] ||
             (0, find_matching_projects_1.findMatchingProjects)([implicit], projects).length);
     });

package/src/utils/find-matching-projects.js

@@ -33,7 +33,8 @@ function findMatchingProjects(patterns = [], projects) {
         patterns.unshift('*');
     }
     for (const stringPattern of patterns) {
-        if (!stringPattern.length) {
+        // Do not waste time attempting to look up cross-workspace references which will never match
+        if (!stringPattern.length || stringPattern.startsWith('nx-cloud:')) {
             continue;
         }
         const pattern = parseStringPattern(stringPattern, projects);