nx 13.9.4 → 13.10.0-beta.3

package/src/{commands → command-line}/generate.js

@@ -2,49 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = exports.newWorkspace = exports.printGenHelp = void 0;
 const tslib_1 = require("tslib");
-const yargsParser = require("yargs-parser");
-const params_1 = require("../shared/params");
-const print_help_1 = require("../shared/print-help");
+const params_1 = require("../utils/params");
 const workspace_1 = require("../shared/workspace");
 const tree_1 = require("../shared/tree");
-const logger_1 = require("../shared/logger");
+const logger_1 = require("../utils/logger");
 const chalk = require("chalk");
-function throwInvalidInvocation() {
-    throw new Error(`Specify the generator name (e.g., nx generate @nrwl/workspace:library)`);
+const app_root_1 = require("nx/src/utils/app-root");
+const print_help_1 = require("nx/src/utils/print-help");
+function printChanges(fileChanges) {
+    fileChanges.forEach((f) => {
+        if (f.type === 'CREATE') {
+            console.log(`${chalk.green('CREATE')} ${f.path}`);
+        }
+        else if (f.type === 'UPDATE') {
+            console.log(`${chalk.white('UPDATE')} ${f.path}`);
+        }
+        else if (f.type === 'DELETE') {
+            console.log(`${chalk.yellow('DELETE')} ${f.path}`);
+        }
+    });
 }
-function parseGenerateOpts(args, mode, defaultCollection) {
-    const generatorOptions = (0, params_1.convertToCamelCase)(yargsParser(args, {
-        boolean: ['help', 'dryRun', 'debug', 'force', 'interactive', 'defaults'],
-        alias: {
-            dryRun: 'dry-run',
-            d: 'dryRun',
-        },
-        default: {
-            debug: false,
-            dryRun: false,
-            interactive: true,
-        },
-    }));
-    // TODO: vsavkin remove defaults in Nx 13
-    if (generatorOptions.defaults) {
-        logger_1.logger.warn(`Use --no-interactive instead of --defaults. The --defaults option will be removed in Nx 13.`);
-        generatorOptions.interactive = false;
-    }
+function convertToGenerateOptions(generatorOptions, defaultCollectionName, mode) {
     let collectionName = null;
     let generatorName = null;
     if (mode === 'generate') {
-        if (!generatorOptions['_'] ||
-            generatorOptions['_'].length === 0) {
-            throwInvalidInvocation();
-        }
-        const generatorDescriptor = generatorOptions['_'].shift();
+        const generatorDescriptor = generatorOptions['generator'];
         const separatorIndex = generatorDescriptor.lastIndexOf(':');
         if (separatorIndex > 0) {
             collectionName = generatorDescriptor.substr(0, separatorIndex);
             generatorName = generatorDescriptor.substr(separatorIndex + 1);
         }
         else {
-            collectionName = defaultCollection;
+            collectionName = defaultCollectionName;
             generatorName = generatorDescriptor;
         }
     }
@@ -60,52 +49,41 @@ function parseGenerateOpts(args, mode, defaultCollection) {
         generatorName,
         generatorOptions,
         help: generatorOptions.help,
-        debug: generatorOptions.debug,
         dryRun: generatorOptions.dryRun,
-        force: generatorOptions.force,
         interactive: generatorOptions.interactive,
         defaults: generatorOptions.defaults,
     };
-    delete generatorOptions.debug;
     delete generatorOptions.d;
     delete generatorOptions.dryRun;
-    delete generatorOptions.force;
     delete generatorOptions.interactive;
-    delete generatorOptions.defaults;
     delete generatorOptions.help;
     delete generatorOptions.collection;
+    delete generatorOptions.verbose;
+    delete generatorOptions.generator;
     delete generatorOptions['--'];
+    delete generatorOptions['$0'];
     return res;
 }
-function printGenHelp(opts, schema) {
-    (0, print_help_1.printHelp)(`nx generate ${opts.collectionName}:${opts.generatorName}`, Object.assign(Object.assign({}, schema), { properties: Object.assign(Object.assign({}, schema.properties), { dryRun: {
-                type: 'boolean',
-                default: false,
-                description: `Runs through and reports activity without writing to disk.`,
-            } }) }));
+function throwInvalidInvocation() {
+    throw new Error(`Specify the generator name (e.g., nx generate @nrwl/workspace:library)`);
 }
-exports.printGenHelp = printGenHelp;
 function readDefaultCollection(nxConfig) {
     return nxConfig.cli ? nxConfig.cli.defaultCollection : null;
 }
-function printChanges(fileChanges) {
-    fileChanges.forEach((f) => {
-        if (f.type === 'CREATE') {
-            console.log(`${chalk.green('CREATE')} ${f.path}`);
-        }
-        else if (f.type === 'UPDATE') {
-            console.log(`${chalk.white('UPDATE')} ${f.path}`);
-        }
-        else if (f.type === 'DELETE') {
-            console.log(`${chalk.yellow('DELETE')} ${f.path}`);
-        }
+function printGenHelp(opts, schema) {
+    (0, print_help_1.printHelp)(`nx generate ${opts.collectionName}:${opts.generatorName}`, Object.assign(Object.assign({}, schema), { properties: schema.properties }), {
+        mode: 'generate',
+        plugin: opts.collectionName,
+        entity: opts.generatorName,
     });
 }
-function newWorkspace(cwd, args, isVerbose = false) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+exports.printGenHelp = printGenHelp;
+function newWorkspace(cwd, args) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const ws = new workspace_1.Workspaces(null);
-        return (0, params_1.handleErrors)(isVerbose, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-            const opts = parseGenerateOpts(args, 'new', null);
+        const isVerbose = args['verbose'];
+        return (0, params_1.handleErrors)(isVerbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const opts = convertToGenerateOptions(args, null, 'new');
             const { normalizedGeneratorName, schema, implementationFactory } = ws.readGenerator(opts.collectionName, opts.generatorName);
             const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, null, schema, opts.interactive, null, null, isVerbose);
             if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {
@@ -125,18 +103,19 @@ function newWorkspace(cwd, args, isVerbose = false) {
                 }
             }
             else {
-                return (yield Promise.resolve().then(() => require('./ngcli-adapter'))).generate(cwd, Object.assign(Object.assign({}, opts), { generatorOptions: combinedOpts }), isVerbose);
+                return (yield Promise.resolve().then(() => require('../adapter/ngcli-adapter'))).generate(cwd, Object.assign(Object.assign({}, opts), { generatorOptions: combinedOpts }), isVerbose);
             }
         }));
     });
 }
 exports.newWorkspace = newWorkspace;
-function generate(cwd, root, args, isVerbose = false) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-        const ws = new workspace_1.Workspaces(root);
-        return (0, params_1.handleErrors)(isVerbose, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+function generate(cwd, args) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const ws = new workspace_1.Workspaces(app_root_1.workspaceRoot);
+        const isVerbose = args['verbose'];
+        return (0, params_1.handleErrors)(isVerbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             const workspaceDefinition = ws.readWorkspaceConfiguration();
-            const opts = parseGenerateOpts(args, 'generate', readDefaultCollection(workspaceDefinition));
+            const opts = convertToGenerateOptions(args, readDefaultCollection(workspaceDefinition), 'generate');
             const { normalizedGeneratorName, schema, implementationFactory } = ws.readGenerator(opts.collectionName, opts.generatorName);
             if (opts.help) {
                 printGenHelp(opts, schema);
@@ -144,13 +123,13 @@ function generate(cwd, root, args, isVerbose = false) {
             }
             const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, workspaceDefinition, schema, opts.interactive, ws.calculateDefaultProjectName(cwd, workspaceDefinition), ws.relativeCwd(cwd), isVerbose);
             if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {
-                const host = new tree_1.FsTree(root, isVerbose);
+                const host = new tree_1.FsTree(app_root_1.workspaceRoot, isVerbose);
                 const implementation = implementationFactory();
                 const task = yield implementation(host, combinedOpts);
                 const changes = host.listChanges();
                 printChanges(changes);
                 if (!opts.dryRun) {
-                    (0, tree_1.flushChanges)(root, changes);
+                    (0, tree_1.flushChanges)(app_root_1.workspaceRoot, changes);
                     if (task) {
                         yield task();
                     }
@@ -160,8 +139,8 @@ function generate(cwd, root, args, isVerbose = false) {
                 }
             }
             else {
-                require('../compat/compat');
-                return (yield Promise.resolve().then(() => require('./ngcli-adapter'))).generate(root, Object.assign(Object.assign({}, opts), { generatorOptions: combinedOpts }), isVerbose);
+                require('../adapter/compat');
+                return (yield Promise.resolve().then(() => require('../adapter/ngcli-adapter'))).generate(app_root_1.workspaceRoot, Object.assign(Object.assign({}, opts), { generatorOptions: combinedOpts }), isVerbose);
             }
         }));
     });

