Skip to content

Commit

Permalink
fix!: Replace oclif-v1 dependencies with oclif-v2 version (twilio#212)
Browse files Browse the repository at this point in the history
* fix!: update description (twilio#207)

* Update twilio-client.test.js

* Update base-command.js

* fix: Fixing ocktokit api calls (twilio#211)

* Update update-release.js

* fix: replace oclif v1 dependecies to oclif v2 dependencies

* BREAKING CHANGE: unlocking oclif v2

Co-authored-by: sr010 <87780745+sr010@users.noreply.github.com>
Co-authored-by: sburman <sburman@twilio.com>
Co-authored-by: shrutiburman <87537688+shrutiburman@users.noreply.github.com>
  • Loading branch information
4 people committed Aug 11, 2022
1 parent ba6a147 commit d87c83a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ We appreciate the effort for this pull request but before that please make sure
Please format the PR title appropriately based on the type of change:
<type>[!]: <description>
Where <type> is one of: docs, chore, feat, fix, test.
Add a '!' after the type for breaking changes (e.g. feat!: new breaking feature).
Add a '!' after the type for breaking changes (e.g. feat!: new breaking feature) & add text "BREAKING CHANGE:" in commit msg.
**All third-party contributors acknowledge that any contributions they provide will be made under the same open-source license that the open-source project is provided under.**
Expand Down
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
"dependencies": {
"@actions/core": "^1.0.0",
"@actions/github": "^5.0.3",
"@oclif/command": "^1.8.15",
"@oclif/config": "^1.18.2",
"@oclif/errors": "^1.3.5",
"@oclif/plugin-help": "^3.2.2",
"@oclif/plugin-plugins": "^1.8.3",
"@octokit/rest": "^19.0.3",
Expand All @@ -44,7 +41,8 @@
"qs": "^6.9.4",
"semver": "^7.3.2",
"tsv": "^0.2.0",
"twilio": "^3.80.0"
"twilio": "^3.80.0",
"@oclif/core": "^1.13.1"
},
"devDependencies": {
"@oclif/test": "^1.2.6",
Expand Down
8 changes: 4 additions & 4 deletions src/base-commands/base-command.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { Command, flags: oclifFlags } = require('@oclif/command');
const { CLIError } = require('@oclif/errors');
const { Command, Flags: oclifFlags } = require('@oclif/core');
const { Errors } = require('@oclif/core');

const pkg = require('../../package.json');
const MessageTemplates = require('../services/messaging/templates');
Expand Down Expand Up @@ -30,7 +30,7 @@ class BaseCommand extends Command {
}

async run() {
const { args, flags } = this.parse(this.constructor);
const { args, flags } = await this.parse(this.constructor);
this.args = args;
this.flags = flags;
await this.loadConfig();
Expand Down Expand Up @@ -59,7 +59,7 @@ class BaseCommand extends Command {
}

async catch(error) {
if (!this.logger || instanceOf(error, CLIError)) {
if (!this.logger || instanceOf(error, Errors.CLIError)) {
return super.catch(error);
}

Expand Down
2 changes: 1 addition & 1 deletion src/base-commands/twilio-client-command.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { flags } = require('@oclif/command');
const { Flags: flags } = require('@oclif/core');

const BaseCommand = require('./base-command');
const CliRequestClient = require('../services/cli-http-client');
Expand Down

0 comments on commit d87c83a

Please sign in to comment.