nx 19.5.7 → 19.6.0-beta.1

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -42,7 +42,7 @@ function getNxInitDate() {
         return null;
     }
 }
-async function createNxCloudWorkspace(workspaceName, installationSource, nxInitDate) {
+async function createNxCloudWorkspaceV1(workspaceName, installationSource, nxInitDate) {
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     const response = await require('axios').post(`${apiUrl}/nx-cloud/create-org-and-workspace`, {
         workspaceName,
@@ -54,6 +54,18 @@ async function createNxCloudWorkspace(workspaceName, installationSource, nxInitD
     }
     return response.data;
 }
+async function createNxCloudWorkspaceV2(workspaceName, installationSource, nxInitDate) {
+    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
+    const response = await require('axios').post(`${apiUrl}/nx-cloud/v2/create-org-and-workspace`, {
+        workspaceName,
+        installationSource,
+        nxInitDate,
+    });
+    if (response.data.message) {
+        throw new Error(response.data.message);
+    }
+    return response.data;
+}
 async function printSuccessMessage(token, installationSource, usesGithub) {
     const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)(installationSource, token, usesGithub);
     output_1.output.note({
@@ -82,6 +94,19 @@ function addNxCloudOptionsToNxJson(tree, token, directory = '') {
         });
     }
 }
+function addNxCloudIdToNxJson(tree, nxCloudId, directory = tree.root) {
+    const nxJsonPath = (0, path_1.join)(directory, 'nx.json');
+    if (tree.exists(nxJsonPath)) {
+        (0, json_1.updateJson)(tree, (0, path_1.join)(directory, 'nx.json'), (nxJson) => {
+            const overrideUrl = process.env.NX_CLOUD_API || process.env.NRWL_API;
+            if (overrideUrl) {
+                nxJson.nxCloudUrl = overrideUrl;
+            }
+            nxJson.nxCloudId = nxCloudId;
+            return nxJson;
+        });
+    }
+}
 async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)(tree)) {
     schema.installationSource ??= 'user';
     if (nxJson?.neverConnectToCloud) {
@@ -90,18 +115,27 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
     }
     else {
         const usesGithub = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
-        let responseFromCreateNxCloudWorkspace;
+        let responseFromCreateNxCloudWorkspaceV1;
+        let responseFromCreateNxCloudWorkspaceV2;
         // do NOT create Nx Cloud token (createNxCloudWorkspace)
         // if user is using github and is running nx-connect
-        if (!(usesGithub &&
-            (schema.installationSource === 'nx-connect' ||
-                schema.installationSource === 'nx-console'))) {
-            responseFromCreateNxCloudWorkspace = await createNxCloudWorkspace(getRootPackageName(tree), schema.installationSource, getNxInitDate());
-            addNxCloudOptionsToNxJson(tree, responseFromCreateNxCloudWorkspace?.token, schema.directory);
-            await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
-                silent: schema.hideFormatLogs,
-            });
-            return responseFromCreateNxCloudWorkspace.token;
+        if (!(usesGithub && schema.installationSource === 'nx-connect')) {
+            if (process.env.NX_ENABLE_LOGIN === 'true') {
+                responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
+                addNxCloudIdToNxJson(tree, responseFromCreateNxCloudWorkspaceV2?.nxCloudId, schema.directory);
+                await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+                    silent: schema.hideFormatLogs,
+                });
+                return responseFromCreateNxCloudWorkspaceV2.nxCloudId;
+            }
+            else {
+                responseFromCreateNxCloudWorkspaceV1 = await createNxCloudWorkspaceV1(getRootPackageName(tree), schema.installationSource, getNxInitDate());
+                addNxCloudOptionsToNxJson(tree, responseFromCreateNxCloudWorkspaceV1?.token, schema.directory);
+                await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+                    silent: schema.hideFormatLogs,
+                });
+                return responseFromCreateNxCloudWorkspaceV1.token;
+            }
         }
     }
 }

package/src/nx-cloud/models/onboarding-status.d.ts

@@ -0,0 +1 @@
+export type NxCloudOnBoardingStatus = 'claimed' | 'unclaimed' | 'not-configured';