package/src/command-line/generate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":";;;;AAAA,4CAKyB;AACzB,mDAAiD;AACjD,yCAAkE;AAClE,4CAAyC;AACzC,+BAA+B;AAC/B,oDAAsD;AAEtD,wDAAoD;AAYpD,SAAS,YAAY,CAAC,WAAyB;IAC7C,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YACvB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACpD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAC/B,gBAAsC,EACtC,qBAA6B,EAC7B,IAAwB;IAExB,IAAI,cAAc,GAAkB,IAAI,CAAC;IACzC,IAAI,aAAa,GAAkB,IAAI,CAAC;IAExC,IAAI,IAAI,KAAK,UAAU,EAAE;QACvB,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,WAAW,CAAW,CAAC;QACpE,MAAM,cAAc,GAAG,mBAAmB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAE5D,IAAI,cAAc,GAAG,CAAC,EAAE;YACtB,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YAC/D,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;SAChE;aAAM;YACL,cAAc,GAAG,qBAAqB,CAAC;YACvC,aAAa,GAAG,mBAAmB,CAAC;SACrC;KACF;SAAM;QACL,cAAc,GAAG,gBAAgB,CAAC,UAAoB,CAAC;QACvD,aAAa,GAAG,KAAK,CAAC;KACvB;IAED,IAAI,CAAC,cAAc,EAAE;QACnB,sBAAsB,EAAE,CAAC;KAC1B;IAED,MAAM,GAAG,GAAG;QACV,cAAc;QACd,aAAa;QACb,gBAAgB;QAChB,IAAI,EAAE,gBAAgB,CAAC,IAAe;QACtC,MAAM,EAAE,gBAAgB,CAAC,MAAiB;QAC1C,WAAW,EAAE,gBAAgB,CAAC,WAAsB;QACpD,QAAQ,EAAE,gBAAgB,CAAC,QAAmB;KAC/C,CAAC;IAEF,OAAO,gBAAgB,CAAC,CAAC,CAAC;IAC1B,OAAO,gBAAgB,CAAC,MAAM,CAAC;IAC/B,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACpC,OAAO,gBAAgB,CAAC,IAAI,CAAC;IAC7B,OAAO,gBAAgB,CAAC,UAAU,CAAC;IACnC,OAAO,gBAAgB,CAAC,OAAO,CAAC;IAChC,OAAO,gBAAgB,CAAC,SAAS,CAAC;IAClC,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAE9B,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,sBAAsB;IAC7B,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,QAA6B;IAC1D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9D,CAAC;AAED,SAAgB,YAAY,CAAC,IAAqB,EAAE,MAAc;IAChE,IAAA,sBAAS,EACP,eAAe,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,aAAa,EAAE,kCAErD,MAAM,KACT,UAAU,EAAE,MAAM,CAAC,UAAU,KAE/B;QACE,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,IAAI,CAAC,cAAc;QAC3B,MAAM,EAAE,IAAI,CAAC,aAAa;KAC3B,CACF,CAAC;AACJ,CAAC;AAbD,oCAaC;AAED,SAAsB,YAAY,CAAC,GAAW,EAAE,IAA0B;;QACxE,MAAM,EAAE,GAAG,IAAI,sBAAU,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAElC,OAAO,IAAA,qBAAY,EAAC,SAAS,EAAE,GAAS,EAAE;YACxC,MAAM,IAAI,GAAG,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACzD,MAAM,EAAE,uBAAuB,EAAE,MAAM,EAAE,qBAAqB,EAAE,GAC9D,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAE5D,MAAM,YAAY,GAAG,MAAM,IAAA,mCAA0B,EACnD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,cAAc,EACnB,uBAAuB,EACvB,IAAI,EACJ,MAAM,EACN,IAAI,CAAC,WAAW,EAChB,IAAI,EACJ,IAAI,EACJ,SAAS,CACV,CAAC;YAEF,IAAI,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,uBAAuB,CAAC,EAAE;gBAClE,MAAM,IAAI,GAAG,IAAI,aAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBACxC,MAAM,cAAc,GAAG,qBAAqB,EAAE,CAAC;gBAC/C,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBACtD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEnC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;oBAChB,IAAA,mBAAY,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBAC3B,IAAI,IAAI,EAAE;wBACR,MAAM,IAAI,EAAE,CAAC;qBACd;iBACF;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;iBACtE;aACF;iBAAM;gBACL,OAAO,CAAC,2CAAa,0BAA0B,EAAC,CAAC,CAAC,QAAQ,CACxD,GAAG,kCAEE,IAAI,KACP,gBAAgB,EAAE,YAAY,KAEhC,SAAS,CACV,CAAC;aACH;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;AA/CD,oCA+CC;AAED,SAAsB,QAAQ,CAAC,GAAW,EAAE,IAA0B;;QACpE,MAAM,EAAE,GAAG,IAAI,sBAAU,CAAC,wBAAa,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAElC,OAAO,IAAA,qBAAY,EAAC,SAAS,EAAE,GAAS,EAAE;YACxC,MAAM,mBAAmB,GAAG,EAAE,CAAC,0BAA0B,EAAE,CAAC;YAC5D,MAAM,IAAI,GAAG,wBAAwB,CACnC,IAAI,EACJ,qBAAqB,CAAC,mBAAmB,CAAC,EAC1C,UAAU,CACX,CAAC;YACF,MAAM,EAAE,uBAAuB,EAAE,MAAM,EAAE,qBAAqB,EAAE,GAC9D,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAE5D,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC3B,OAAO,CAAC,CAAC;aACV;YAED,MAAM,YAAY,GAAG,MAAM,IAAA,mCAA0B,EACnD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,cAAc,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,MAAM,EACN,IAAI,CAAC,WAAW,EAChB,EAAE,CAAC,2BAA2B,CAAC,GAAG,EAAE,mBAAmB,CAAC,EACxD,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EACnB,SAAS,CACV,CAAC;YAEF,IAAI,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,uBAAuB,CAAC,EAAE;gBAClE,MAAM,IAAI,GAAG,IAAI,aAAM,CAAC,wBAAa,EAAE,SAAS,CAAC,CAAC;gBAClD,MAAM,cAAc,GAAG,qBAAqB,EAAE,CAAC;gBAC/C,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBACtD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEnC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;oBAChB,IAAA,mBAAY,EAAC,wBAAa,EAAE,OAAO,CAAC,CAAC;oBACrC,IAAI,IAAI,EAAE;wBACR,MAAM,IAAI,EAAE,CAAC;qBACd;iBACF;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;iBACtE;aACF;iBAAM;gBACL,OAAO,CAAC,mBAAmB,CAAC,CAAC;gBAC7B,OAAO,CAAC,2CAAa,0BAA0B,EAAC,CAAC,CAAC,QAAQ,CACxD,wBAAa,kCAER,IAAI,KACP,gBAAgB,EAAE,YAAY,KAEhC,SAAS,CACV,CAAC;aACH;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;AA1DD,4BA0DC"}

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

