nx 19.7.3 → 19.8.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.7.3",
+  "version": "19.8.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.7.3"
+    "@nrwl/tao": "19.8.0-beta.0"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.7.3",
-    "@nx/nx-darwin-arm64": "19.7.3",
-    "@nx/nx-linux-x64-gnu": "19.7.3",
-    "@nx/nx-linux-x64-musl": "19.7.3",
-    "@nx/nx-win32-x64-msvc": "19.7.3",
-    "@nx/nx-linux-arm64-gnu": "19.7.3",
-    "@nx/nx-linux-arm64-musl": "19.7.3",
-    "@nx/nx-linux-arm-gnueabihf": "19.7.3",
-    "@nx/nx-win32-arm64-msvc": "19.7.3",
-    "@nx/nx-freebsd-x64": "19.7.3"
+    "@nx/nx-darwin-x64": "19.8.0-beta.0",
+    "@nx/nx-darwin-arm64": "19.8.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "19.8.0-beta.0",
+    "@nx/nx-linux-x64-musl": "19.8.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "19.8.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "19.8.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "19.8.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "19.8.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "19.8.0-beta.0",
+    "@nx/nx-freebsd-x64": "19.8.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -634,7 +634,7 @@
           "description": "Custom git commit message to use when committing the changes made by this command"
         },
         "commitArgs": {
-          "type": "string",
+          "type": ["string", "array"],
           "description": "Additional arguments (added after the --message argument, which may or may not be customized with --git-commit-message) to pass to the `git commit` command invoked behind the scenes"
         },
         "stageChanges": {
@@ -650,7 +650,7 @@
           "description": "Custom git tag message to use when tagging the changes made by this command. This defaults to be the same value as the tag itself."
         },
         "tagArgs": {
-          "type": "string",
+          "type": ["string", "array"],
           "description": "Additional arguments to pass to the `git tag` command invoked behind the scenes"
         }
       }

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

@@ -1,6 +1,6 @@
 import { Generator, GeneratorsJson, GeneratorsJsonEntry } from '../../config/misc-interfaces';
 import { ProjectConfiguration } from '../../config/workspace-json-project-json';
