nx 19.7.4 → 19.8.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.7.4",
+  "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.4"
+    "@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.4",
-    "@nx/nx-darwin-arm64": "19.7.4",
-    "@nx/nx-linux-x64-gnu": "19.7.4",
-    "@nx/nx-linux-x64-musl": "19.7.4",
-    "@nx/nx-win32-x64-msvc": "19.7.4",
-    "@nx/nx-linux-arm64-gnu": "19.7.4",
-    "@nx/nx-linux-arm64-musl": "19.7.4",
-    "@nx/nx-linux-arm-gnueabihf": "19.7.4",
-    "@nx/nx-win32-arm64-msvc": "19.7.4",
-    "@nx/nx-freebsd-x64": "19.7.4"
+    "@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/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`,

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,7 +127,7 @@ const npmPackageToPluginMap = {
     'react-native': '@nx/react-native',
     '@remix-run/dev': '@nx/remix',
 };
-async function detectPlugins(nxJson, interactive) {
+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;
@@ -149,7 +149,13 @@ 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);
             }

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 })));