From a87bf9ab23c523ea6b6d9778e15be3078b5c03f7 Mon Sep 17 00:00:00 2001 From: eromano Date: Wed, 27 Jul 2022 09:54:50 +0200 Subject: [PATCH] fix different version commander use same commander main pkg --- lib/cli/package-lock.json | 6 +++--- lib/cli/package.json | 2 +- lib/cli/scripts/artifact-from-s3.ts | 2 +- lib/cli/scripts/artifact-to-s3.ts | 2 +- lib/cli/scripts/audit.ts | 2 +- lib/cli/scripts/changelog.ts | 2 +- lib/cli/scripts/docker.ts | 2 +- lib/cli/scripts/init-aae-env.ts | 2 +- lib/cli/scripts/kubectl-clean-app.ts | 2 +- lib/cli/scripts/kubectl-delete.ts | 2 +- lib/cli/scripts/kubectl-image.ts | 2 +- lib/cli/scripts/licenses.ts | 2 +- lib/cli/scripts/npm-publish.ts | 2 +- lib/cli/scripts/scan-env.ts | 2 +- lib/cli/scripts/update-commit-sha.ts | 2 +- lib/cli/scripts/update-version.ts | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/cli/package-lock.json b/lib/cli/package-lock.json index edf9b83245..619ea4a9c9 100644 --- a/lib/cli/package-lock.json +++ b/lib/cli/package-lock.json @@ -287,9 +287,9 @@ } }, "commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" }, "component-emitter": { "version": "1.3.0", diff --git a/lib/cli/package.json b/lib/cli/package.json index 5cf6029da6..1173fd77a4 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@alfresco/js-api": "4.12.0-197", - "commander": "^4.0.0", + "commander": "6.2.1", "ejs": "^2.6.1", "license-checker": "^25.0.1", "npm-registry-fetch": "^4.0.5", diff --git a/lib/cli/scripts/artifact-from-s3.ts b/lib/cli/scripts/artifact-from-s3.ts index 33c3639ce3..1f338f3a23 100644 --- a/lib/cli/scripts/artifact-from-s3.ts +++ b/lib/cli/scripts/artifact-from-s3.ts @@ -19,7 +19,7 @@ import { exec } from './exec'; import { logger } from './logger'; -import * as program from 'commander'; +import program from 'commander'; function test(output: string) { const response = exec('test !', [`-d ${output} && mkdir ${output}`], {}); diff --git a/lib/cli/scripts/artifact-to-s3.ts b/lib/cli/scripts/artifact-to-s3.ts index 851aaad78c..c33b1c6013 100644 --- a/lib/cli/scripts/artifact-to-s3.ts +++ b/lib/cli/scripts/artifact-to-s3.ts @@ -19,7 +19,7 @@ import { exec } from './exec'; import { logger } from './logger'; -import * as program from 'commander'; +import program from 'commander'; function zipArtifact(artifact: string) { logger.info(`Perform zip artifact ${artifact}`); diff --git a/lib/cli/scripts/audit.ts b/lib/cli/scripts/audit.ts index 9aca3c7f58..bfa4164bad 100644 --- a/lib/cli/scripts/audit.ts +++ b/lib/cli/scripts/audit.ts @@ -21,7 +21,7 @@ import * as shell from 'shelljs'; import * as ejs from 'ejs'; import * as path from 'path'; import * as fs from 'fs'; -import * as program from 'commander'; +import program from 'commander'; export default function main(_args: string[], workingDir: string) { program diff --git a/lib/cli/scripts/changelog.ts b/lib/cli/scripts/changelog.ts index e112815e42..4c61832f29 100644 --- a/lib/cli/scripts/changelog.ts +++ b/lib/cli/scripts/changelog.ts @@ -21,7 +21,7 @@ import * as shell from 'shelljs'; import * as path from 'path'; -import * as program from 'commander'; +import program from 'commander'; import * as fs from 'fs'; import * as ejs from 'ejs'; diff --git a/lib/cli/scripts/docker.ts b/lib/cli/scripts/docker.ts index a6b24321b2..bb6239a292 100644 --- a/lib/cli/scripts/docker.ts +++ b/lib/cli/scripts/docker.ts @@ -18,7 +18,7 @@ */ import { exec } from './exec'; -import * as program from 'commander'; +import program from 'commander'; import { logger } from './logger'; import { resolve } from 'path'; diff --git a/lib/cli/scripts/init-aae-env.ts b/lib/cli/scripts/init-aae-env.ts index 992688aa63..1d14262042 100644 --- a/lib/cli/scripts/init-aae-env.ts +++ b/lib/cli/scripts/init-aae-env.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import * as program from 'commander'; +import program from 'commander'; import request = require('request'); import * as fs from 'fs'; import { logger } from './logger'; diff --git a/lib/cli/scripts/kubectl-clean-app.ts b/lib/cli/scripts/kubectl-clean-app.ts index 30d3a52514..57805112c5 100644 --- a/lib/cli/scripts/kubectl-clean-app.ts +++ b/lib/cli/scripts/kubectl-clean-app.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import * as program from 'commander'; +import program from 'commander'; import moment from 'moment'; import { AlfrescoApi, AlfrescoApiConfig } from '@alfresco/js-api'; import { logger } from './logger'; diff --git a/lib/cli/scripts/kubectl-delete.ts b/lib/cli/scripts/kubectl-delete.ts index e94bdbaf2a..b3d897bc12 100644 --- a/lib/cli/scripts/kubectl-delete.ts +++ b/lib/cli/scripts/kubectl-delete.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import * as program from 'commander'; +import program from 'commander'; import * as kube from './kube-utils'; // eslint-disable-next-line prefer-arrow/prefer-arrow-functions diff --git a/lib/cli/scripts/kubectl-image.ts b/lib/cli/scripts/kubectl-image.ts index 7def05a9e0..c84d42d1c6 100644 --- a/lib/cli/scripts/kubectl-image.ts +++ b/lib/cli/scripts/kubectl-image.ts @@ -18,7 +18,7 @@ */ import { exec } from './exec'; -import * as program from 'commander'; +import program from 'commander'; import { logger } from './logger'; import * as kube from './kube-utils'; diff --git a/lib/cli/scripts/licenses.ts b/lib/cli/scripts/licenses.ts index 93d03f745e..bd318ab7fe 100644 --- a/lib/cli/scripts/licenses.ts +++ b/lib/cli/scripts/licenses.ts @@ -22,7 +22,7 @@ import * as fs from 'fs'; import * as checker from 'license-checker'; import * as licenseList from 'spdx-license-list'; import * as ejs from 'ejs'; -import * as program from 'commander'; +import program from 'commander'; interface PackageInfo { name: string; diff --git a/lib/cli/scripts/npm-publish.ts b/lib/cli/scripts/npm-publish.ts index 65602b4be0..a8ffccae27 100644 --- a/lib/cli/scripts/npm-publish.ts +++ b/lib/cli/scripts/npm-publish.ts @@ -20,7 +20,7 @@ import * as path from 'path'; import fs = require('fs'); import { exec } from './exec'; -import * as program from 'commander'; +import program from 'commander'; import { logger } from './logger'; export interface PublishArgs { diff --git a/lib/cli/scripts/scan-env.ts b/lib/cli/scripts/scan-env.ts index 911e352c11..8fefea5590 100644 --- a/lib/cli/scripts/scan-env.ts +++ b/lib/cli/scripts/scan-env.ts @@ -1,5 +1,5 @@ import { AlfrescoApi, PeopleApi, NodesApi, GroupsApi, SitesApi, SearchApi, AlfrescoApiConfig } from '@alfresco/js-api'; -import * as program from 'commander'; +import program from 'commander'; import { logger } from './logger'; interface PeopleTally { enabled: number; disabled: number } diff --git a/lib/cli/scripts/update-commit-sha.ts b/lib/cli/scripts/update-commit-sha.ts index 0f394952d4..f30439f763 100644 --- a/lib/cli/scripts/update-commit-sha.ts +++ b/lib/cli/scripts/update-commit-sha.ts @@ -18,7 +18,7 @@ */ import { exec } from './exec'; -import * as program from 'commander'; +import program from 'commander'; import { logger } from './logger'; export interface CommitArgs { diff --git a/lib/cli/scripts/update-version.ts b/lib/cli/scripts/update-version.ts index 71fb8884f7..38e66211ae 100644 --- a/lib/cli/scripts/update-version.ts +++ b/lib/cli/scripts/update-version.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import * as program from 'commander'; +import program from 'commander'; import * as path from 'path'; import * as fs from 'fs'; import * as shell from 'shelljs';