-export declare function getGeneratorInformation(collectionName: string, generatorName: string, root: string | null, projects: Record<string, ProjectConfiguration>): {
+export type GeneratorInformation = {
     resolvedCollectionName: string;
     normalizedGeneratorName: string;
     schema: any;
@@ -9,6 +9,7 @@ export declare function getGeneratorInformation(collectionName: string, generato
     isNxGenerator: boolean;
     generatorConfiguration: GeneratorsJsonEntry;
 };
+export declare function getGeneratorInformation(collectionName: string, generatorName: string, root: string | null, projects: Record<string, ProjectConfiguration>): GeneratorInformation;
 export declare function readGeneratorsJson(collectionName: string, generator: string, root: string | null, projects: Record<string, ProjectConfiguration>): {
     generatorsFilePath: string;
     generatorsJson: GeneratorsJson;

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

@@ -6,7 +6,7 @@ const shared_options_1 = require("../yargs-utils/shared-options");
 const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsImportCommand = {
     command: 'import [sourceRepository] [destinationDirectory]',
-    describe: false,
+    describe: 'Import code and git history from another repository into this repository.',
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withVerbose)(yargs
         .positional('sourceRepository', {
         type: 'string',

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

@@ -25,7 +25,12 @@ const needs_install_1 = require("./utils/needs-install");
 const file_utils_1 = require("../../project-graph/file-utils");
 const importRemoteName = '__tmp_nx_import__';
 async function importHandler(options) {
+    process.env.NX_RUNNING_NX_IMPORT = 'true';
     let { sourceRepository, ref, source, destination } = options;
+    const destinationGitClient = new git_utils_1.GitRepository(process.cwd());
+    if (await destinationGitClient.hasUncommittedChanges()) {
+        throw new Error(`You have uncommitted changes in the destination repository. Commit or revert the changes and try again.`);
+    }
     output_1.output.log({
         title: 'Nx will walk you through the process of importing code from the source repository into this repository:',
         bodyLines: [
@@ -120,7 +125,6 @@ async function importHandler(options) {
         throw new Error(`The destination directory must be a relative path in this repository.`);
     }
     const absDestination = (0, path_1.join)(process.cwd(), destination);
-    const destinationGitClient = new git_utils_1.GitRepository(process.cwd());
     await assertDestinationEmpty(destinationGitClient, absDestination);
     const tempImportBranch = getTempImportBranch(ref);
     await sourceGitClient.addFetchRemote(importRemoteName, ref);
@@ -152,7 +156,7 @@ async function importHandler(options) {
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
     (0, workspace_context_1.resetWorkspaceContext)();
-    const { plugins, updatePackageScripts } = await (0, init_v2_1.detectPlugins)(nxJson, options.interactive);
+    const { plugins, updatePackageScripts } = await (0, init_v2_1.detectPlugins)(nxJson, options.interactive, true);
     if (packageManager !== sourcePackageManager) {
         output_1.output.warn({
             title: `Mismatched package managers`,
@@ -232,8 +236,9 @@ async function importHandler(options) {
         title: `Merging these changes into ${(0, command_line_utils_1.getBaseRef)(nxJson)}`,
         bodyLines: [
             `MERGE these changes when merging these changes.`,
-            `Do NOT squash and do NOT rebase these changes when merging these changes.`,
-            `If you would like to UNDO these changes, run "git reset HEAD~1 --hard"`,
+            `Do NOT squash these commits when merging these changes.`,
+            `If you rebase, make sure to use "--rebase-merges" to preserve merge commits.`,
+            `To UNDO these changes, run "git reset HEAD~1 --hard"`,
         ],
     });
 }

package/src/command-line/import/utils/prepare-source-repo.js

@@ -3,46 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareSourceRepo = prepareSourceRepo;
 const createSpinner = require("ora");
 const path_1 = require("path");
-const promises_1 = require("node:fs/promises");
 async function prepareSourceRepo(gitClient, ref, source, relativeDestination, tempImportBranch, sourceRemoteUrl) {
     const spinner = createSpinner().start(`Fetching ${ref} from ${sourceRemoteUrl}`);
     const relativeSourceDir = (0, path_1.relative)(gitClient.root, (0, path_1.join)(gitClient.root, source));
-    if (relativeSourceDir !== '') {
-        if (await gitClient.hasFilterRepoInstalled()) {
-            spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
-            await gitClient.filterRepo(relativeSourceDir);
-        }
-        else {
-            spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
-            await gitClient.filterBranch(relativeSourceDir, tempImportBranch);
-        }
-        spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
+    if (await gitClient.hasFilterRepoInstalled()) {
+        spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
+        await gitClient.filterRepo(relativeSourceDir, relativeDestination);
     }
-    const destinationInSource = (0, path_1.join)(gitClient.root, relativeDestination);
-    spinner.start(`Moving files and git history to ${destinationInSource}`);
-    // The result of filter-branch will contain only the files in the subdirectory at its root.
-    const files = await gitClient.getGitFiles('.');
-    try {
-        await (0, promises_1.rm)(destinationInSource, {
-            recursive: true,
-        });
+    else {
+        spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
+        await gitClient.filterBranch(relativeSourceDir, relativeDestination, tempImportBranch);
     }
-    catch { }
-    await (0, promises_1.mkdir)(destinationInSource, { recursive: true });
-    for (const file of files) {
-        spinner.start(`Moving files and git history to ${destinationInSource}: ${file}`);
-        const newPath = (0, path_1.join)(destinationInSource, file);
-        await (0, promises_1.mkdir)((0, path_1.dirname)(newPath), { recursive: true });
-        try {
-            await gitClient.move(file, newPath);
-        }
-        catch {
-            await wait(100);
-            await gitClient.move(file, newPath);
-        }
-    }
-    await gitClient.commit(`chore(repo): move ${source} to ${relativeDestination} to prepare to be imported`);
-    await gitClient.amendCommit();
+    spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
     spinner.succeed(`${sourceRemoteUrl} has been prepared to be imported into this workspace on a temporary branch: ${tempImportBranch} in ${gitClient.root}`);
 }
 function wait(ms) {

package/src/command-line/init/init-v2.d.ts

@@ -8,7 +8,7 @@ export interface InitArgs {
 }
 export declare function installPlugins(repoRoot: string, plugins: string[], pmc: PackageManagerCommands, updatePackageScripts: boolean): void;
 export declare function initHandler(options: InitArgs): Promise<void>;
-export declare function detectPlugins(nxJson: NxJsonConfiguration, interactive: boolean): Promise<{
+export declare function detectPlugins(nxJson: NxJsonConfiguration, interactive: boolean, includeAngularCli?: boolean): Promise<{
     plugins: string[];
     updatePackageScripts: boolean;
 }>;

package/src/command-line/init/init-v2.js

@@ -127,8 +127,8 @@ const npmPackageToPluginMap = {
     'react-native': '@nx/react-native',
     '@remix-run/dev': '@nx/remix',
 };
-async function detectPlugins(nxJson, interactive) {
-    let files = ['package.json'].concat(await (0, workspace_context_1.globWithWorkspaceContext)(process.cwd(), ['**/*/package.json']));
+async function detectPlugins(nxJson, interactive, includeAngularCli) {
+    let files = ['package.json'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), ['**/*/package.json']));
     const currentPlugins = new Set((nxJson.plugins ?? []).map((p) => {
         const plugin = typeof p === 'string' ? p : p.plugin;
         return (0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(plugin);
@@ -149,13 +149,23 @@ async function detectPlugins(nxJson, interactive) {
             ...packageJson.dependencies,
             ...packageJson.devDependencies,
         };
-        for (const [dep, plugin] of Object.entries(npmPackageToPluginMap)) {
+        const _npmPackageToPluginMap = {
+            ...npmPackageToPluginMap,
+        };
+        if (includeAngularCli) {
+            _npmPackageToPluginMap['@angular/cli'] = '@nx/angular';
+        }
+        for (const [dep, plugin] of Object.entries(_npmPackageToPluginMap)) {
             if (deps[dep]) {
                 detectedPlugins.add(plugin);
             }
         }
     }
-    if ((0, fs_1.existsSync)('gradlew') || (0, fs_1.existsSync)('gradlew.bat')) {
+    let gradlewFiles = ['gradlew', 'gradlew.bat'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), [
+        '**/gradlew',
+        '**/gradlew.bat',
+    ]));
+    if (gradlewFiles.some((f) => (0, fs_1.existsSync)(f))) {
         detectedPlugins.add('@nx/gradle');
     }
     // Remove existing plugins

package/src/command-line/release/command-object.d.ts

@@ -14,10 +14,10 @@ interface GitCommitAndTagOptions {
     stageChanges?: boolean;
     gitCommit?: boolean;
     gitCommitMessage?: string;
-    gitCommitArgs?: string;
+    gitCommitArgs?: string | string[];
     gitTag?: boolean;
     gitTagMessage?: string;
-    gitTagArgs?: string;
+    gitTagArgs?: string | string[];
 }
 export type VersionOptions = NxReleaseArgs & GitCommitAndTagOptions & VersionPlanArgs & FirstReleaseArgs & {
     specifier?: string;

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

@@ -21,6 +21,7 @@ const fileutils_1 = require("../../../utils/fileutils");
 const find_matching_projects_1 = require("../../../utils/find-matching-projects");
 const output_1 = require("../../../utils/output");
 const workspace_root_1 = require("../../../utils/workspace-root");
+const path_1 = require("../../../utils/path");
 const resolve_changelog_renderer_1 = require("../utils/resolve-changelog-renderer");
 const resolve_nx_json_error_message_1 = require("../utils/resolve-nx-json-error-message");
 const conventional_commits_1 = require("./conventional-commits");
@@ -154,6 +155,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             conventionalCommits: false,
             generator: '@nx/js:release-version',
             generatorOptions: {},
+            groupPreVersionCommand: '',
         },
         changelog: {
             createRelease: false,
@@ -205,7 +207,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         WORKSPACE_DEFAULTS.versionPlans);
     const rootConventionalCommitsConfig = deepMergeDefaults([WORKSPACE_DEFAULTS.conventionalCommits], fillUnspecifiedConventionalCommitsProperties(normalizeConventionalCommitsConfig(userConfig.conventionalCommits)));
     // these options are not supported at the group level, only the root/command level
-    const rootVersionWithoutGlobalOptions = { ...rootVersionConfig };
+    const rootVersionWithoutGlobalOptions = {
+        ...rootVersionConfig,
+    };
     delete rootVersionWithoutGlobalOptions.git;
     delete rootVersionWithoutGlobalOptions.preVersionCommand;
     // Apply conventionalCommits shorthand to the final group defaults if explicitly configured in the original user config
@@ -315,7 +319,10 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             projects: matchingProjects,
             version: deepMergeDefaults(
             // First apply any group level defaults, then apply actual root level config, then group level config
-            [GROUP_DEFAULTS.version, rootVersionWithoutGlobalOptions], releaseGroup.version),
+            [
+                GROUP_DEFAULTS.version,
+                { ...rootVersionWithoutGlobalOptions, groupPreVersionCommand: '' },
+            ], releaseGroup.version),
             // If the user has set any changelog config at all, including at the root level, then use one set of defaults, otherwise default to false for the whole feature
             changelog: releaseGroup.changelog || rootChangelogConfig.projectChangelogs
                 ? deepMergeDefaults(groupChangelogDefaults, releaseGroup.changelog || {})
@@ -657,7 +664,7 @@ async function getDefaultProjects(projectGraph, projectFileMap) {
 function isProjectPublic(project, projectGraph, projectFileMap) {
     const projectNode = projectGraph.nodes[project];
     const packageJsonPath = (0, node_path_1.join)(projectNode.data.root, 'package.json');
-    if (!projectFileMap[project]?.find((f) => f.file === packageJsonPath)) {
+    if (!projectFileMap[project]?.find((f) => f.file === (0, path_1.normalizePath)(packageJsonPath))) {
         return false;
     }
     try {

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

@@ -37,7 +37,7 @@ export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, lo
 }): Promise<string>;
 export declare function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, }: {
     messages: string[];
-    additionalArgs?: string;
+    additionalArgs?: string | string[];
     dryRun?: boolean;
     verbose?: boolean;
     logFn?: (message: string) => void;
@@ -45,7 +45,7 @@ export declare function gitCommit({ messages, additionalArgs, dryRun, verbose, l
 export declare function gitTag({ tag, message, additionalArgs, dryRun, verbose, logFn, }: {
     tag: string;
     message?: string;
-    additionalArgs?: string;
+    additionalArgs?: string | string[];
     dryRun?: boolean;
     verbose?: boolean;
     logFn?: (message: string) => void;

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

@@ -188,7 +188,12 @@ async function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, })
         commandArgs.push('--message', message);
     }
     if (additionalArgs) {
-        commandArgs.push(...additionalArgs.split(' '));
+        if (Array.isArray(additionalArgs)) {
+            commandArgs.push(...additionalArgs);
+        }
+        else {
+            commandArgs.push(...additionalArgs.split(' '));
+        }
     }
     if (verbose) {
         logFn(dryRun
@@ -224,7 +229,12 @@ async function gitTag({ tag, message, additionalArgs, dryRun, verbose, logFn, })
         message || tag,
     ];
     if (additionalArgs) {
-        commandArgs.push(...additionalArgs.split(' '));
+        if (Array.isArray(additionalArgs)) {
+            commandArgs.push(...additionalArgs);
+        }
+        else {
+            commandArgs.push(...additionalArgs.split(' '));
+        }
     }
     if (verbose) {
         logFn(dryRun

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

@@ -45,7 +45,7 @@ export declare function commitChanges({ changedFiles, deletedFiles, isDryRun, is
     isDryRun?: boolean;
     isVerbose?: boolean;
     gitCommitMessages?: string[];
-    gitCommitArgs?: string;
+    gitCommitArgs?: string | string[];
 }): Promise<void>;
 export declare function createCommitMessageValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData, commitMessage: string): string[];
 export declare function createGitTagValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData): string[];

package/src/command-line/release/version.js

@@ -207,6 +207,10 @@ function createAPI(overrideReleaseConfig) {
          */
         for (const releaseGroup of releaseGroups) {
             const releaseGroupName = releaseGroup.name;
+            runPreVersionCommand(releaseGroup.version.groupPreVersionCommand, {
+                dryRun: args.dryRun,
+                verbose: args.verbose,
+            });
             const projectBatches = (0, batch_projects_by_generator_config_1.batchProjectsByGeneratorConfig)(projectGraph, releaseGroup, 
             // Batch based on all projects within the release group
             releaseGroup.projects);

package/src/command-line/sync/command-object.js

@@ -4,7 +4,7 @@ exports.yargsSyncCheckCommand = exports.yargsSyncCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsSyncCommand = {
     command: 'sync',
-    describe: false,
+    describe: 'Sync the workspace files by running all the sync generators.',
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs),
     handler: async (args) => {
         process.exit(await Promise.resolve().then(() => require('./sync')).then((m) => m.syncHandler(args)));
@@ -12,7 +12,7 @@ exports.yargsSyncCommand = {
 };
 exports.yargsSyncCheckCommand = {
     command: 'sync:check',
-    describe: false,
+    describe: 'Check that no changes are required after running all sync generators.',
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs),
     handler: async (args) => {
         process.exit(await Promise.resolve().then(() => require('./sync')).then((m) => m.syncHandler({ ...args, check: true })));

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

@@ -101,9 +101,9 @@ export interface NxReleaseGitConfiguration {
      */
     commitMessage?: string;
     /**
-     * Additional arguments (added after the --message argument, which may or may not be customized with --git-commit-message) to pass to the `git commit` command invoked behind the scenes
+     * Additional arguments (added after the --message argument, which may or may not be customized with --git-commit-message) to pass to the `git commit` command invoked behind the scenes. May be a string or array of strings.
      */
-    commitArgs?: string;
+    commitArgs?: string | string[];
     /**
      * Whether or not to stage the changes made by this command. Always treated as true if commit is true.
      */
@@ -117,9 +117,9 @@ export interface NxReleaseGitConfiguration {
      */
     tagMessage?: string;
     /**
-     * Additional arguments to pass to the `git tag` command invoked behind the scenes
+     * Additional arguments to pass to the `git tag` command invoked behind the scenes. . May be a string or array of strings.
      */
-    tagArgs?: string;
+    tagArgs?: string | string[];
 }
 export interface NxReleaseConventionalCommitsConfiguration {
     types?: Record<string, 
@@ -179,7 +179,15 @@ export interface NxReleaseConfiguration {
          *
          * NOTE: git configuration is not supported at the group level, only the root/command level
          */
-        version?: NxReleaseVersionConfiguration;
+        version?: NxReleaseVersionConfiguration & {
+            /**
+             * A command to run after validation of nx release configuration, but before versioning begins.
+             * Used for preparing build artifacts. If --dry-run is passed, the command is still executed, but
+             * with the NX_DRY_RUN environment variable set to 'true'.
+             * It will run in addition to the global `preVersionCommand`
+             */
+            groupPreVersionCommand?: string;
+        };
         /**
          * Project changelogs are disabled by default.
          *