nx 20.2.0-beta.6 → 20.2.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.2.0-beta.6",
+  "version": "20.2.0-beta.7",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "20.2.0-beta.6",
-    "@nx/nx-darwin-arm64": "20.2.0-beta.6",
-    "@nx/nx-linux-x64-gnu": "20.2.0-beta.6",
-    "@nx/nx-linux-x64-musl": "20.2.0-beta.6",
-    "@nx/nx-win32-x64-msvc": "20.2.0-beta.6",
-    "@nx/nx-linux-arm64-gnu": "20.2.0-beta.6",
-    "@nx/nx-linux-arm64-musl": "20.2.0-beta.6",
-    "@nx/nx-linux-arm-gnueabihf": "20.2.0-beta.6",
-    "@nx/nx-win32-arm64-msvc": "20.2.0-beta.6",
-    "@nx/nx-freebsd-x64": "20.2.0-beta.6"
+    "@nx/nx-darwin-x64": "20.2.0-beta.7",
+    "@nx/nx-darwin-arm64": "20.2.0-beta.7",
+    "@nx/nx-linux-x64-gnu": "20.2.0-beta.7",
+    "@nx/nx-linux-x64-musl": "20.2.0-beta.7",
+    "@nx/nx-win32-x64-msvc": "20.2.0-beta.7",
+    "@nx/nx-linux-arm64-gnu": "20.2.0-beta.7",
+    "@nx/nx-linux-arm64-musl": "20.2.0-beta.7",
+    "@nx/nx-linux-arm-gnueabihf": "20.2.0-beta.7",
+    "@nx/nx-win32-arm64-msvc": "20.2.0-beta.7",
+    "@nx/nx-freebsd-x64": "20.2.0-beta.7"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/project-graph/plugins/get-plugins.js

@@ -9,6 +9,7 @@ const internal_api_1 = require("./internal-api");
 const workspace_root_1 = require("../../utils/workspace-root");
 let currentPluginsConfigurationHash;
 let loadedPlugins;
