Merge pull request #460 from twilio/package-bumps

ktalebian · web-flow · commit ebb1465e7fa3 · 2021-05-10T12:28:07.000-07:00
bump packages and cleanup deps
diff --git a/packages/flex-dev-utils/package-lock.json b/packages/flex-dev-utils/package-lock.json
diff --git 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
@@ -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<D, R> = (data: D) => R;
diff --git a/packages/flex-plugin-e2e-tests/package-lock.json b/packages/flex-plugin-e2e-tests/package-lock.json
diff --git 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/flex-plugin-scripts/src/scripts/deploy.ts b/packages/flex-plugin-scripts/src/scripts/deploy.ts
@@ -7,8 +7,8 @@ import {
   Credential,
   getCredential,
   env,
+  ReleaseType,
 } from 'flex-dev-utils';
-import { ReleaseType } from 'flex-dev-utils/dist/semver';
 import { confirm } from 'flex-dev-utils/dist/inquirer';
 import { checkFilesExist, updateAppVersion, getPackageVersion, getPaths } from 'flex-dev-utils/dist/fs';
 import { singleLineString } from 'flex-dev-utils/dist/strings';
diff --git a/packages/plugin-flex/package-lock.json b/packages/plugin-flex/package-lock.json
diff --git 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,20 +58,18 @@
     "package-json": "^6.5.0",
     "phin": "^3.5.1",
     "rimraf": "^3.0.2",
-    "semver": "^7.3.5",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.0",
     "@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
@@ -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
@@ -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
@@ -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
@@ -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';

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,6 @@`
`67`	`67`	`"@types/update-notifier": "^5.0.0"`
`68`	`68`	`},`
`69`	`69`	`"optionalDependencies": {`
`70`		`- "keytar": "^7.4.0"`
	`70`	`+ "keytar": "^7.7.0"`
`71`	`71`	`}`
`72`	`72`	`}`