Skip to content

Commit

Permalink
fix: PR comments, other issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Gummersall committed Feb 9, 2021
1 parent 2240a4f commit be87849
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
1 change: 0 additions & 1 deletion libraries/botbuilder-dialogs-adaptive-teams/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"botbuilder-dialogs-adaptive": "4.1.6",
"botbuilder-dialogs-declarative": "4.1.6",
"botbuilder-stdlib": "4.1.6",
"botframework-schema": "4.1.6",
"lodash": "^4.17.19"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* Licensed under the MIT License.
*/

import { Converter, ConverterFactory, Dialog, DialogContext } from 'botbuilder-dialogs';

import {
BoolExpression,
BoolExpressionConverter,
Expand All @@ -15,9 +17,15 @@ import {
StringExpression,
StringExpressionConverter,
} from 'adaptive-expressions';
import { Converter, ConverterFactory, Dialog, DialogContext } from 'botbuilder-dialogs';
import { Activity, ActivityTypes, CacheInfo, MessagingExtensionResult, StatusCodes } from 'botframework-schema';
import { MessagingExtensionResponse } from 'botbuilder';

import {
Activity,
ActivityTypes,
CacheInfo,
MessagingExtensionResponse,
MessagingExtensionResult,
StatusCodes,
} from 'botbuilder';

export interface BaseTeamsCacheInfoResponseDialogConfiguration {
disabled?: boolean | string | BoolExpression;
Expand Down
4 changes: 2 additions & 2 deletions testing/botbuilder-test-utils/src/jwt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Licensed under the MIT License.

import forge from 'node-forge';
import jwt from 'jsonwebtoken';
import nock from 'nock';
import jwt from 'jsonwebtoken'; // eslint-disable-line import/no-extraneous-dependencies
import nock from 'nock'; // eslint-disable-line import/no-extraneous-dependencies
import url from 'url';
import { assert } from 'botbuilder-stdlib';
import { nanoid } from 'nanoid';
Expand Down
2 changes: 1 addition & 1 deletion testing/botbuilder-test-utils/src/oauth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import assert from 'assert';
import nock from 'nock';
import nock from 'nock'; // eslint-disable-line import/no-extraneous-dependencies

/**
* Registers mocha hooks for proper usage
Expand Down

0 comments on commit be87849

Please sign in to comment.