nx 15.7.0 → 15.8.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/nx.js +13 -1
- package/bin/nx.js.map +1 -1
- package/package.json +13 -13
- package/src/command-line/examples.js +4 -0
- package/src/command-line/examples.js.map +1 -1
- package/src/command-line/init.js +24 -1
- package/src/command-line/init.js.map +1 -1
- package/src/command-line/migrate.d.ts +4 -4
- package/src/command-line/migrate.js +42 -13
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +3 -5
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/report.js +22 -6
- package/src/command-line/report.js.map +1 -1
- package/src/config/nx-json.d.ts +18 -0
- package/src/config/workspaces.js +8 -2
- package/src/config/workspaces.js.map +1 -1
- package/src/generators/utils/deprecated.js +2 -1
- package/src/generators/utils/deprecated.js.map +1 -1
- package/src/nx-init/encapsulated/add-nx-scripts.d.ts +4 -0
- package/src/nx-init/encapsulated/add-nx-scripts.js +70 -0
- package/src/nx-init/encapsulated/add-nx-scripts.js.map +1 -0
- package/src/nx-init/encapsulated/nxw.d.ts +1 -0
- package/src/nx-init/encapsulated/nxw.js +70 -0
- package/src/nx-init/encapsulated/nxw.js.map +1 -0
- package/src/plugins/js/project-graph/build-nodes/build-npm-package-nodes.js +6 -2
- package/src/plugins/js/project-graph/build-nodes/build-npm-package-nodes.js.map +1 -1
- package/src/project-graph/affected/locators/project-glob-changes.js +2 -1
- package/src/project-graph/affected/locators/project-glob-changes.js.map +1 -1
- package/src/project-graph/build-project-graph.js +10 -2
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/file-utils.js +6 -1
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/tasks-runner/create-task-graph.js +10 -2
- package/src/tasks-runner/create-task-graph.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +9 -1
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/utils/cache-directory.js +8 -2
- package/src/utils/cache-directory.js.map +1 -1
- package/src/utils/create-package-json.js +8 -16
- package/src/utils/create-package-json.js.map +1 -1
- package/src/utils/nx-plugin.d.ts +5 -0
- package/src/utils/nx-plugin.js +11 -4
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/print-help.js +35 -1
- package/src/utils/print-help.js.map +1 -1
- package/src/utils/workspace-root.js +10 -1
- package/src/utils/workspace-root.js.map +1 -1
package/bin/nx.js
CHANGED
|
@@ -5,6 +5,7 @@ const find_workspace_root_1 = require("../src/utils/find-workspace-root");
|
|
|
5
5
|
const chalk = require("chalk");
|
|
6
6
|
const init_local_1 = require("./init-local");
|
|
7
7
|
const output_1 = require("../src/utils/output");
|
|
8
|
+
const path_1 = require("path");
|
|
8
9
|
const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
|
|
9
10
|
// new is a special case because there is no local workspace to load
|
|
10
11
|
if (process.argv[2] === 'new' ||
|
|
@@ -63,12 +64,23 @@ else {
|
|
|
63
64
|
}
|
|
64
65
|
}
|
|
65
66
|
function resolveNx(workspace) {
|
|
67
|
+
// prefer Nx installed in .nx/installation
|
|
68
|
+
try {
|
|
69
|
+
return require.resolve('nx/bin/nx.js', {
|
|
70
|
+
paths: workspace
|
|
71
|
+
? [(0, path_1.join)(workspace.dir, '.nx', 'installation')]
|
|
72
|
+
: undefined,
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
catch (_a) { }
|
|
76
|
+
// check for root install
|
|
66
77
|
try {
|
|
67
78
|
return require.resolve('nx/bin/nx.js', {
|
|
68
79
|
paths: workspace ? [workspace.dir] : undefined,
|
|
69
80
|
});
|
|
70
81
|
}
|
|
71
|
-
catch (
|
|
82
|
+
catch (_b) {
|
|
83
|
+
// fallback for old CLI install setup
|
|
72
84
|
return require.resolve('@nrwl/cli/bin/nx.js', {
|
|
73
85
|
paths: workspace ? [workspace.dir] : undefined,
|
|
74
86
|
});
|
package/bin/nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":";;;AACA,0EAG0C;AAC1C,+BAA+B;AAC/B,6CAAyC;AAEzC,gDAA6C;
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.8.0-beta.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
},
|
|
33
33
|
"homepage": "https://nx.dev",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/cli": "15.
|
|
36
|
-
"@nrwl/tao": "15.
|
|
35
|
+
"@nrwl/cli": "15.8.0-beta.0",
|
|
36
|
+
"@nrwl/tao": "15.8.0-beta.0",
|
|
37
37
|
"@parcel/watcher": "2.0.4",
|
|
38
38
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
39
39
|
"@yarnpkg/parsers": "^3.0.0-rc.18",
|
|
@@ -81,15 +81,15 @@
|
|
|
81
81
|
}
|
|
82
82
|
},
|
|
83
83
|
"optionalDependencies": {
|
|
84
|
-
"@nrwl/nx-darwin-arm64": "15.
|
|
85
|
-
"@nrwl/nx-darwin-x64": "15.
|
|
86
|
-
"@nrwl/nx-linux-arm-gnueabihf": "15.
|
|
87
|
-
"@nrwl/nx-linux-arm64-gnu": "15.
|
|
88
|
-
"@nrwl/nx-linux-arm64-musl": "15.
|
|
89
|
-
"@nrwl/nx-linux-x64-gnu": "15.
|
|
90
|
-
"@nrwl/nx-linux-x64-musl": "15.
|
|
91
|
-
"@nrwl/nx-win32-arm64-msvc": "15.
|
|
92
|
-
"@nrwl/nx-win32-x64-msvc": "15.
|
|
84
|
+
"@nrwl/nx-darwin-arm64": "15.8.0-beta.0",
|
|
85
|
+
"@nrwl/nx-darwin-x64": "15.8.0-beta.0",
|
|
86
|
+
"@nrwl/nx-linux-arm-gnueabihf": "15.8.0-beta.0",
|
|
87
|
+
"@nrwl/nx-linux-arm64-gnu": "15.8.0-beta.0",
|
|
88
|
+
"@nrwl/nx-linux-arm64-musl": "15.8.0-beta.0",
|
|
89
|
+
"@nrwl/nx-linux-x64-gnu": "15.8.0-beta.0",
|
|
90
|
+
"@nrwl/nx-linux-x64-musl": "15.8.0-beta.0",
|
|
91
|
+
"@nrwl/nx-win32-arm64-msvc": "15.8.0-beta.0",
|
|
92
|
+
"@nrwl/nx-win32-x64-msvc": "15.8.0-beta.0"
|
|
93
93
|
},
|
|
94
94
|
"nx-migrations": {
|
|
95
95
|
"migrations": "./migrations.json",
|
|
@@ -148,5 +148,5 @@
|
|
|
148
148
|
},
|
|
149
149
|
"main": "./bin/nx.js",
|
|
150
150
|
"types": "./bin/nx.d.ts",
|
|
151
|
-
"gitHead": "
|
|
151
|
+
"gitHead": "ae5d6e5c48bd4684f341206d2249a0f5783cb4bb"
|
|
152
152
|
}
|
|
@@ -294,6 +294,10 @@ exports.examples = {
|
|
|
294
294
|
command: 'migrate another-package@12.0.0',
|
|
295
295
|
description: 'Update another-package to "12.0.0". This will update other packages and will generate migrations.json file',
|
|
296
296
|
},
|
|
297
|
+
{
|
|
298
|
+
command: 'migrate latest --interactive',
|
|
299
|
+
description: 'Collect package updates and migrations in interactive mode. In this mode, the user will be prompted whether to apply any optional package update and migration',
|
|
300
|
+
},
|
|
297
301
|
{
|
|
298
302
|
command: 'migrate --run-migrations=migrations.json',
|
|
299
303
|
description: 'Run migrations from the provided migrations.json file. You can modify migrations.json and run this command many times',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examples.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/examples.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"examples.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/examples.ts"],"names":[],"mappings":"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"}
|
package/src/command-line/init.js
CHANGED
|
@@ -7,15 +7,38 @@ const fs_1 = require("fs");
|
|
|
7
7
|
const add_nx_to_nest_1 = require("../nx-init/add-nx-to-nest");
|
|
8
8
|
const add_nx_to_npm_repo_1 = require("../nx-init/add-nx-to-npm-repo");
|
|
9
9
|
const fileutils_1 = require("../utils/fileutils");
|
|
10
|
+
const parser = require("yargs-parser");
|
|
11
|
+
const add_nx_scripts_1 = require("../nx-init/encapsulated/add-nx-scripts");
|
|
10
12
|
function initHandler() {
|
|
11
13
|
var _a;
|
|
12
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
15
|
const args = process.argv.slice(2).join(' ');
|
|
16
|
+
const flags = parser(args, {
|
|
17
|
+
boolean: ['encapsulated'],
|
|
18
|
+
default: {
|
|
19
|
+
encapsulated: false,
|
|
20
|
+
},
|
|
21
|
+
});
|
|
14
22
|
const version = (_a = process.env.NX_VERSION) !== null && _a !== void 0 ? _a : 'latest';
|
|
15
23
|
if (process.env.NX_VERSION) {
|
|
16
24
|
console.log(`Using version ${process.env.NX_VERSION}`);
|
|
17
25
|
}
|
|
18
|
-
if (
|
|
26
|
+
if (flags.encapsulated === true) {
|
|
27
|
+
if (process.platform !== 'win32') {
|
|
28
|
+
console.log('Setting Nx up installation in `.nx`. You can run nx commands like: `./nx --help`');
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
console.log('Setting Nx up installation in `.nx`. You can run nx commands like: `./nx.bat --help`');
|
|
32
|
+
}
|
|
33
|
+
(0, add_nx_scripts_1.generateEncapsulatedNxSetup)(version);
|
|
34
|
+
if (process.platform === 'win32') {
|
|
35
|
+
(0, child_process_1.execSync)('./nx.bat', { stdio: 'inherit' });
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
(0, child_process_1.execSync)('./nx', { stdio: 'inherit' });
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
else if ((0, fs_1.existsSync)('package.json')) {
|
|
19
42
|
const packageJson = (0, fileutils_1.readJsonFile)('package.json');
|
|
20
43
|
if ((0, fs_1.existsSync)('angular.json')) {
|
|
21
44
|
// TODO(leo): remove make-angular-cli-faster
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,2BAAgC;AAChC,8DAAwD;AACxD,sEAA+D;AAC/D,kDAAmE;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { MigrationsJson, PackageJsonUpdateForPackage } from '../config/misc-interfaces';
|
|
1
|
+
import { MigrationsJson, PackageJsonUpdateForPackage as PackageUpdate } from '../config/misc-interfaces';
|
|
2
2
|
import { ArrayPackageGroup, PackageJson } from '../utils/package-json';
|
|
3
3
|
export interface ResolvedMigrationConfiguration extends MigrationsJson {
|
|
4
4
|
packageGroup?: ArrayPackageGroup;
|
|
@@ -23,11 +23,11 @@ export declare class Migrator {
|
|
|
23
23
|
private readonly installedPkgVersionOverrides;
|
|
24
24
|
private readonly to;
|
|
25
25
|
private readonly interactive;
|
|
26
|
-
private readonly
|
|
26
|
+
private readonly packageUpdates;
|
|
27
27
|
private readonly collectedVersions;
|
|
28
28
|
constructor(opts: MigratorOptions);
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
migrate(targetPackage: string, targetVersion: string): Promise<{
|
|
30
|
+
packageUpdates: Record<string, PackageUpdate>;
|
|
31
31
|
migrations: {
|
|
32
32
|
package: string;
|
|
33
33
|
name: string;
|
|
@@ -18,6 +18,7 @@ const connect_1 = require("./connect");
|
|
|
18
18
|
const output_1 = require("../utils/output");
|
|
19
19
|
const ab_testing_1 = require("../utils/ab-testing");
|
|
20
20
|
const versions_1 = require("../utils/versions");
|
|
21
|
+
const fs_1 = require("fs");
|
|
21
22
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
22
23
|
function normalizeVersion(version) {
|
|
23
24
|
const [semver, prereleaseTag] = version.split('-');
|
|
@@ -54,7 +55,7 @@ function normalizeSlashes(packageName) {
|
|
|
54
55
|
}
|
|
55
56
|
class Migrator {
|
|
56
57
|
constructor(opts) {
|
|
57
|
-
this.
|
|
58
|
+
this.packageUpdates = {};
|
|
58
59
|
this.collectedVersions = {};
|
|
59
60
|
this.packageJson = opts.packageJson;
|
|
60
61
|
this.getInstalledPackageVersion = opts.getInstalledPackageVersion;
|
|
@@ -63,23 +64,23 @@ class Migrator {
|
|
|
63
64
|
this.to = opts.to;
|
|
64
65
|
this.interactive = opts.interactive;
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
+
migrate(targetPackage, targetVersion) {
|
|
67
68
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
68
69
|
yield this.buildPackageJsonUpdates(targetPackage, {
|
|
69
70
|
version: targetVersion,
|
|
70
71
|
addToPackageJson: false,
|
|
71
72
|
});
|
|
72
73
|
const migrations = yield this.createMigrateJson();
|
|
73
|
-
return {
|
|
74
|
+
return { packageUpdates: this.packageUpdates, migrations };
|
|
74
75
|
});
|
|
75
76
|
}
|
|
76
77
|
createMigrateJson() {
|
|
77
78
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
78
|
-
const migrations = yield Promise.all(Object.keys(this.
|
|
79
|
+
const migrations = yield Promise.all(Object.keys(this.packageUpdates).map((packageName) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
79
80
|
const currentVersion = this.getPkgVersion(packageName);
|
|
80
81
|
if (currentVersion === null)
|
|
81
82
|
return [];
|
|
82
|
-
const { version } = this.
|
|
83
|
+
const { version } = this.packageUpdates[packageName];
|
|
83
84
|
const { generators } = yield this.fetch(packageName, version);
|
|
84
85
|
if (!generators)
|
|
85
86
|
return [];
|
|
@@ -245,9 +246,9 @@ class Migrator {
|
|
|
245
246
|
return filteredPackageJsonUpdates;
|
|
246
247
|
}
|
|
247
248
|
addPackageJsonUpdate(name, packageUpdate) {
|
|
248
|
-
if (!this.
|
|
249
|
-
this.gt(packageUpdate.version, this.
|
|
250
|
-
this.
|
|
249
|
+
if (!this.packageUpdates[name] ||
|
|
250
|
+
this.gt(packageUpdate.version, this.packageUpdates[name].version)) {
|
|
251
|
+
this.packageUpdates[name] = packageUpdate;
|
|
251
252
|
}
|
|
252
253
|
}
|
|
253
254
|
areRequirementsMet(requirements, extraPackageUpdatesToCheck) {
|
|
@@ -260,8 +261,8 @@ class Migrator {
|
|
|
260
261
|
(0, semver_1.satisfies)(this.getPkgVersion(pkgName), versionRange, {
|
|
261
262
|
includePrerelease: true,
|
|
262
263
|
})) ||
|
|
263
|
-
(((_a = this.
|
|
264
|
-
(0, semver_1.satisfies)(this.
|
|
264
|
+
(((_a = this.packageUpdates[pkgName]) === null || _a === void 0 ? void 0 : _a.version) &&
|
|
265
|
+
(0, semver_1.satisfies)(this.packageUpdates[pkgName].version, versionRange, {
|
|
265
266
|
includePrerelease: true,
|
|
266
267
|
})) ||
|
|
267
268
|
(((_b = extraPackageUpdatesToCheck === null || extraPackageUpdatesToCheck === void 0 ? void 0 : extraPackageUpdatesToCheck[pkgName]) === null || _b === void 0 ? void 0 : _b.version) &&
|
|
@@ -581,6 +582,9 @@ function createMigrationsFile(root, migrations) {
|
|
|
581
582
|
}
|
|
582
583
|
function updatePackageJson(root, updatedPackages) {
|
|
583
584
|
const packageJsonPath = (0, path_1.join)(root, 'package.json');
|
|
585
|
+
if (!(0, fs_1.existsSync)(packageJsonPath)) {
|
|
586
|
+
return;
|
|
587
|
+
}
|
|
584
588
|
const parseOptions = {};
|
|
585
589
|
const json = (0, fileutils_1.readJsonFile)(packageJsonPath, parseOptions);
|
|
586
590
|
Object.keys(updatedPackages).forEach((p) => {
|
|
@@ -603,6 +607,30 @@ function updatePackageJson(root, updatedPackages) {
|
|
|
603
607
|
appendNewLine: parseOptions.endsWithNewline,
|
|
604
608
|
});
|
|
605
609
|
}
|
|
610
|
+
function updateInstallationDetails(root, updatedPackages) {
|
|
611
|
+
var _a;
|
|
612
|
+
const nxJsonPath = (0, path_1.join)(root, 'nx.json');
|
|
613
|
+
const parseOptions = {};
|
|
614
|
+
const nxJson = (0, fileutils_1.readJsonFile)(nxJsonPath, parseOptions);
|
|
615
|
+
if (!nxJson.installation) {
|
|
616
|
+
return;
|
|
617
|
+
}
|
|
618
|
+
const nxVersion = (_a = updatedPackages.nx) === null || _a === void 0 ? void 0 : _a.version;
|
|
619
|
+
if (nxVersion) {
|
|
620
|
+
nxJson.installation.version = nxVersion;
|
|
621
|
+
}
|
|
622
|
+
if (nxJson.installation.plugins) {
|
|
623
|
+
for (const dep in nxJson.installation.plugins) {
|
|
624
|
+
const update = updatedPackages[dep];
|
|
625
|
+
if (update) {
|
|
626
|
+
nxJson.installation.plugins[dep] = update.version;
|
|
627
|
+
}
|
|
628
|
+
}
|
|
629
|
+
}
|
|
630
|
+
(0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson, {
|
|
631
|
+
appendNewLine: parseOptions.endsWithNewline,
|
|
632
|
+
});
|
|
633
|
+
}
|
|
606
634
|
function isMigratingToNewMajor(from, to) {
|
|
607
635
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
608
636
|
from = normalizeVersion(from);
|
|
@@ -653,11 +681,12 @@ function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
|
|
|
653
681
|
to: opts.to,
|
|
654
682
|
interactive: opts.interactive,
|
|
655
683
|
});
|
|
656
|
-
const { migrations,
|
|
657
|
-
updatePackageJson(root,
|
|
684
|
+
const { migrations, packageUpdates } = yield migrator.migrate(opts.targetPackage, opts.targetVersion);
|
|
685
|
+
updatePackageJson(root, packageUpdates);
|
|
686
|
+
updateInstallationDetails(root, packageUpdates);
|
|
658
687
|
if (migrations.length > 0) {
|
|
659
688
|
createMigrationsFile(root, [
|
|
660
|
-
...addSplitConfigurationMigrationIfAvailable(from,
|
|
689
|
+
...addSplitConfigurationMigrationIfAvailable(from, packageUpdates),
|
|
661
690
|
...migrations,
|
|
662
691
|
]);
|
|
663
692
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -727,11 +727,11 @@ function withMigrationOptions(yargs) {
|
|
|
727
727
|
type: 'string',
|
|
728
728
|
})
|
|
729
729
|
.option('from', {
|
|
730
|
-
describe: 'Use the provided versions for packages instead of the ones installed in node_modules (e.g., --from="@nrwl/react
|
|
730
|
+
describe: 'Use the provided versions for packages instead of the ones installed in node_modules (e.g., --from="@nrwl/react@12.0.0,@nrwl/js@12.0.0")',
|
|
731
731
|
type: 'string',
|
|
732
732
|
})
|
|
733
733
|
.option('to', {
|
|
734
|
-
describe: 'Use the provided versions for packages instead of the ones calculated by the migrator (e.g., --to="@nrwl/react
|
|
734
|
+
describe: 'Use the provided versions for packages instead of the ones calculated by the migrator (e.g., --to="@nrwl/react@12.0.0,@nrwl/js@12.0.0")',
|
|
735
735
|
type: 'string',
|
|
736
736
|
})
|
|
737
737
|
.option('createCommits', {
|
|
@@ -746,11 +746,9 @@ function withMigrationOptions(yargs) {
|
|
|
746
746
|
default: defaultCommitPrefix,
|
|
747
747
|
})
|
|
748
748
|
.option('interactive', {
|
|
749
|
-
describe: 'Enable prompts to confirm whether to collect
|
|
749
|
+
describe: 'Enable prompts to confirm whether to collect optional package updates and migrations',
|
|
750
750
|
type: 'boolean',
|
|
751
751
|
default: false,
|
|
752
|
-
// TODO(leo): make it visible when we publish the docs about it
|
|
753
|
-
hidden: true,
|
|
754
752
|
})
|
|
755
753
|
.check(({ createCommits, commitPrefix }) => {
|
|
756
754
|
if (!createCommits && commitPrefix !== defaultCommitPrefix) {
|