From fee3d582b665e31da49434f6994282185b185d45 Mon Sep 17 00:00:00 2001 From: Kousha Talebian Date: Mon, 10 May 2021 11:59:55 -0700 Subject: [PATCH] bump packages and cleanup deps --- packages/flex-dev-utils/package-lock.json | 29 ++++---- packages/flex-dev-utils/package.json | 2 +- packages/flex-dev-utils/src/index.ts | 2 +- .../flex-plugin-e2e-tests/package-lock.json | 6 +- packages/flex-plugin-e2e-tests/package.json | 2 +- packages/plugin-flex/package-lock.json | 66 +++++++++---------- packages/plugin-flex/package.json | 6 +- .../src/commands/flex/plugins/deploy.ts | 3 +- .../src/commands/flex/plugins/start.ts | 3 +- .../commands/flex/plugins/upgrade-plugin.ts | 3 +- .../src/sub-commands/flex-plugin.ts | 12 +++- 11 files changed, 62 insertions(+), 72 deletions(-) diff --git a/packages/flex-dev-utils/package-lock.json b/packages/flex-dev-utils/package-lock.json index 9aea70ede..3e8cb90b9 100644 --- a/packages/flex-dev-utils/package-lock.json +++ b/packages/flex-dev-utils/package-lock.json @@ -1674,9 +1674,9 @@ "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" }, "keytar": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.4.0.tgz", - "integrity": "sha512-nELmc35YjSE4ZNSFaID/743CgDt/MdV4JLX7rRewAh9mKvU72RtF3uJMY0MdMpwdDYZhmD8FSdRCD1J97lEyVg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", + "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", "optional": true, "requires": { "node-addon-api": "^3.0.0", @@ -1898,9 +1898,9 @@ "integrity": "sha1-0XV+yaf7I3HYPPR1XOPifhCCk4g=" }, "node-abi": { - "version": "2.19.3", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz", - "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.26.0.tgz", + "integrity": "sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ==", "optional": true, "requires": { "semver": "^5.4.1" @@ -2126,9 +2126,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "prebuild-install": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.1.tgz", - "integrity": "sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.2.tgz", + "integrity": "sha512-PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ==", "optional": true, "requires": { "detect-libc": "^1.0.3", @@ -2137,15 +2137,14 @@ "minimist": "^1.2.3", "mkdirp-classic": "^0.5.3", "napi-build-utils": "^1.0.1", - "node-abi": "^2.7.0", + "node-abi": "^2.21.0", "noop-logger": "^0.1.1", "npmlog": "^4.0.1", "pump": "^3.0.0", "rc": "^1.2.7", "simple-get": "^3.0.3", "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0", - "which-pm-runs": "^1.0.0" + "tunnel-agent": "^0.6.0" }, "dependencies": { "pump": { @@ -3002,12 +3001,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "which-pm-runs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", - "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=", - "optional": true - }, "which-typed-array": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.2.tgz", diff --git a/packages/flex-dev-utils/package.json b/packages/flex-dev-utils/package.json index b3fb51bde..631785225 100644 --- a/packages/flex-dev-utils/package.json +++ b/packages/flex-dev-utils/package.json @@ -67,6 +67,6 @@ "@types/update-notifier": "^5.0.0" }, "optionalDependencies": { - "keytar": "^7.4.0" + "keytar": "^7.7.0" } } diff --git a/packages/flex-dev-utils/src/index.ts b/packages/flex-dev-utils/src/index.ts index 0901bca74..58a02b1ac 100644 --- a/packages/flex-dev-utils/src/index.ts +++ b/packages/flex-dev-utils/src/index.ts @@ -32,7 +32,7 @@ export { default as runner } from './runner'; export { default as urls } from './urls'; export { default as env } from './env'; export { getPaths as paths } from './fs'; -export { default as semver } from './semver'; +export { default as semver, ReleaseType } from './semver'; export { default as exit } from './exit'; export type FunctionalCallback = (data: D) => R; diff --git a/packages/flex-plugin-e2e-tests/package-lock.json b/packages/flex-plugin-e2e-tests/package-lock.json index e78a87aa5..ae1d9f05e 100644 --- a/packages/flex-plugin-e2e-tests/package-lock.json +++ b/packages/flex-plugin-e2e-tests/package-lock.json @@ -11,9 +11,9 @@ "dev": true }, "@types/semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-iotVxtCCsPLRAvxMFFgxL8HD2l4mAZ2Oin7/VJ2ooWO0VOK4EGOGmZWZn1uCq7RofR3I/1IOSjCHlFT71eVK0Q==", "dev": true }, "ansi-regex": { diff --git a/packages/flex-plugin-e2e-tests/package.json b/packages/flex-plugin-e2e-tests/package.json index c74b676e8..1fb212fb9 100644 --- a/packages/flex-plugin-e2e-tests/package.json +++ b/packages/flex-plugin-e2e-tests/package.json @@ -41,7 +41,7 @@ }, "devDependencies": { "@types/lodash": "4.14.168", - "@types/semver": "^7.3.4" + "@types/semver": "^7.3.5" }, "engines": { "node": ">=10.12.0" diff --git a/packages/plugin-flex/package-lock.json b/packages/plugin-flex/package-lock.json index 1a5d4822e..99e32a921 100644 --- a/packages/plugin-flex/package-lock.json +++ b/packages/plugin-flex/package-lock.json @@ -355,9 +355,9 @@ }, "dependencies": { "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -422,9 +422,9 @@ } }, "@twilio/cli-core": { - "version": "5.21.0", - "resolved": "https://registry.npmjs.org/@twilio/cli-core/-/cli-core-5.21.0.tgz", - "integrity": "sha512-0ym48rNPIoHY10nPYYbt/+LzyUxUflRekXBqFjSqht9f+gd/quh22RT+x5NZdVide2tMx3DzpOryuPraHzojjQ==", + "version": "5.23.0", + "resolved": "https://registry.npmjs.org/@twilio/cli-core/-/cli-core-5.23.0.tgz", + "integrity": "sha512-WKsGHFZrmVjSAsm/TwaIGQu7gZxHUoWNH8JG6y1x8SKJxpqqMpRFRuY+/urWV4HUl0zD5MK7O/qAJmB6nH+dmA==", "requires": { "@oclif/command": "^1.7.0", "@oclif/config": "^1.16.0", @@ -485,9 +485,9 @@ } }, "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -724,12 +724,6 @@ "@types/node": "*" } }, - "@types/semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==", - "dev": true - }, "@types/tmp": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.0.tgz", @@ -1449,9 +1443,9 @@ } }, "follow-redirects": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", - "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", + "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==" }, "fs-constants": { "version": "1.0.0", @@ -1783,9 +1777,9 @@ }, "dependencies": { "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1972,9 +1966,9 @@ } }, "keytar": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.6.0.tgz", - "integrity": "sha512-H3cvrTzWb11+iv0NOAnoNAPgEapVZnYLVHZQyxmh7jdmVfR/c0jNNFEZ6AI38W/4DeTGTaY66ZX4Z1SbfKPvCQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", + "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", "optional": true, "requires": { "node-addon-api": "^3.0.0", @@ -2195,9 +2189,9 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "node-abi": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.21.0.tgz", - "integrity": "sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.26.0.tgz", + "integrity": "sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ==", "optional": true, "requires": { "semver": "^5.4.1" @@ -2280,9 +2274,9 @@ "optional": true }, "object-inspect": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.1.tgz", - "integrity": "sha512-WQUIkCSDPWm5ing/PTUkLr2KaOXX2uV/vz1hLGW2XbZ/RDUmtgcsOyEqA1ox0rkyNx9mJX4kxX+YWceje3pmag==" + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", + "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==" }, "object-treeify": { "version": "1.1.31", @@ -2448,9 +2442,9 @@ "integrity": "sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M=" }, "prebuild-install": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.1.tgz", - "integrity": "sha512-M+cKwofFlHa5VpTWub7GLg5RLcunYIcLqtY5pKcls/u7xaAb8FrXZ520qY8rkpYy5xw90tYCyMO0MP5ggzR3Sw==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.2.tgz", + "integrity": "sha512-PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ==", "optional": true, "requires": { "detect-libc": "^1.0.3", @@ -3050,9 +3044,9 @@ } }, "twilio": { - "version": "3.60.0", - "resolved": "https://registry.npmjs.org/twilio/-/twilio-3.60.0.tgz", - "integrity": "sha512-f8Ts9rfrkycjgnlmu1TzLigoAbrAsIoEnfPoZl+kf94FbBI3QXTUVWhvYj+NrCwLjOewDxrV8qIea1IcyVbG2Q==", + "version": "3.62.0", + "resolved": "https://registry.npmjs.org/twilio/-/twilio-3.62.0.tgz", + "integrity": "sha512-4UyTN/sWWKWRR3QAKnpJAeceoPoB69Vdb5gjWFZ4FonWJf0fY097IM+FewzE+iISmpMvBK62WeE1cQeCnozX7g==", "requires": { "axios": "^0.21.1", "dayjs": "^1.8.29", diff --git a/packages/plugin-flex/package.json b/packages/plugin-flex/package.json index 2eb44757b..dc56478b0 100644 --- a/packages/plugin-flex/package.json +++ b/packages/plugin-flex/package.json @@ -46,7 +46,7 @@ "@oclif/config": "^1.17.0", "@oclif/errors": "^1.3.4", "@oclif/parser": "^3.8.5", - "@twilio/cli-core": "^5.21.0", + "@twilio/cli-core": "^5.23.0", "create-flex-plugin": "4.8.0-beta.0", "dayjs": "^1.10.4", "flex-dev-utils": "4.8.0-beta.0", @@ -58,7 +58,6 @@ "package-json": "^6.5.0", "phin": "^3.5.1", "rimraf": "^3.0.2", - "semver": "^7.3.5", "yargs": "^16.2.0" }, "devDependencies": { @@ -66,12 +65,11 @@ "@types/lodash.startcase": "^4.4.6", "@types/mkdirp": "^1.0.1", "@types/rimraf": "^3.0.0", - "@types/semver": "^7.3.4", "@types/tmp": "^0.2.0", "@types/yargs": "^16.0.1", "globby": "^11.0.3", "tmp": "^0.2.1", - "twilio": "^3.60.0" + "twilio": "^3.62.0" }, "engines": { "node": ">=10.12.0" diff --git a/packages/plugin-flex/src/commands/flex/plugins/deploy.ts b/packages/plugin-flex/src/commands/flex/plugins/deploy.ts index e8a27dc70..1bbe051c1 100644 --- a/packages/plugin-flex/src/commands/flex/plugins/deploy.ts +++ b/packages/plugin-flex/src/commands/flex/plugins/deploy.ts @@ -1,9 +1,8 @@ import { PluginVersionResource } from 'flex-plugins-api-client/dist/clients/pluginVersions'; -import semver, { ReleaseType } from 'semver'; import { DeployResult, _verifyPath } from 'flex-plugin-scripts/dist/scripts/deploy'; import getRuntime from 'flex-plugin-scripts/dist/utils/runtime'; import { CLIParseError } from '@oclif/parser/lib/errors'; -import { FlexPluginError, TwilioCliError, progress, getCredential, env } from 'flex-dev-utils'; +import { FlexPluginError, TwilioCliError, progress, getCredential, env, semver, ReleaseType } from 'flex-dev-utils'; import { getPaths } from 'flex-dev-utils/dist/fs'; import { confirm } from 'flex-dev-utils/dist/inquirer'; import { PluginResource } from 'flex-plugins-api-client'; diff --git a/packages/plugin-flex/src/commands/flex/plugins/start.ts b/packages/plugin-flex/src/commands/flex/plugins/start.ts index cd774867c..37f4825ba 100644 --- a/packages/plugin-flex/src/commands/flex/plugins/start.ts +++ b/packages/plugin-flex/src/commands/flex/plugins/start.ts @@ -1,8 +1,7 @@ import { flags } from '@oclif/command'; import { findPortAvailablePort, StartScript } from 'flex-plugin-scripts/dist/scripts/start'; import { FLAG_MULTI_PLUGINS } from 'flex-plugin-scripts/dist/scripts/pre-script-check'; -import semver from 'semver'; -import { TwilioCliError } from 'flex-dev-utils'; +import { TwilioCliError, semver } from 'flex-dev-utils'; import { readJsonFile } from 'flex-dev-utils/dist/fs'; import { OutputFlags } from '@oclif/parser/lib/parse'; diff --git a/packages/plugin-flex/src/commands/flex/plugins/upgrade-plugin.ts b/packages/plugin-flex/src/commands/flex/plugins/upgrade-plugin.ts index a9171fe75..a8dc15013 100644 --- a/packages/plugin-flex/src/commands/flex/plugins/upgrade-plugin.ts +++ b/packages/plugin-flex/src/commands/flex/plugins/upgrade-plugin.ts @@ -2,7 +2,6 @@ import { join } from 'path'; import rimraf from 'rimraf'; -import semver from 'semver'; import { checkAFileExists, readFileSync, @@ -14,7 +13,7 @@ import { } from 'flex-dev-utils/dist/fs'; import packageJson from 'package-json'; import { flags } from '@oclif/parser'; -import { TwilioApiError, TwilioCliError, spawn, progress } from 'flex-dev-utils'; +import { TwilioApiError, TwilioCliError, spawn, progress, semver } from 'flex-dev-utils'; import { OutputFlags } from '@oclif/parser/lib/parse'; import FlexPlugin, { ConfigData, PkgCallback, SecureStorage } from '../../../sub-commands/flex-plugin'; diff --git a/packages/plugin-flex/src/sub-commands/flex-plugin.ts b/packages/plugin-flex/src/sub-commands/flex-plugin.ts index 12ec76d14..a9da01bc8 100644 --- a/packages/plugin-flex/src/sub-commands/flex-plugin.ts +++ b/packages/plugin-flex/src/sub-commands/flex-plugin.ts @@ -11,13 +11,21 @@ import { ConfigurationsClient, ReleasesClient, } from 'flex-plugins-api-client'; -import { TwilioError, spawn, Logger, SpawnPromise, NotImplementedError, TwilioCliError, env } from 'flex-dev-utils'; +import { + TwilioError, + spawn, + Logger, + SpawnPromise, + NotImplementedError, + TwilioCliError, + env, + semver, +} from 'flex-dev-utils'; import dayjs from 'dayjs'; import * as Errors from '@oclif/errors'; import mkdirp from 'mkdirp'; import { PluginServiceHttpOption } from 'flex-plugins-api-client/dist/clients/client'; import * as Parser from '@oclif/parser'; -import semver from 'semver/preload'; import parser from '../utils/parser'; import * as flags from '../utils/flags';