@@ -0,0 +1 @@
+export declare function workspaceLint(): Promise<void>;

package/src/command-line/lint.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.workspaceLint = void 0;
+const tslib_1 = require("tslib");
+const workspace_integrity_checks_1 = require("./workspace-integrity-checks");
+const file_utils_1 = require("../core/file-utils");
+const output_1 = require("../utils/output");
+const path = require("path");
+const project_graph_1 = require("../core/project-graph/project-graph");
+const operators_1 = require("../core/project-graph/operators");
+function workspaceLint() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const graph = yield (0, project_graph_1.createProjectGraphAsync)();
+        const allWorkspaceFiles = graph.allWorkspaceFiles;
+        const projectGraph = (0, operators_1.pruneExternalNodes)(graph);
+        const cliErrorOutputConfigs = new workspace_integrity_checks_1.WorkspaceIntegrityChecks(projectGraph, readAllFilesFromAppsAndLibs(allWorkspaceFiles)).run();
+        if (cliErrorOutputConfigs.length > 0) {
+            cliErrorOutputConfigs.forEach((errorConfig) => {
+                output_1.output.error(errorConfig);
+            });
+            process.exit(1);
+        }
+    });
+}
+exports.workspaceLint = workspaceLint;
+function readAllFilesFromAppsAndLibs(allWorkspaceFiles) {
+    const wl = (0, file_utils_1.workspaceLayout)();
+    return allWorkspaceFiles
+        .map((f) => f.file)
+        .filter((f) => f.startsWith(`${wl.appsDir}/`) || f.startsWith(`${wl.libsDir}/`))
+        .filter((f) => !path.basename(f).startsWith('.'));
+}
+//# sourceMappingURL=lint.js.map

