nx 20.4.0-beta.1 → 20.4.0-beta.2

package/package.json

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

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

@@ -21,6 +21,7 @@ const prepare_source_repo_1 = require("./utils/prepare-source-repo");
 const merge_remote_source_1 = require("./utils/merge-remote-source");
 const minimatch_1 = require("minimatch");
 const configure_plugins_1 = require("../init/configure-plugins");
+const check_compatible_with_plugins_1 = require("../init/implementation/check-compatible-with-plugins");
 const importRemoteName = '__tmp_nx_import__';
 async function importHandler(options) {
     process.env.NX_RUNNING_NX_IMPORT = 'true';
@@ -165,14 +166,24 @@ async function importHandler(options) {
     }
     await handleMissingWorkspacesEntry(packageManager, pmc, relativeDestination, destinationGitClient);
     let installed = await runInstallDestinationRepo(packageManager, destinationGitClient);
-    if (installed && plugins.length > 0) {
-        installed = await runPluginsInstall(plugins, pmc, destinationGitClient);
-        if (installed) {
-            const { succeededPlugins } = await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, workspace_root_1.workspaceRoot, verbose);
-            if (succeededPlugins.length > 0) {
+    if (installed) {
+        // Check compatibility with existing plugins for the workspace included new imported projects
+        if (nxJson.plugins?.length > 0) {
+            const incompatiblePlugins = await (0, check_compatible_with_plugins_1.checkCompatibleWithPlugins)();
+            if (Object.keys(incompatiblePlugins).length > 0) {
+                (0, check_compatible_with_plugins_1.updatePluginsInNxJson)(workspace_root_1.workspaceRoot, incompatiblePlugins);
                 await destinationGitClient.amendCommit();
             }
         }
+        if (plugins.length > 0) {
+            installed = await runPluginsInstall(plugins, pmc, destinationGitClient);
+            if (installed) {
+                const { succeededPlugins } = await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, workspace_root_1.workspaceRoot, verbose);
+                if (succeededPlugins.length > 0) {
+                    await destinationGitClient.amendCommit();
+                }
+            }
+        }
     }
     console.log(await destinationGitClient.showStat());
     if (installed === false) {
@@ -183,6 +194,22 @@ async function importHandler(options) {
                 `You may need to run "${pmc.install}" manually to resolve the issue. The error is logged above.`,
             ],
         });
+        if (plugins.length > 0) {
+            output_1.output.error({
+                title: `Failed to install plugins`,
+                bodyLines: [
+                    'The following plugins were not installed:',
+                    ...plugins.map((p) => `- ${chalk.bold(p)}`),
+                ],
+            });
+            output_1.output.error({
+                title: `To install the plugins manually`,
+                bodyLines: [
+                    'You may need to run commands to install the plugins:',
+                    ...plugins.map((p) => `- ${chalk.bold(pmc.exec + ' nx add ' + p)}`),
+                ],
+            });
+        }
     }
     if (source != destination) {
         output_1.output.warn({

package/src/command-line/init/implementation/check-compatible-with-plugins.d.ts

@@ -0,0 +1,15 @@
+export interface IncompatibleFiles {
+    [pluginIndex: number]: {
+        file: string;
+        error?: any;
+    }[];
+}
+/**
+ * This function checks if the imported project is compatible with the plugins.
+ * @returns a map of plugin names to files that are incompatible with the plugins
+ */
+export declare function checkCompatibleWithPlugins(): Promise<IncompatibleFiles>;
+/**
+ * This function updates the plugins in the nx.json file with the given plugin names and files to exclude.
+ */
+export declare function updatePluginsInNxJson(root: string, pluginToExcludeFiles: IncompatibleFiles): void;

package/src/command-line/init/implementation/check-compatible-with-plugins.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkCompatibleWithPlugins = checkCompatibleWithPlugins;
+exports.updatePluginsInNxJson = updatePluginsInNxJson;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const chalk_1 = require("chalk");
+const error_types_1 = require("../../../project-graph/error-types");
+const workspace_root_1 = require("../../../utils/workspace-root");
+const fileutils_1 = require("../../../utils/fileutils");
+const output_1 = require("../../../utils/output");
+const project_graph_1 = require("../../../project-graph/project-graph");
+/**
+ * This function checks if the imported project is compatible with the plugins.
+ * @returns a map of plugin names to files that are incompatible with the plugins
+ */
+async function checkCompatibleWithPlugins() {
+    let pluginToExcludeFiles = {};
+    try {
+        await (0, project_graph_1.createProjectGraphAsync)();
+    }
+    catch (projectGraphError) {
+        if (projectGraphError instanceof error_types_1.ProjectGraphError) {
+            projectGraphError.getErrors()?.forEach((error) => {
+                const { pluginIndex, excludeFiles } = findPluginAndFilesWithError(error) ?? {};
+                if (pluginIndex !== undefined && excludeFiles?.length) {
+                    pluginToExcludeFiles[pluginIndex] ??= [];
+                    pluginToExcludeFiles[pluginIndex].push(...excludeFiles);
+                }
+                else if (!(0, error_types_1.isProjectsWithNoNameError)(error)) {
+                    // print error if it is not ProjectsWithNoNameError and unable to exclude files
+                    output_1.output.error({
+                        title: error.message,
+                        bodyLines: error.stack?.split('\n'),
+                    });
+                }
+            });
+        }
+        else {
+            output_1.output.error({
+                title: 'Failed to process project graph. Run "nx reset" to fix this. Please report the issue if you keep seeing it.',
+                bodyLines: projectGraphError.stack?.split('\n'),
+            });
+        }
+    }
+    return pluginToExcludeFiles;
+}
+/**
+ * This function finds the plugin name and files that caused the error.
+ * @param error the error to find the plugin name and files for
+ * @returns pluginName and excludeFiles if found, otherwise undefined
+ */
+function findPluginAndFilesWithError(error) {
+    let pluginIndex;
+    let excludeFiles = [];
+    if ((0, error_types_1.isAggregateCreateNodesError)(error)) {
+        pluginIndex = error.pluginIndex;
+        excludeFiles =
+            error.errors?.map((error) => {
+                return {
+                    file: error?.[0],
+                    error: error?.[1],
+                };
+            }) ?? [];
+    }
+    else if ((0, error_types_1.isMergeNodesError)(error)) {
+        pluginIndex = error.pluginIndex;
+        excludeFiles = [
+            {
+                file: error.file,
+                error: error,
+            },
+        ];
+    }
+    excludeFiles = excludeFiles.filter(Boolean);
+    return {
+        pluginIndex,
+        excludeFiles,
+    };
+}
+/**
+ * This function updates the plugins in the nx.json file with the given plugin names and files to exclude.
+ */
+function updatePluginsInNxJson(root = workspace_root_1.workspaceRoot, pluginToExcludeFiles) {
+    const nxJsonPath = (0, node_path_1.join)(root, 'nx.json');
+    if (!(0, node_fs_1.existsSync)(nxJsonPath)) {
+        return;
+    }
+    let nxJson;
+    try {
+        nxJson = (0, fileutils_1.readJsonFile)(nxJsonPath);
+    }
+    catch {
+        // If there is an error reading the nx.json file, no need to update it
+        return;
+    }
+    if (!Object.keys(pluginToExcludeFiles)?.length || !nxJson?.plugins?.length) {
+        return;
+    }
+    Object.entries(pluginToExcludeFiles).forEach(([pluginIndex, excludeFiles]) => {
+        let plugin = nxJson.plugins[pluginIndex];
+        if (!plugin || excludeFiles.length === 0) {
+            return;
+        }
+        if (typeof plugin === 'string') {
+            plugin = { plugin };
+        }
+        output_1.output.warn({
+            title: `The following files were incompatible with ${plugin.plugin} and has been excluded for now:`,
+            bodyLines: excludeFiles
+                .map((file) => {
+                const output = [`  - ${(0, chalk_1.bold)(file.file)}`];
+                if (file.error?.message) {
+                    output.push(`    ${file.error.message}`);
+                }
+                return output;
+            })
+                .flat(),
+        });
+        const excludes = new Set(plugin.exclude ?? []);
+        excludeFiles.forEach((file) => {
+            excludes.add(file.file);
+        });
+        plugin.exclude = Array.from(excludes);
+        nxJson.plugins[pluginIndex] = plugin;
+    });
+    (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+}

package/src/command-line/release/config/conventional-commits.js

@@ -94,5 +94,12 @@ exports.DEFAULT_CONVENTIONAL_COMMITS_CONFIG = {
                 hidden: true,
             },
         },
+        __INVALID__: {
+            semverBump: 'none',
+            changelog: {
+                title: 'Invalid based on conventional commits specification',
+                hidden: true,
+            },
+        },
     },
 };

package/src/command-line/release/utils/git.js

@@ -292,7 +292,12 @@ function parseCommits(commits) {
 function parseConventionalCommitsMessage(message) {
     const match = message.match(ConventionalCommitRegex);
     if (!match) {
-        return null;
+        return {
+            type: '__INVALID__',
+            scope: '',
+            description: message,
+            breaking: false,
+        };
     }
     return {
         type: match.groups.type || '',