+let pendingPluginsPromise;
 let cleanup;
 async function getPlugins() {
     const pluginsConfiguration = (0, nx_json_1.readNxJson)().plugins ?? [];
@@ -22,14 +23,16 @@ async function getPlugins() {
     if (cleanup) {
         cleanup();
     }
+    pendingPluginsPromise ??= (0, internal_api_1.loadNxPlugins)(pluginsConfiguration, workspace_root_1.workspaceRoot);
     currentPluginsConfigurationHash = pluginsConfigurationHash;
-    const [result, cleanupFn] = await (0, internal_api_1.loadNxPlugins)(pluginsConfiguration, workspace_root_1.workspaceRoot);
+    const [result, cleanupFn] = await pendingPluginsPromise;
     cleanup = cleanupFn;
     loadedPlugins = result;
     return result;
 }
 let loadedDefaultPlugins;
 let cleanupDefaultPlugins;
+let pendingDefaultPluginPromise;
 async function getOnlyDefaultPlugins() {
     // If the plugins configuration has not changed, reuse the current plugins
     if (loadedDefaultPlugins) {
@@ -39,12 +42,15 @@ async function getOnlyDefaultPlugins() {
     if (cleanupDefaultPlugins) {
         cleanupDefaultPlugins();
     }
-    const [result, cleanupFn] = await (0, internal_api_1.loadNxPlugins)([], workspace_root_1.workspaceRoot);
+    pendingDefaultPluginPromise ??= (0, internal_api_1.loadNxPlugins)([], workspace_root_1.workspaceRoot);
+    const [result, cleanupFn] = await pendingDefaultPluginPromise;
     cleanupDefaultPlugins = cleanupFn;
     loadedPlugins = result;
     return result;
 }
 function cleanupPlugins() {
+    pendingPluginsPromise = undefined;
+    pendingDefaultPluginPromise = undefined;
     cleanup();
     cleanupDefaultPlugins();
 }

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

@@ -9,6 +9,9 @@ export interface PluginWorkerLoadMessage {
     payload: {
         plugin: PluginConfiguration;
         root: string;
+        name: string;
+        pluginPath: string;
+        shouldRegisterTSTranspiler: boolean;
     };
 }
 export interface PluginWorkerLoadResult {

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

@@ -7,6 +7,8 @@ const net_1 = require("net");
 const socket_utils_1 = require("../../../daemon/socket-utils");
 const consume_messages_from_socket_1 = require("../../../utils/consume-messages-from-socket");
 const messaging_1 = require("./messaging");
+const installation_directory_1 = require("../../../utils/installation-directory");
+const loader_1 = require("../loader");
 const cleanupFunctions = new Set();
 const pluginNames = new Map();
 const PLUGIN_TIMEOUT_HINT_TEXT = 'As a last resort, you can set NX_PLUGIN_NO_TIMEOUTS=true to bypass this timeout.';
@@ -28,6 +30,8 @@ async function loadRemoteNxPlugin(plugin, root) {
     if (nxPluginWorkerCache.has(cacheKey)) {
         return [nxPluginWorkerCache.get(cacheKey), () => { }];
     }
+    const moduleName = typeof plugin === 'string' ? plugin : plugin.plugin;
+    const { name, pluginPath, shouldRegisterTSTranspiler } = await (0, loader_1.resolveNxPlugin)(moduleName, root, (0, installation_directory_1.getNxRequirePaths)(root));
     const { worker, socket } = await startPluginWorker();
     const pendingPromises = new Map();
     const exitHandler = createWorkerExitHandler(worker, pendingPromises);
@@ -40,7 +44,7 @@ async function loadRemoteNxPlugin(plugin, root) {
     const pluginPromise = new Promise((res, rej) => {
         (0, messaging_1.sendMessageOverSocket)(socket, {
             type: 'load',
-            payload: { plugin, root },
+            payload: { plugin, root, name, pluginPath, shouldRegisterTSTranspiler },
         });
         // logger.verbose(`[plugin-worker] started worker: ${worker.pid}`);
         const loadTimeout = setTimeout(() => {

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

@@ -5,6 +5,7 @@ const serializable_error_1 = require("../../../utils/serializable-error");
 const consume_messages_from_socket_1 = require("../../../utils/consume-messages-from-socket");
 const net_1 = require("net");
 const fs_1 = require("fs");
+const loader_1 = require("../loader");
 if (process.env.NX_PERF_LOGGING === 'true') {
     require('../../../utils/perf-logging');
 }
@@ -28,14 +29,18 @@ const server = (0, net_1.createServer)((socket) => {
             return;
         }
         return (0, messaging_1.consumeMessage)(socket, message, {
-            load: async ({ plugin: pluginConfiguration, root }) => {
+            load: async ({ plugin: pluginConfiguration, root, name, pluginPath, shouldRegisterTSTranspiler, }) => {
                 if (loadTimeout)
                     clearTimeout(loadTimeout);
                 process.chdir(root);
                 try {
-                    const { loadNxPlugin } = await Promise.resolve().then(() => require('../loader'));
-                    const [promise] = loadNxPlugin(pluginConfiguration, root);
-                    plugin = await promise;
+                    const { loadResolvedNxPluginAsync } = await Promise.resolve().then(() => require('../load-resolved-plugin'));
+                    // Register the ts-transpiler if we are pointing to a
+                    // plain ts file that's not part of a plugin project
+                    if (shouldRegisterTSTranspiler) {
+                        (0, loader_1.registerPluginTSTranspiler)();
+                    }
+                    plugin = await loadResolvedNxPluginAsync(pluginConfiguration, pluginPath, name);
                     return {
                         type: 'load-result',
                         payload: {

package/src/project-graph/plugins/load-resolved-plugin.d.ts

@@ -0,0 +1,3 @@
+import type { PluginConfiguration } from '../../config/nx-json';
+import { LoadedNxPlugin } from './internal-api';
+export declare function loadResolvedNxPluginAsync(pluginConfiguration: PluginConfiguration, pluginPath: string, name: string): Promise<LoadedNxPlugin>;

package/src/project-graph/plugins/load-resolved-plugin.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadResolvedNxPluginAsync = loadResolvedNxPluginAsync;
+const internal_api_1 = require("./internal-api");
+async function loadResolvedNxPluginAsync(pluginConfiguration, pluginPath, name) {
+    const plugin = await importPluginModule(pluginPath);
+    plugin.name ??= name;
+    return new internal_api_1.LoadedNxPlugin(plugin, pluginConfiguration);
+}
+async function importPluginModule(pluginPath) {
+    const m = await Promise.resolve(`${pluginPath}`).then(s => require(s));
+    if (m.default &&
+        ('createNodes' in m.default ||
+            'createNodesV2' in m.default ||
+            'createDependencies' in m.default)) {
+        return m.default;
+    }
+    return m;
+}

package/src/project-graph/plugins/loader.d.ts

@@ -19,6 +19,12 @@ export declare function registerPluginTSTranspiler(): void;
 export declare function getPluginPathAndName(moduleName: string, paths: string[], projects: Record<string, ProjectConfiguration>, root: string): {
     pluginPath: string;
     name: any;
+    shouldRegisterTSTranspiler: boolean;
 };
 export declare function loadNxPlugin(plugin: PluginConfiguration, root: string): readonly [Promise<LoadedNxPlugin>, () => void];
+export declare function resolveNxPlugin(moduleName: string, root: string, paths: string[]): Promise<{
+    pluginPath: string;
+    name: any;
+    shouldRegisterTSTranspiler: boolean;
+}>;
 export declare function loadNxPluginAsync(pluginConfiguration: PluginConfiguration, paths: string[], root: string): Promise<LoadedNxPlugin>;

package/src/project-graph/plugins/loader.js

@@ -7,6 +7,7 @@ exports.resolveLocalNxPlugin = resolveLocalNxPlugin;
 exports.registerPluginTSTranspiler = registerPluginTSTranspiler;
 exports.getPluginPathAndName = getPluginPathAndName;
 exports.loadNxPlugin = loadNxPlugin;
+exports.resolveNxPlugin = resolveNxPlugin;
 exports.loadNxPluginAsync = loadNxPluginAsync;
 const posix_1 = require("node:path/posix");
 const installation_directory_1 = require("../../utils/installation-directory");
@@ -20,10 +21,10 @@ const path_1 = require("../../utils/path");
 const logger_1 = require("../../utils/logger");
 const node_path_1 = require("node:path");
 const retrieve_workspace_files_1 = require("../utils/retrieve-workspace-files");
-const internal_api_1 = require("./internal-api");
 const error_types_1 = require("../error-types");
 const path = require("node:path/posix");
 const typescript_1 = require("../../plugins/js/utils/typescript");
+const load_resolved_plugin_1 = require("./load-resolved-plugin");
 function readPluginPackageJson(pluginName, projects, paths = (0, installation_directory_1.getNxRequirePaths)()) {
     try {
         const result = (0, package_json_1.readModulePackageJsonWithoutFallbacks)(pluginName, paths);
@@ -138,19 +139,19 @@ function readPluginMainFromProjectConfiguration(plugin) {
 }
 function getPluginPathAndName(moduleName, paths, projects, root) {
     let pluginPath;
-    let registerTSTranspiler = false;
+    let shouldRegisterTSTranspiler = false;
     try {
         pluginPath = require.resolve(moduleName, {
             paths,
         });
         const extension = path.extname(pluginPath);
-        registerTSTranspiler = extension === '.ts';
+        shouldRegisterTSTranspiler = extension === '.ts';
     }
     catch (e) {
         if (e.code === 'MODULE_NOT_FOUND') {
             const plugin = resolveLocalNxPlugin(moduleName, projects, root);
             if (plugin) {
-                registerTSTranspiler = true;
+                shouldRegisterTSTranspiler = true;
                 const main = readPluginMainFromProjectConfiguration(plugin.projectConfig);
                 pluginPath = main ? path.join(root, main) : plugin.path;
             }
@@ -164,16 +165,11 @@ function getPluginPathAndName(moduleName, paths, projects, root) {
         }
     }
     const packageJsonPath = path.join(pluginPath, 'package.json');
-    // Register the ts-transpiler if we are pointing to a
-    // plain ts file that's not part of a plugin project
-    if (registerTSTranspiler) {
-        registerPluginTSTranspiler();
-    }
     const { name } = !['.ts', '.js'].some((x) => (0, node_path_1.extname)(moduleName) === x) && // Not trying to point to a ts or js file
         (0, node_fs_1.existsSync)(packageJsonPath) // plugin has a package.json
         ? (0, fileutils_1.readJsonFile)(packageJsonPath) // read name from package.json
         : { name: moduleName };
-    return { pluginPath, name };
+    return { pluginPath, name, shouldRegisterTSTranspiler };
 }
 let projectsWithoutInference;
 function loadNxPlugin(plugin, root) {
@@ -182,35 +178,30 @@ function loadNxPlugin(plugin, root) {
         () => { },
     ];
 }
+async function resolveNxPlugin(moduleName, root, paths) {
+    try {
+        require.resolve(moduleName);
+    }
+    catch {
+        // If a plugin cannot be resolved, we will need projects to resolve it
+        projectsWithoutInference ??=
+            await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
+    }
+    const { pluginPath, name, shouldRegisterTSTranspiler } = getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
+    return { pluginPath, name, shouldRegisterTSTranspiler };
+}
 async function loadNxPluginAsync(pluginConfiguration, paths, root) {
     const moduleName = typeof pluginConfiguration === 'string'
         ? pluginConfiguration
         : pluginConfiguration.plugin;
     try {
-        try {
-            require.resolve(moduleName);
-        }
-        catch {
-            // If a plugin cannot be resolved, we will need projects to resolve it
-            projectsWithoutInference ??=
-                await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
+        const { pluginPath, name, shouldRegisterTSTranspiler } = await resolveNxPlugin(moduleName, root, paths);
+        if (shouldRegisterTSTranspiler) {
+            registerPluginTSTranspiler();
         }
-        const { pluginPath, name } = getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
-        const plugin = await importPluginModule(pluginPath);
-        plugin.name ??= name;
-        return new internal_api_1.LoadedNxPlugin(plugin, pluginConfiguration);
+        return (0, load_resolved_plugin_1.loadResolvedNxPluginAsync)(pluginConfiguration, pluginPath, name);
     }
     catch (e) {
         throw new error_types_1.LoadPluginError(moduleName, e);
     }
 }
-async function importPluginModule(pluginPath) {
-    const m = await Promise.resolve(`${pluginPath}`).then(s => require(s));
-    if (m.default &&
-        ('createNodes' in m.default ||
-            'createNodesV2' in m.default ||
-            'createDependencies' in m.default)) {
-        return m.default;
-    }
-    return m;
-}