package/src/command-line/lint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/lint.ts"],"names":[],"mappings":";;;;AAAA,6EAAwE;AACxE,mDAA+D;AAC/D,4CAAyC;AACzC,6BAA6B;AAC7B,uEAA8E;AAC9E,+DAAqE;AAErE,SAAsB,aAAa;;QACjC,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QAClD,MAAM,YAAY,GAAG,IAAA,8BAAkB,EAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,qBAAqB,GAAG,IAAI,qDAAwB,CACxD,YAAY,EACZ,2BAA2B,CAAC,iBAAiB,CAAC,CAC/C,CAAC,GAAG,EAAE,CAAC;QAER,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,qBAAqB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBAC5C,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAhBD,sCAgBC;AAED,SAAS,2BAA2B,CAAC,iBAA6B;IAChE,MAAM,EAAE,GAAG,IAAA,4BAAe,GAAE,CAAC;IAC7B,OAAO,iBAAiB;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,GAAG,CAAC,CACxE;SACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AACtD,CAAC"}

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

@@ -0,0 +1,13 @@
+export interface ListArgs {
+    /** The name of an installed plugin to query  */
+    plugin?: string | undefined;
+}
+/**
+ * List available plugins or capabilities within a specific plugin
+ *
+ * @remarks
+ *
+ * Must be run within an Nx workspace
+ *
+ */
+export declare function listHandler(args: ListArgs): Promise<void>;

