diff --git a/package.json b/package.json index 716b5b8f4a85..4e82202d4861 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@lerna/project": "^3.21.0", "@ovh-ux/codename-generator": "^1.0.0", "babel-eslint": "^10.1.0", - "commander": "^6.0.0", + "commander": "^8.0.0", "concat-stream": "^2.0.0", "conventional-changelog-cli": "^2.0.25", "conventional-commits-parser": "^3.0.5", diff --git a/packages/manager/tools/codename-generator/bin/cli.js b/packages/manager/tools/codename-generator/bin/cli.js index 49685f2341f4..03df0fa5e8f2 100755 --- a/packages/manager/tools/codename-generator/bin/cli.js +++ b/packages/manager/tools/codename-generator/bin/cli.js @@ -14,9 +14,9 @@ program .option('-d, --date ', 'date to encode', moment().format('Y-MM-DD')) .option('-v, --verbose', 'verbose', false) .action(() => { - const { date, seed } = program; + const { date, seed, verbose } = program.opts(); - if (program.verbose) { + if (verbose) { console.log('📅 date : ', date); console.log('🎲 seed : ', seed); } diff --git a/packages/manager/tools/codename-generator/package.json b/packages/manager/tools/codename-generator/package.json index 8f04f55a58ba..2fb27960fd22 100644 --- a/packages/manager/tools/codename-generator/package.json +++ b/packages/manager/tools/codename-generator/package.json @@ -19,7 +19,7 @@ "codename-generator": "bin/cli.js" }, "dependencies": { - "commander": "^6.0.0", + "commander": "^8.0.0", "moment": "^2.24.0", "shuffle-seed": "^1.1.6", "titleize": "^2.1.0" diff --git a/packages/manager/tools/dev-server/bin/manager-dev-server.js b/packages/manager/tools/dev-server/bin/manager-dev-server.js index ec109e79bbe9..17c4501a2bbb 100755 --- a/packages/manager/tools/dev-server/bin/manager-dev-server.js +++ b/packages/manager/tools/dev-server/bin/manager-dev-server.js @@ -40,8 +40,9 @@ if (program.args.length === 0) { } const [path] = program.args; -devServer(path, program.region, program.port, { - local2API: program.local2API, - localRegistry: program.localRegistry, - registryUrl: program.registryUrl, +const { local2API, localRegistry, port, region, registryUrl } = program.opts(); +devServer(path, region, port, { + local2API, + localRegistry, + registryUrl, }); diff --git a/packages/manager/tools/dev-server/package.json b/packages/manager/tools/dev-server/package.json index 9877bff1977b..2cb1ce3b5637 100644 --- a/packages/manager/tools/dev-server/package.json +++ b/packages/manager/tools/dev-server/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@ovh-ux/manager-dev-server-config": "^2.0.0", - "commander": "^6.0.0", + "commander": "^8.0.0", "express": "^4.17.1", "http-proxy-middleware": "^1.0.4" }, diff --git a/packages/manager/tools/registry/package.json b/packages/manager/tools/registry/package.json index 1f1da4dc48d7..4349e46ffe2b 100644 --- a/packages/manager/tools/registry/package.json +++ b/packages/manager/tools/registry/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "axios": "^0.19.2", - "commander": "^4.0.0", + "commander": "^8.0.0", "express": "^4.17.1", "fs-extra": "^9.0.1", "multimatch": "^4.0.0", diff --git a/scripts/release.js b/scripts/release.js index 19fc876fbdb1..c3f0e35a915f 100755 --- a/scripts/release.js +++ b/scripts/release.js @@ -50,52 +50,54 @@ program 'Force a release as patch, minor or major', ) .action(() => { - if (!program.token) { + const options = program.opts(); + + if (!options.token) { console.warn('Missing option, no github release will be done!'); } return Promise.resolve() - .then(() => (program.check ? checkChanges() : false)) - .then(() => getChangedRepositories(program.force)) + .then(() => (options.check ? checkChanges() : false)) + .then(() => getChangedRepositories(options.force)) .then((repos) => bumpRepositories( repos, - program.releaseType || null, - program.preRelease || false, - program.preId || null, - !program.noPreReleaseFileCheck || true, + options.releaseType || null, + options.preRelease || false, + options.preId || null, + !options.noPreReleaseFileCheck || true, ), ) .then(updateChangelogs) .then((repos) => getDependenciesToUpdate(repos) .then((deps) => - program.dependencyCheck ? checkDependencies(deps) : deps, + options.dependencyCheck ? checkDependencies(deps) : deps, ) .then(updateDependencies) .then(() => repos), ) .then((repos) => { - if (program.changelog) { - writeChangelog(program.changelog, repos).then(() => repos); + if (options.changelog) { + writeChangelog(options.changelog, repos).then(() => repos); } return repos; }) .then((repos) => { - if (program.release && repos.length) { - return getReleaseVersion(program.releaseName, program.seed) + if (options.release && repos.length) { + return getReleaseVersion(options.releaseName, options.seed) .then((version) => release(version, repos)) .then((version) => { - if (program.token && program.organization) { - const options = { - draft: program.draftRelease || false, - prerelease: program.preRelease || false, + if (options.token && options.organization) { + const releaseOptions = { + draft: options.draftRelease || false, + prerelease: options.preRelease || false, }; return releaseGithub( - program.token, - program.organization, + options.token, + options.organization, version, repos, - options, + releaseOptions, ); } return undefined; diff --git a/scripts/split.js b/scripts/split.js index 9bf7ead5d86e..00a4148de908 100755 --- a/scripts/split.js +++ b/scripts/split.js @@ -120,8 +120,9 @@ program '-r, --remote [remote]', 'remote url (like git@github.com:ovh-ux/manager.git)', ) - .on('--help', () => { - console.log(` + .addHelpText( + 'after', + ` Examples: * Split a module: @@ -135,15 +136,17 @@ Examples: * Split a module and push it to another repository: $ split @ovh-ux/manager-core --remote git@github.com:ovh-ux/manager.git - `); - }) + `, + ) .action(() => { const [packageName] = program.args; + const { branch, push, remote } = program.opts(); + if (packageName) { split(packageName, { - branch: program.branch || false, - push: program.push, - remote: program.remote || false, + branch: branch || false, + push, + remote: remote || false, }); } else { program.outputHelp(); diff --git a/yarn.lock b/yarn.lock index b4ba16e7083f..97091942137d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6788,21 +6788,21 @@ commander@5.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -commander@^4.0.0, commander@^4.1.1: +commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.0.0.tgz#2b270da94f8fb9014455312f829a1129dbf8887e" - integrity sha512-s7EA+hDtTYNhuXkTlhqew4txMZVdszBmKWSPEMxGr8ru8JXR7bLUFIAtPhcSuFdJQ0ILMxnJi8GkQL0yvDy/YA== - commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +commander@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.0.0.tgz#1da2139548caef59bd23e66d18908dfb54b02258" + integrity sha512-Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ== + commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"