package/src/nx-cloud/models/onboarding-status.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/nx-cloud/nx-cloud-tasks-runner-shell.d.ts

@@ -11,5 +11,6 @@ export interface CloudTaskRunnerOptions extends DefaultTasksRunnerOptions {
     url?: string;
     useLightClient?: boolean;
     clientVersion?: string;
+    nxCloudId?: string;
 }
 export declare const nxCloudTasksRunnerShell: TasksRunner<CloudTaskRunnerOptions>;

package/src/nx-cloud/utilities/axios.js

@@ -8,8 +8,15 @@ function createApiAxiosInstance(options) {
     let axiosConfigBuilder = (axiosConfig) => axiosConfig;
     const baseUrl = process.env.NX_CLOUD_API || options.url || 'https://cloud.nx.app';
     const accessToken = environment_1.ACCESS_TOKEN ? environment_1.ACCESS_TOKEN : options.accessToken;
-    if (!accessToken) {
-        throw new Error(`Unable to authenticate. Either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable.`);
+    const nxCloudId = options.nxCloudId;
+    // TODO(lourw): Update message with NxCloudId once it is supported
+    if (!accessToken && !nxCloudId) {
+        if (process.env.NX_ENABLE_LOGIN === 'true' && !nxCloudId) {
+            throw new Error(`Unable to authenticate. Please connect your workspace to Nx Cloud to define a valid Nx Cloud Id. If you are in a CI context, please set the NX_CLOUD_ACCESS_TOKEN environment variable or define an access token in your nx.json.`);
+        }
+        else {
+            throw new Error(`Unable to authenticate. Either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable. If you do not want to use Nx Cloud for this command, either set NX_NO_CLOUD=true, or pass the --no-cloud flag.`);
+        }
     }
     if (options.customProxyConfigPath) {
         const { nxCloudProxyConfig } = require((0, path_1.join)(process.cwd(), options.customProxyConfigPath));

package/src/nx-cloud/utilities/is-workspace-claimed.d.ts

@@ -0,0 +1 @@
+export declare function isWorkspaceClaimed(nxCloudAccessToken: any): Promise<any>;

package/src/nx-cloud/utilities/is-workspace-claimed.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isWorkspaceClaimed = isWorkspaceClaimed;
+const get_cloud_options_1 = require("./get-cloud-options");
+async function isWorkspaceClaimed(nxCloudAccessToken) {
+    if (!nxCloudAccessToken)
+        return false;
+    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
+    try {
+        const response = await require('axios').post(`${apiUrl}/nx-cloud/is-workspace-claimed`, {
+            nxCloudAccessToken,
+        });
+        if (response.data.message) {
+            return false;
+        }
+        else {
+            return response.data;
+        }
+    }
+    catch (e) {
+        // We want to handle cases the if the request fails for any reason
+        return false;
+    }
+}

package/src/nx-cloud/utilities/onboarding.d.ts

@@ -0,0 +1,5 @@
+import type { Tree } from '../../generators/tree';
+import { NxCloudOnBoardingStatus } from '../models/onboarding-status';
+export declare function createNxCloudOnboardingURLForWelcomeApp(tree: Tree, token?: string): Promise<NxCloudOnBoardingStatus>;
+export declare function getNxCloudAppOnBoardingUrl(token: string): Promise<string>;
+export declare function readNxCloudToken(tree: Tree): any;

package/src/nx-cloud/utilities/onboarding.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNxCloudOnboardingURLForWelcomeApp = createNxCloudOnboardingURLForWelcomeApp;
+exports.getNxCloudAppOnBoardingUrl = getNxCloudAppOnBoardingUrl;
+exports.readNxCloudToken = readNxCloudToken;
+const devkit_exports_1 = require("../../devkit-exports");
+const is_workspace_claimed_1 = require("./is-workspace-claimed");
+const url_shorten_1 = require("./url-shorten");
+const run_command_1 = require("../../tasks-runner/run-command");
+async function createNxCloudOnboardingURLForWelcomeApp(tree, token) {
+    token = token || readNxCloudToken(tree);
+    if (!token) {
+        return 'not-configured';
+    }
+    return (await (0, is_workspace_claimed_1.isWorkspaceClaimed)(token)) ? 'claimed' : 'unclaimed';
+}
+async function getNxCloudAppOnBoardingUrl(token) {
+    if (!token) {
+        return null;
+    }
+    const onboardingUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)('nx-welcome-app', token);
+    return onboardingUrl;
+}
+function readNxCloudToken(tree) {
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    const { accessToken } = (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
+    return accessToken;
+}

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

@@ -13,7 +13,6 @@ const loader_1 = require("./loader");
 const utils_1 = require("./utils");
 const error_types_1 = require("../error-types");
 const native_1 = require("../../native");
-const os_1 = require("os");
 class LoadedNxPlugin {
     constructor(plugin, pluginDefinition) {
         this.name = plugin.name;
@@ -72,12 +71,24 @@ exports.LoadedNxPlugin = LoadedNxPlugin;
 // 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') {
+        return true;
+    }
+    if (
+    // Explicitly disabled
+    process.env.NX_ISOLATE_PLUGINS === 'false' ||
+        // Isolation is disabled on WASM builds currently.
+        native_1.IS_WASM) {
+        return false;
+    }
+    // Default value
+    return true;
+}
 async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot) {
     performance.mark('loadNxPlugins:start');
-    const loadingMethod = process.env.NX_ISOLATE_PLUGINS === 'true' ||
-        (!native_1.IS_WASM &&
-            (0, os_1.platform)() !== 'win32' &&
-            process.env.NX_ISOLATE_PLUGINS !== 'false')
+    const loadingMethod = isIsolationEnabled()
         ? isolation_1.loadNxPluginInIsolation
         : loader_1.loadNxPlugin;
     plugins = await normalizePlugins(plugins, root);

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

@@ -106,7 +106,11 @@ export interface PluginWorkerProcessProjectGraphResult {
         tx: string;
     };
 }
-export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginWorkerProcessProjectGraphMessage | PluginCreateMetadataMessage;
+export interface PluginWorkerShutdownMessage {
+    type: 'shutdown';
+    payload: {};
+}
+export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerShutdownMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginWorkerProcessProjectGraphMessage | PluginCreateMetadataMessage;
 export type PluginWorkerResult = PluginWorkerLoadResult | PluginWorkerCreateNodesResult | PluginCreateDependenciesResult | PluginWorkerProcessProjectGraphResult | 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/messaging.js

@@ -14,6 +14,7 @@ function isPluginWorkerMessage(message) {
             'createDependencies',
             'processProjectGraph',
             'createMetadata',
+            'shutdown',
         ].includes(message.type));
 }
 function isPluginWorkerResult(message) {

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

@@ -29,8 +29,8 @@ async function loadRemoteNxPlugin(plugin, root) {
     const exitHandler = createWorkerExitHandler(worker, pendingPromises);
     const cleanupFunction = () => {
         worker.off('exit', exitHandler);
+        shutdownPluginWorker(socket);
         socket.destroy();
-        shutdownPluginWorker(worker);
         nxPluginWorkerCache.delete(cacheKey);
     };
     cleanupFunctions.add(cleanupFunction);
@@ -55,11 +55,8 @@ async function loadRemoteNxPlugin(plugin, root) {
     nxPluginWorkerCache.set(cacheKey, pluginPromise);
     return [pluginPromise, cleanupFunction];
 }
-function shutdownPluginWorker(worker) {
-    // Clears the plugin cache so no refs to the workers are held
-    internal_api_1.nxPluginCache.clear();
-    // logger.verbose(`[plugin-pool] starting worker shutdown`);
-    worker.kill('SIGINT');
+function shutdownPluginWorker(socket) {
+    (0, messaging_1.sendMessageOverSocket)(socket, { type: 'shutdown', payload: {} });
 }
 /**
  * Creates a message handler for the given worker.
@@ -200,6 +197,7 @@ function createWorkerExitHandler(worker, pendingPromises) {
 }
 let cleanedUp = false;
 const exitHandler = () => {
+    internal_api_1.nxPluginCache.clear();
     for (const fn of cleanupFunctions) {
         fn();
     }

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

@@ -49,6 +49,21 @@ 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);

package/src/project-graph/utils/project-configuration-utils.d.ts

@@ -37,6 +37,7 @@ export type ConfigurationResult = {
  */
 export declare function createProjectConfigurations(root: string, nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
 plugins: LoadedNxPlugin[]): Promise<ConfigurationResult>;
+export declare function findMatchingConfigFiles(projectFiles: string[], pattern: string, include: string[], exclude: string[]): string[];
 export declare function readProjectConfigurationsFromRootMap(projectRootMap: Record<string, ProjectConfiguration>): Record<string, ProjectConfiguration>;
 export declare function validateProject(project: ProjectConfiguration, knownProjects: Record<string, ProjectConfiguration>): void;
 export declare function mergeTargetDefaultWithTargetDefinition(targetName: string, project: ProjectConfiguration, targetDefault: Partial<TargetConfiguration>, sourceMap: Record<string, SourceInformation>): TargetConfiguration;

package/src/project-graph/utils/project-configuration-utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeProjectConfigurationIntoRootMap = mergeProjectConfigurationIntoRootMap;
 exports.mergeMetadata = mergeMetadata;
 exports.createProjectConfigurations = createProjectConfigurations;
+exports.findMatchingConfigFiles = findMatchingConfigFiles;
 exports.readProjectConfigurationsFromRootMap = readProjectConfigurationsFromRootMap;
 exports.validateProject = validateProject;
 exports.mergeTargetDefaultWithTargetDefinition = mergeTargetDefaultWithTargetDefinition;
@@ -445,7 +446,7 @@ function normalizeTargets(project, sourceMaps, nxJsonConfiguration) {
         project.targets[targetName] = normalizeTarget(project.targets[targetName], project);
         const projectSourceMaps = sourceMaps[project.root];
         const targetConfig = project.targets[targetName];
-        const targetDefaults = readTargetDefaultsForTarget(targetName, nxJsonConfiguration.targetDefaults, targetConfig.executor);
+        const targetDefaults = deepClone(readTargetDefaultsForTarget(targetName, nxJsonConfiguration.targetDefaults, targetConfig.executor));
         // We only apply defaults if they exist
         if (targetDefaults && isCompatibleTarget(targetConfig, targetDefaults)) {
             project.targets[targetName] = mergeTargetDefaultWithTargetDefinition(targetName, project, normalizeTarget(targetDefaults, project), projectSourceMaps);
@@ -498,9 +499,12 @@ function targetDefaultShouldBeApplied(key, sourceMap) {
     const [, plugin] = sourceInfo;
     return !plugin?.startsWith('nx/');
 }
+function deepClone(obj) {
+    return JSON.parse(JSON.stringify(obj));
+}
 function mergeTargetDefaultWithTargetDefinition(targetName, project, targetDefault, sourceMap) {
     const targetDefinition = project.targets[targetName] ?? {};
-    const result = JSON.parse(JSON.stringify(targetDefinition));
+    const result = deepClone(targetDefinition);
     for (const key in targetDefault) {
         switch (key) {
             case 'options': {

package/src/tasks-runner/run-command.js

@@ -318,7 +318,9 @@ function getTasksRunnerPath(runner, nxJson) {
         // No runner prop in tasks runner options, check if access token is set.
         nxJson.tasksRunnerOptions?.[runner]?.options?.accessToken ||
         // Cloud access token specified in env var.
-        process.env.NX_CLOUD_ACCESS_TOKEN;
+        process.env.NX_CLOUD_ACCESS_TOKEN ||
+        // Nx Cloud Id specified in nxJson
+        nxJson.nxCloudId;
     return isCloudRunner ? 'nx-cloud' : require.resolve('./default-tasks-runner');
 }
 function getRunnerOptions(runner, nxJson, nxArgs, isCloudDefault) {
@@ -339,6 +341,9 @@ function getRunnerOptions(runner, nxJson, nxArgs, isCloudDefault) {
     if (nxJson.nxCloudAccessToken && isCloudDefault) {
         result.accessToken ??= nxJson.nxCloudAccessToken;
     }
+    if (nxJson.nxCloudId && isCloudDefault) {
+        result.nxCloudId ??= nxJson.nxCloudId;
+    }
     if (nxJson.nxCloudUrl && isCloudDefault) {
         result.url ??= nxJson.nxCloudUrl;
     }

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

@@ -29,6 +29,7 @@ export interface NxArgs {
     nxIgnoreCycles?: boolean;
     type?: string;
     batch?: boolean;
+    excludeTaskDependencies?: boolean;
 }
 export declare function createOverrides(__overrides_unparsed__?: string[]): Record<string, any>;
 export declare function splitArgsIntoNxArgsAndOverrides(args: {

package/src/utils/nx-cloud-utils.js

@@ -6,12 +6,14 @@ exports.getNxCloudToken = getNxCloudToken;
 function isNxCloudUsed(nxJson) {
     return (!!process.env.NX_CLOUD_ACCESS_TOKEN ||
         !!nxJson.nxCloudAccessToken ||
+        !!nxJson.nxCloudId ||
         !!Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud'));
 }
 function getNxCloudUrl(nxJson) {
     const cloudRunner = Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud');
     if (!cloudRunner &&
-        !(nxJson.nxCloudAccessToken || process.env.NX_CLOUD_ACCESS_TOKEN))
+        !(nxJson.nxCloudAccessToken || process.env.NX_CLOUD_ACCESS_TOKEN) &&
+        !nxJson.nxCloudId)
         throw new Error('nx-cloud runner not found in nx.json');
     return cloudRunner?.options?.url ?? nxJson.nxCloudUrl ?? 'https://nx.app';
 }

package/src/utils/package-json.d.ts

@@ -1,13 +1,6 @@
-import { InputDefinition, ProjectMetadata, TargetConfiguration } from '../config/workspace-json-project-json';
+import { ProjectConfiguration, ProjectMetadata, TargetConfiguration } from '../config/workspace-json-project-json';
 import { PackageManagerCommands } from './package-manager';
-export interface NxProjectPackageJsonConfiguration {
-    name?: string;
-    implicitDependencies?: string[];
-    tags?: string[];
-    namedInputs?: {
-        [inputName: string]: (string | InputDefinition)[];
-    };
-    targets?: Record<string, TargetConfiguration>;
+export interface NxProjectPackageJsonConfiguration extends Partial<ProjectConfiguration> {
     includedScripts?: string[];
 }
 export type ArrayPackageGroup = {

package/src/utils/package-manager.js

@@ -176,6 +176,7 @@ function getPackageManagerVersion(packageManager = detectPackageManager(), cwd =
         version = (0, child_process_1.execSync)(`${packageManager} --version`, {
             cwd,
             encoding: 'utf-8',
+            windowsHide: true,
         }).trim();
     }
     catch {
@@ -349,7 +350,10 @@ async function resolvePackageVersionUsingInstallation(packageName, version) {
     const { dir, cleanup } = createTempNpmDirectory();
     try {
         const pmc = getPackageManagerCommand();
-        await execAsync(`${pmc.add} ${packageName}@${version}`, { cwd: dir });
+        await execAsync(`${pmc.add} ${packageName}@${version}`, {
+            cwd: dir,
+            windowsHide: true,
+        });
         const { packageJson } = (0, package_json_1.readModulePackageJson)(packageName, [dir]);
         return packageJson.version;
     }
@@ -372,7 +376,9 @@ async function packageRegistryView(pkg, version, args) {
          */
         pm = 'npm';
     }
-    const { stdout } = await execAsync(`${pm} view ${pkg}@${version} ${args}`);
+    const { stdout } = await execAsync(`${pm} view ${pkg}@${version} ${args}`, {
+        windowsHide: true,
+    });
     return stdout.toString().trim();
 }
 async function packageRegistryPack(cwd, pkg, version) {
@@ -389,7 +395,10 @@ async function packageRegistryPack(cwd, pkg, version) {
          */
         pm = 'npm';
     }
-    const { stdout } = await execAsync(`${pm} pack ${pkg}@${version}`, { cwd });
+    const { stdout } = await execAsync(`${pm} pack ${pkg}@${version}`, {
+        cwd,
+        windowsHide: true,
+    });
     const tarballPath = stdout.trim();
     return { tarballPath };
 }