package/src/command-line/list.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listHandler = void 0;
+const tslib_1 = require("tslib");
+const app_root_1 = require("nx/src/utils/app-root");
+const output_1 = require("../utils/output");
+const plugins_1 = require("../utils/plugins");
+/**
+ * List available plugins or capabilities within a specific plugin
+ *
+ * @remarks
+ *
+ * Must be run within an Nx workspace
+ *
+ */
+function listHandler(args) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (args.plugin) {
+            (0, plugins_1.listPluginCapabilities)(args.plugin);
+        }
+        else {
+            const corePlugins = (0, plugins_1.fetchCorePlugins)();
+            const communityPlugins = yield (0, plugins_1.fetchCommunityPlugins)().catch(() => {
+                output_1.output.warn({
+                    title: `Community plugins:`,
+                    bodyLines: [`Error fetching plugins.`],
+                });
+                return [];
+            });
+            const installedPlugins = (0, plugins_1.getInstalledPluginsFromPackageJson)(app_root_1.appRootPath, corePlugins, communityPlugins);
+            (0, plugins_1.listInstalledPlugins)(installedPlugins);
+            (0, plugins_1.listCorePlugins)(installedPlugins, corePlugins);
+            (0, plugins_1.listCommunityPlugins)(installedPlugins, communityPlugins);
+            output_1.output.note({
+                title: `Use "nx list [plugin]" to find out more`,
+            });
+        }
+    });
+}
+exports.listHandler = listHandler;
+//# sourceMappingURL=list.js.map

package/src/command-line/list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/list.ts"],"names":[],"mappings":";;;;AAAA,oDAAoD;AACpD,4CAAyC;AACzC,8CAQ0B;AAO1B;;;;;;;GAOG;AACH,SAAsB,WAAW,CAAC,IAAc;;QAC9C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAA,gCAAsB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,IAAA,0BAAgB,GAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAqB,GAAE,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChE,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,oBAAoB;oBAC3B,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAC;gBAEH,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,IAAA,4CAAkC,EACzD,sBAAW,EACX,WAAW,EACX,gBAAgB,CACjB,CAAC;YACF,IAAA,8BAAoB,EAAC,gBAAgB,CAAC,CAAC;YACvC,IAAA,yBAAe,EAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;YAC/C,IAAA,8BAAoB,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;YAEzD,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,yCAAyC;aACjD,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AA3BD,kCA2BC"}

package/src/{commands → command-line}/migrate.d.ts

@@ -72,6 +72,10 @@ declare type RunMigrations = {
     type: 'runMigrations';
     runMigrations: string;
 };
-export declare function parseMigrationsOptions(args: string[]): GenerateMigrations | RunMigrations;
-export declare function migrate(root: string, args: string[], isVerbose?: boolean): Promise<any>;
+export declare function parseMigrationsOptions(options: {
+    [k: string]: any;
+}): GenerateMigrations | RunMigrations;
+export declare function migrate(root: string, args: {
+    [k: string]: any;
+}): Promise<any>;
 export {};

package/src/{commands → command-line}/migrate.js

@@ -4,13 +4,12 @@ exports.migrate = exports.parseMigrationsOptions = exports.Migrator = exports.no
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const fs_extra_1 = require("fs-extra");
-const yargsParser = require("yargs-parser");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const tmp_1 = require("tmp");
-const logger_1 = require("../shared/logger");
-const params_1 = require("../shared/params");
-const package_manager_1 = require("../shared/package-manager");
+const logger_1 = require("../utils/logger");
+const params_1 = require("../utils/params");
+const package_manager_1 = require("../utils/package-manager");
 const tree_1 = require("../shared/tree");
 const fileutils_1 = require("../utils/fileutils");
 function normalizeVersion(version) {
@@ -61,15 +60,15 @@ class Migrator {
         this.to = opts.to;
     }
     updatePackageJson(targetPackage, targetVersion) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const packageJson = yield this._updatePackageJson(targetPackage, { version: targetVersion, addToPackageJson: false }, {});
             const migrations = yield this._createMigrateJson(packageJson);
             return { packageJson, migrations };
         });
     }
     _createMigrateJson(versions) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-            const migrations = yield Promise.all(Object.keys(versions).map((c) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const migrations = yield Promise.all(Object.keys(versions).map((c) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const currentVersion = this.versions(c);
                 if (currentVersion === null)
                     return [];
@@ -88,7 +87,7 @@ class Migrator {
         });
     }
     _updatePackageJson(targetPackage, target, collectedVersions) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let targetVersion = target.version;
             if (this.to[targetPackage]) {
                 targetVersion = this.to[targetPackage];
@@ -153,6 +152,7 @@ class Migrator {
                     '@nrwl/express',
                     '@nrwl/jest',
                     '@nrwl/js',
+                    '@nrwl/cli',
                     '@nrwl/linter',
                     '@nrwl/nest',
                     '@nrwl/next',
@@ -266,13 +266,7 @@ function parseTargetPackageAndVersion(args) {
         }
     }
 }
-function parseMigrationsOptions(args) {
-    const options = (0, params_1.convertToCamelCase)(yargsParser(args, {
-        string: ['runMigrations', 'from', 'to'],
-        alias: {
-            runMigrations: 'run-migrations',
-        },
-    }));
+function parseMigrationsOptions(options) {
     if (options.runMigrations === '') {
         options.runMigrations = 'migrations.json';
     }
@@ -281,7 +275,7 @@ function parseMigrationsOptions(args) {
             ? versionOverrides(options.from, 'from')
             : {};
         const to = options.to ? versionOverrides(options.to, 'to') : {};
-        const { targetPackage, targetVersion } = parseTargetPackageAndVersion(args[0]);
+        const { targetPackage, targetVersion } = parseTargetPackageAndVersion(options['packageAndVersion']);
         return {
             type: 'generateMigrations',
             targetPackage: slash(targetPackage),
@@ -318,7 +312,7 @@ function versions(root, from) {
 function createFetcher() {
     const cache = {};
     return function f(packageName, packageVersion) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!cache[`${packageName}-${packageVersion}`]) {
                 const dir = (0, tmp_1.dirSync)().name;
                 const npmrc = checkForNPMRC();
@@ -422,7 +416,7 @@ function updatePackageJson(root, updatedPackages) {
     });
 }
 function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const pmc = (0, package_manager_1.getPackageManagerCommand)();
         try {
             logger_1.logger.info(`Fetching meta data about packages.`);
@@ -467,73 +461,42 @@ function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
 function showConnectToCloudMessage() {
     try {
         const nxJson = (0, fileutils_1.readJsonFile)('nx.json');
-        const defaultRunnerIsUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/workspace/tasks-runners/default');
+        const defaultRunnerIsUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/workspace/tasks-runners/default' ||
+            r.runner == 'nx/tasks-runners/default');
         return !!defaultRunnerIsUsed;
     }
     catch (_a) {
         return false;
     }
 }
-function installAngularDevkitIfNecessaryToExecuteLegacyMigrations(migrations) {
-    const hasAngularDevkitMigrations = migrations.find((m) => m.cli === undefined || m.cli === 'angular');
-    if (!hasAngularDevkitMigrations)
-        return false;
-    const pmCommands = (0, package_manager_1.getPackageManagerCommand)();
-    const devkitInstalled = (0, child_process_1.execSync)(`${pmCommands.list} @angular-devkit/schematics`)
-        .toString()
-        .indexOf(`@angular-devkit/schematics`) > -1;
-    if (devkitInstalled)
-        return false;
-    logger_1.logger.info(`NX Temporary installing necessary packages to run old migrations.`);
-    logger_1.logger.info(`The packages will be deleted once migrations run successfully.`);
-    (0, child_process_1.execSync)(`${pmCommands.add} @angular-devkit/core`);
-    (0, child_process_1.execSync)(`${pmCommands.add} @angular-devkit/schematics`);
-    return true;
-}
-function removeAngularDevkitMigrations() {
-    const pmCommands = (0, package_manager_1.getPackageManagerCommand)();
-    (0, child_process_1.execSync)(`${pmCommands.rm} @angular-devkit/schematics`);
-    (0, child_process_1.execSync)(`${pmCommands.rm} @angular-devkit/core`);
-}
 function runInstall() {
     const pmCommands = (0, package_manager_1.getPackageManagerCommand)();
     logger_1.logger.info(`NX Running '${pmCommands.install}' to make sure necessary packages are installed`);
     (0, child_process_1.execSync)(pmCommands.install, { stdio: [0, 1, 2] });
 }
 function runMigrations(root, opts, isVerbose) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (!process.env.NX_MIGRATE_SKIP_INSTALL) {
             runInstall();
         }
         logger_1.logger.info(`NX Running migrations from '${opts.runMigrations}'`);
         const migrations = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, opts.runMigrations)).migrations;
-        // TODO: reenable after removing devkit
-        // const installed = installAngularDevkitIfNecessaryToExecuteLegacyMigrations(
-        //   migrations
-        // );
-        try {
-            for (let m of migrations) {
-                logger_1.logger.info(`Running migration ${m.name}`);
-                if (m.cli === 'nx') {
-                    yield runNxMigration(root, m.package, m.name);
-                }
-                else {
-                    yield (yield Promise.resolve().then(() => require('./ngcli-adapter'))).runMigration(root, m.package, m.name, isVerbose);
-                }
-                logger_1.logger.info(`Successfully finished ${m.name}`);
-                logger_1.logger.info(`---------------------------------------------------------`);
+        for (let m of migrations) {
+            logger_1.logger.info(`Running migration ${m.name}`);
+            if (m.cli === 'nx') {
+                yield runNxMigration(root, m.package, m.name);
             }
-            logger_1.logger.info(`NX Successfully finished running migrations from '${opts.runMigrations}'`);
-        }
-        finally {
-            // if (installed) {
-            //   removeAngularDevkitMigrations();
-            // }
+            else {
+                yield (yield Promise.resolve().then(() => require('../adapter/ngcli-adapter'))).runMigration(root, m.package, m.name, isVerbose);
+            }
+            logger_1.logger.info(`Successfully finished ${m.name}`);
+            logger_1.logger.info(`---------------------------------------------------------`);
         }
+        logger_1.logger.info(`NX Successfully finished running migrations from '${opts.runMigrations}'`);
     });
 }
 function runNxMigration(root, packageName, name) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const collectionPath = packageToMigrationsFilePath(packageName, root);
         const collection = (0, fileutils_1.readJsonFile)(collectionPath);
         const g = collection.generators || collection.schematics;
@@ -555,15 +518,15 @@ function runNxMigration(root, packageName, name) {
         (0, tree_1.flushChanges)(root, changes);
     });
 }
-function migrate(root, args, isVerbose = false) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-        return (0, params_1.handleErrors)(isVerbose, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+function migrate(root, args) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, params_1.handleErrors)(args['verbose'], () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             const opts = parseMigrationsOptions(args);
             if (opts.type === 'generateMigrations') {
                 yield generateMigrationsJsonAndUpdatePackageJson(root, opts);
             }
             else {
-                yield runMigrations(root, opts, isVerbose);
+                yield runMigrations(root, opts, args['verbose']);
             }
         }));
     });

package/src/command-line/migrate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}

package/src/command-line/nx-commands.d.ts

@@ -0,0 +1,9 @@
+import * as yargs from 'yargs';
+/**
+ * Exposing the Yargs commands object so the documentation generator can
+ * parse it. The CLI will consume it and call the `.argv` to bootstrapped
+ * the CLI. These command declarations needs to be in a different file
+ * from the `.argv` call, so the object and it's relative scripts can
+ * le executed correctly.
+ */
+export declare const commandsObject: yargs.Argv<unknown>;