diff --git a/Composer/packages/types/src/runtime.ts b/Composer/packages/types/src/runtime.ts index bfc6e75a9f..73b90154b0 100644 --- a/Composer/packages/types/src/runtime.ts +++ b/Composer/packages/types/src/runtime.ts @@ -15,7 +15,7 @@ type MakeDirectoryOptions = { recursive?: boolean; }; -type IFileStorage = { +export type IFileStorage = { stat(path: string): Promise; readFile(path: string): Promise; readDir(path: string): Promise; diff --git a/extensions/azurePublish/package.json b/extensions/azurePublish/package.json index 7472d805fb..d1e30d2698 100644 --- a/extensions/azurePublish/package.json +++ b/extensions/azurePublish/package.json @@ -95,9 +95,10 @@ "@botframework-composer/types": "file:../../Composer/packages/types", "@types/archiver": "5.3.1", "@types/fs-extra": "9.0.13", + "@types/jest": "ts3.9", "@types/node": "18.0.3", - "@types/react": "^16.9.53", - "@types/react-dom": "18.0.6", + "@types/react": "^17.0.39", + "@types/react-dom": "^17.0.11", "@types/request": "2.48.8", "@types/request-promise": "4.1.48", "html-webpack-plugin": "5.5.0", diff --git a/extensions/azurePublish/src/node/deploy.ts b/extensions/azurePublish/src/node/deploy.ts index 4ebbe7c042..a0da82bf1e 100644 --- a/extensions/azurePublish/src/node/deploy.ts +++ b/extensions/azurePublish/src/node/deploy.ts @@ -12,7 +12,7 @@ import { TokenCredentials } from '@azure/ms-rest-js'; import { DialogSetting } from '@botframework-composer/types'; import { BotProjectDeployConfig, BotProjectDeployLoggerType } from './types'; -import { build, publishLuisToPrediction } from './luisAndQnA'; +import { build, BuildSettingType, publishLuisToPrediction } from './luisAndQnA'; import { AzurePublishErrors, createCustomizeError, stringifyError } from './utils/errorHandler'; import { copyDir } from './utils/copyDir'; import { KeyVaultApi } from './keyvaultHelper/keyvaultApi'; @@ -45,7 +45,7 @@ export class BotProjectDeploy { */ public async deploy( project: any, - settings: DialogSetting, + settings: BuildSettingType, profileName: string, name: string, environment: string, @@ -100,8 +100,7 @@ export class BotProjectDeploy { settings.luis, luisResource, this.projPath, - this.logger, - settings?.runtime + this.logger ); const qnaConfig = await project.builder.getQnaConfig(); @@ -247,7 +246,7 @@ export class BotProjectDeploy { const archive = archiver('zip', { zlib: { level: 9 } }); // eslint-disable-next-line security/detect-non-literal-fs-filename const stream = fs.createWriteStream(out); - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { archive .glob('**/*', { cwd: source, diff --git a/extensions/azurePublish/src/node/index.ts b/extensions/azurePublish/src/node/index.ts index f2f60a9776..b3bf71a1c9 100644 --- a/extensions/azurePublish/src/node/index.ts +++ b/extensions/azurePublish/src/node/index.ts @@ -15,6 +15,7 @@ import { PublishResponse, PublishResult, SDKKinds, + PublishProfile, } from '@botframework-composer/types'; import { parseRuntimeKey, applyPublishingProfileToSettings } from '@bfc/shared'; import { indexer } from '@bfc/indexers'; @@ -48,7 +49,7 @@ interface DeployResources { abs?: any; } -interface PublishConfig { +interface PublishConfig extends PublishProfile { fullSettings: any; profileName: string; //profile name [key: string]: any; @@ -631,7 +632,7 @@ export default async (composer: IExtensionRegistration): Promise => { private isProfileProvisioned = (profile: PublishConfig): boolean => { //TODO: Post-migration we can check for profile?.tenantId - return profile?.resourceGroup && profile?.subscriptionId && profile?.region; + return !!(profile?.resourceGroup && profile?.subscriptionId && profile?.region); }; // While the provisioning process may return more information for various resources than is checked here, @@ -640,36 +641,36 @@ export default async (composer: IExtensionRegistration): Promise => { switch (resource.key) { case AzureResourceTypes.APPINSIGHTS: // InstrumentationKey is Pascal-cased for some unknown reason - return profile?.settings?.applicationInsights?.InstrumentationKey; + return !!profile?.settings?.applicationInsights?.InstrumentationKey; case AzureResourceTypes.APP_REGISTRATION: // MicrosoftAppId and MicrosoftAppPassword are Pascal-cased for some unknown reason - return profile?.settings?.MicrosoftAppId && profile?.settings?.MicrosoftAppPassword; + return !!(profile?.settings?.MicrosoftAppId && profile?.settings?.MicrosoftAppPassword); case AzureResourceTypes.BLOBSTORAGE: // name is not checked (not in schema.ts) // container property is not checked (empty may be a valid value) - return profile?.settings?.blobStorage?.connectionString; + return !!profile?.settings?.blobStorage?.connectionString; case AzureResourceTypes.BOT_REGISTRATION: - return profile?.botName; + return !!profile?.botName; case AzureResourceTypes.COSMOSDB: // collectionId is not checked (not in schema.ts) // databaseId and containerId are not checked (empty may be a valid value) - return profile?.settings?.cosmosDB?.authKey && profile?.settings?.cosmosDB?.cosmosDBEndpoint; + return !!(profile?.settings?.cosmosDb?.authKey && profile?.settings?.cosmosDb?.cosmosDBEndpoint); case AzureResourceTypes.LUIS_AUTHORING: // region is not checked (empty may be a valid value) - return profile?.settings?.luis?.authoringKey && profile?.settings?.luis?.authoringEndpoint; + return !!(profile?.settings?.luis?.authoringKey && profile?.settings?.luis?.authoringEndpoint); case AzureResourceTypes.LUIS_PREDICTION: // region is not checked (empty may be a valid value) - return profile?.settings?.luis?.endpointKey && profile?.settings?.luis?.endpoint; + return !!(profile?.settings?.luis?.endpointKey && profile?.settings?.luis?.endpoint); case AzureResourceTypes.QNA: // endpoint is not checked (it is in schema.ts and provision() returns the value, but it is not set in the config) // qnaRegion is not checked (empty may be a valid value) - return profile?.settings?.qna?.subscriptionKey; + return !!profile?.settings?.qna?.subscriptionKey; case AzureResourceTypes.SERVICE_PLAN: // no settings exist to verify the service plan was created return true; case AzureResourceTypes.AZUREFUNCTIONS: case AzureResourceTypes.WEBAPP: - return profile?.hostname; + return !!profile?.hostname; default: throw new Error( formatMessage('Azure resource type {resourceKey} is not handled.', { resourceKey: resource.key }) diff --git a/extensions/azurePublish/src/node/luisAndQnA.ts b/extensions/azurePublish/src/node/luisAndQnA.ts index 4cc5a4f124..a65bf54407 100644 --- a/extensions/azurePublish/src/node/luisAndQnA.ts +++ b/extensions/azurePublish/src/node/luisAndQnA.ts @@ -10,7 +10,7 @@ import axios, { AxiosRequestConfig } from 'axios'; import { AzurePublishErrors } from './utils/errorHandler'; import { BotProjectDeployLoggerType } from './types'; -const botPath = (projPath: string, runtime?: DialogSetting['runtime']) => projPath; +const botPath = (projPath: string) => projPath; type QnaConfigType = { subscriptionKey: string; @@ -24,13 +24,15 @@ type Resources = { qnaResources: Resource[]; }; -interface BuildSettingType { +export type BuildSettingType = { + [K in keyof T]: T[K]; +} & { luis: ILuisConfig; qna: QnaConfigType; - luResources: Resource[]; - qnaResources: Resource[]; + luResources?: Resource[]; + qnaResources?: Resource[]; runtime?: DialogSetting['runtime']; -} +}; function getAccount(accounts: any, filter: string) { for (const account of accounts) { @@ -85,8 +87,7 @@ export async function publishLuisToPrediction( luisSettings: ILuisConfig, luisResource: string, path: string, - logger, - runtime?: RuntimeTemplate + logger ) { let { // eslint-disable-next-line prefer-const @@ -105,9 +106,7 @@ export async function publishLuisToPrediction( // Find any files that contain the name 'luis.settings' in them // These are generated by the LuBuild process and placed in the generated folder // These contain dialog-to-luis app id mapping - const luisConfigFiles = (await getFiles(botPath(path, runtime))).filter((filename) => - filename.includes('luis.settings') - ); + const luisConfigFiles = (await getFiles(botPath(path))).filter((filename) => filename.includes('luis.settings')); const luisAppIds: any = {}; // Read in all the luis app id mappings @@ -253,7 +252,7 @@ export async function build(project: IBotProject, path: string, settings: BuildS } }); - builder.rootDir = botPath(path, settings?.runtime); + builder.rootDir = botPath(path); builder.setBuildConfig({ ...luisConfig, ...qnaConfig }, project.settings.downsampling, project.settings.crossTrain); await builder.build(luFiles, qnaFiles, Array.from(files.values()) as FileInfo[], emptyFiles); await builder.copyModelPathToBot(); diff --git a/extensions/azurePublish/src/node/provision.test.ts b/extensions/azurePublish/src/node/provision.test.ts index fefc2d07d1..dc6ded966b 100644 --- a/extensions/azurePublish/src/node/provision.test.ts +++ b/extensions/azurePublish/src/node/provision.test.ts @@ -3,7 +3,7 @@ import { BotProjectProvision, ProvisionConfig } from './provision'; -const mockConfig = { +const mockConfig = ({ logger: console.log, accessToken: 'accessToken', graphToken: 'graphToken', @@ -18,7 +18,8 @@ const mockConfig = { name: 'profileName', type: 'azurepublish', subscription: 'test', -} as ProvisionConfig; +} as unknown) as ProvisionConfig; + const azProvision = new BotProjectProvision(mockConfig); const mockGet = jest.fn(); diff --git a/extensions/azurePublish/src/node/utils/copyDir.ts b/extensions/azurePublish/src/node/utils/copyDir.ts index d5b321adef..5826a5060e 100644 --- a/extensions/azurePublish/src/node/utils/copyDir.ts +++ b/extensions/azurePublish/src/node/utils/copyDir.ts @@ -4,7 +4,7 @@ import Path from 'path'; -import { IFileStorage } from './interface'; +import { IFileStorage } from '@botframework-composer/types'; export async function copyDir( srcDir: string, diff --git a/extensions/azurePublish/tsconfig.json b/extensions/azurePublish/tsconfig.json index 1acb305b29..d4cf38c823 100644 --- a/extensions/azurePublish/tsconfig.json +++ b/extensions/azurePublish/tsconfig.json @@ -1,7 +1,12 @@ { "compilerOptions": { "esModuleInterop": true, - "jsx": "react" + "jsx": "react", + "skipLibCheck": true, + "typeRoots": [ + "./node_modules/@types/", + ], + "types": ["jest"] }, "include": [ "src/**/*", diff --git a/extensions/azurePublish/yarn-berry.lock b/extensions/azurePublish/yarn-berry.lock index b659e091b8..bbfc47c548 100644 --- a/extensions/azurePublish/yarn-berry.lock +++ b/extensions/azurePublish/yarn-berry.lock @@ -1970,7 +1970,7 @@ __metadata: "@botframework-composer/types@file:../../Composer/packages/types::locator=azurePublish%40workspace%3A.": version: 0.0.2 - resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=ff5977&locator=azurePublish%40workspace%3A." + resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=a03b13&locator=azurePublish%40workspace%3A." dependencies: "@types/express": 4.16.1 "@types/passport": ^1.0.4 @@ -1979,7 +1979,7 @@ __metadata: express-serve-static-core: 0.1.1 json-schema: 0.4.0 tslib: 2.4.0 - checksum: 377541c2d09305b36e9e12a1b200725bf7c37580a959f2d24007f51052b5f9536b7e0dea48f1f7b574fcca0b8858c97658f413c2df50238f9e70cdcbeaf678e5 + checksum: 042462523dc3e89a15817f431da9df2cfd64b5adcbc29b0fb7dfcebe2989dd7e76445890540be2919c7c230912826a5b83bd1bd90398ef3be4c7e35be78ed41d languageName: node linkType: hard @@ -3256,6 +3256,16 @@ __metadata: languageName: node linkType: hard +"@types/jest@npm:ts3.9": + version: 28.1.1 + resolution: "@types/jest@npm:28.1.1" + dependencies: + jest-matcher-utils: ^27.0.0 + pretty-format: ^27.0.0 + checksum: 0a8b045a7b660372decc807c390d3f99a2b12bb1659a1cd593afe04557f4b7c235b0576a5e35b1577710d20e42759d3d8755eb8bed6edc8733f47007e75a5509 + languageName: node + linkType: hard + "@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8": version: 7.0.11 resolution: "@types/json-schema@npm:7.0.11" @@ -3398,12 +3408,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:18.0.6": - version: 18.0.6 - resolution: "@types/react-dom@npm:18.0.6" +"@types/react-dom@npm:^17.0.11": + version: 17.0.19 + resolution: "@types/react-dom@npm:17.0.19" dependencies: - "@types/react": "*" - checksum: db571047af1a567631758700b9f7d143e566df939cfe5fbf7535347cc0c726a1cdbb5e3f8566d076e54cf708b6c1166689de194a9ba09ee35efc9e1d45911685 + "@types/react": ^17 + checksum: 875a472d868b235435c905ded16cf92297bd2afb20a5a78f5dccd54312f6f038ccf452ea92bb41c0b39150c2f16f3ddff0265a2de756c6f63b0971dd5719578b languageName: node linkType: hard @@ -3427,14 +3437,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:^16.9.53": - version: 16.14.35 - resolution: "@types/react@npm:16.14.35" +"@types/react@npm:^17, @types/react@npm:^17.0.39": + version: 17.0.53 + resolution: "@types/react@npm:17.0.53" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: ed9c551a7d50d073a5fb0295c1d939536c66c3286d42b6c94c20749464492ed95a408e6d3694bf49df0012da69e22202065c8c2fac0406356972a7fcb4960dd3 + checksum: dacfde02c260fd98bed2eb775ed0c7ce1397be4c0844f907a50763b081a4008f81f57071889a16eb1350ddcf0927f3cf1a6541702c8ad03de3c70383ef931e3f languageName: node linkType: hard @@ -4317,9 +4327,10 @@ __metadata: "@fluentui/react": 8.78.1 "@types/archiver": 5.3.1 "@types/fs-extra": 9.0.13 + "@types/jest": ts3.9 "@types/node": 18.0.3 - "@types/react": ^16.9.53 - "@types/react-dom": 18.0.6 + "@types/react": ^17.0.39 + "@types/react-dom": ^17.0.11 "@types/request": 2.48.8 "@types/request-promise": 4.1.48 adal-node: 0.2.4 @@ -5497,6 +5508,13 @@ __metadata: languageName: node linkType: hard +"diff-sequences@npm:^27.5.1": + version: 27.5.1 + resolution: "diff-sequences@npm:27.5.1" + checksum: a00db5554c9da7da225db2d2638d85f8e41124eccbd56cbaefb3b276dcbb1c1c2ad851c32defe2055a54a4806f030656cbf6638105fd6ce97bb87b90b32a33ca + languageName: node + linkType: hard + "diff-sequences@npm:^29.3.1": version: 29.3.1 resolution: "diff-sequences@npm:29.3.1" @@ -7541,6 +7559,18 @@ __metadata: languageName: node linkType: hard +"jest-diff@npm:^27.5.1": + version: 27.5.1 + resolution: "jest-diff@npm:27.5.1" + dependencies: + chalk: ^4.0.0 + diff-sequences: ^27.5.1 + jest-get-type: ^27.5.1 + pretty-format: ^27.5.1 + checksum: 8be27c1e1ee57b2bb2bef9c0b233c19621b4c43d53a3c26e2c00a4e805eb4ea11fe1694a06a9fb0e80ffdcfdc0d2b1cb0b85920b3f5c892327ecd1e7bd96b865 + languageName: node + linkType: hard + "jest-diff@npm:^29.4.1": version: 29.4.1 resolution: "jest-diff@npm:29.4.1" @@ -7611,6 +7641,13 @@ __metadata: languageName: node linkType: hard +"jest-get-type@npm:^27.5.1": + version: 27.5.1 + resolution: "jest-get-type@npm:27.5.1" + checksum: 63064ab70195c21007d897c1157bf88ff94a790824a10f8c890392e7d17eda9c3900513cb291ca1c8d5722cad79169764e9a1279f7c8a9c4cd6e9109ff04bbc0 + languageName: node + linkType: hard + "jest-get-type@npm:^29.2.0": version: 29.2.0 resolution: "jest-get-type@npm:29.2.0" @@ -7691,6 +7728,18 @@ __metadata: languageName: node linkType: hard +"jest-matcher-utils@npm:^27.0.0": + version: 27.5.1 + resolution: "jest-matcher-utils@npm:27.5.1" + dependencies: + chalk: ^4.0.0 + jest-diff: ^27.5.1 + jest-get-type: ^27.5.1 + pretty-format: ^27.5.1 + checksum: bb2135fc48889ff3fe73888f6cc7168ddab9de28b51b3148f820c89fdfd2effdcad005f18be67d0b9be80eda208ad47290f62f03d0a33f848db2dd0273c8217a + languageName: node + linkType: hard + "jest-matcher-utils@npm:^29.4.1": version: 29.4.1 resolution: "jest-matcher-utils@npm:29.4.1" @@ -9418,6 +9467,17 @@ __metadata: languageName: node linkType: hard +"pretty-format@npm:^27.0.0, pretty-format@npm:^27.5.1": + version: 27.5.1 + resolution: "pretty-format@npm:27.5.1" + dependencies: + ansi-regex: ^5.0.1 + ansi-styles: ^5.0.0 + react-is: ^17.0.1 + checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088 + languageName: node + linkType: hard + "pretty-format@npm:^29.0.0, pretty-format@npm:^29.4.1": version: 29.4.1 resolution: "pretty-format@npm:29.4.1" diff --git a/extensions/azurePublishNew/package.json b/extensions/azurePublishNew/package.json index 955ea6cb98..158b2fbd83 100644 --- a/extensions/azurePublishNew/package.json +++ b/extensions/azurePublishNew/package.json @@ -31,23 +31,23 @@ } }, "dependencies": { - "@azure/arm-appinsights": "4.0.0", - "@azure/arm-appservice": "13.0.0", - "@azure/arm-appservice-profile-2019-03-01-hybrid": "1.2.0", + "@azure/arm-appinsights": "^3.0.0", + "@azure/arm-appservice": "^6.0.0", + "@azure/arm-appservice-profile-2019-03-01-hybrid": "1.0.0", "@azure/arm-botservice": "3.1.0", - "@azure/arm-cognitiveservices": "7.2.0", - "@azure/arm-cosmosdb": "15.0.0", - "@azure/arm-deploymentmanager": "3.1.1", - "@azure/arm-keyvault": "2.0.0", - "@azure/arm-keyvault-profile-2020-09-01-hybrid": "2.0.0", - "@azure/arm-resources": "5.0.1", - "@azure/arm-search": "3.0.1", - "@azure/arm-storage": "17.2.1", - "@azure/arm-subscriptions": "5.0.1", - "@azure/cognitiveservices-luis-authoring": "4.0.0-preview.3", - "@azure/cosmos": "3.16.2", - "@azure/graph": "5.0.3", - "@azure/keyvault-secrets": "4.4.0", + "@azure/arm-cognitiveservices": "^5.2.0", + "@azure/arm-cosmosdb": "^9.0.0", + "@azure/arm-deploymentmanager": "3.0.0", + "@azure/arm-keyvault": "^1.2.1", + "@azure/arm-keyvault-profile-2020-09-01-hybrid": "^1.0.0", + "@azure/arm-resources": "2.1.0", + "@azure/arm-search": "^1.3.0", + "@azure/arm-storage": "^15.0.0", + "@azure/arm-subscriptions": "2.0.0", + "@azure/cognitiveservices-luis-authoring": "4.0.0-preview.1", + "@azure/cosmos": "^3.7.4", + "@azure/graph": "5.0.1", + "@azure/keyvault-secrets": "^4.1.0", "@bfc/extension-client": "file:../../Composer/packages/extension-client", "@bfc/indexers": "../../Composer/packages/lib/indexers", "@bfc/shared": "../../Composer/packages/lib/shared", @@ -94,6 +94,7 @@ "@fluentui/theme": "2.6.6", "@types/archiver": "5.3.1", "@types/fs-extra": "9.0.13", + "@types/jest": "ts3.9", "@types/node": "18.0.3", "@types/react": "^16.9.53", "@types/react-dom": "18.0.6", diff --git a/extensions/azurePublishNew/src/components/shared/jsonEditor/JsonEditor.tsx b/extensions/azurePublishNew/src/components/shared/jsonEditor/JsonEditor.tsx index b367b47a2f..e8d6be749d 100644 --- a/extensions/azurePublishNew/src/components/shared/jsonEditor/JsonEditor.tsx +++ b/extensions/azurePublishNew/src/components/shared/jsonEditor/JsonEditor.tsx @@ -3,7 +3,7 @@ /** @jsx jsx */ import { jsx, css, SerializedStyles } from '@emotion/react'; import React, { useRef } from 'react'; -import MonacoEditor, { EditorDidMount, EditorProps } from '@monaco-editor/react'; +import MonacoEditor, { OnMount, EditorProps } from '@monaco-editor/react'; import { NeutralColors, SharedColors } from '@fluentui/theme'; import { MessageBar, MessageBarType, Link } from '@fluentui/react'; import formatMessage from 'format-message'; @@ -85,7 +85,7 @@ export const JsonEditor = (props: Props) => { const [focused, setFocused] = React.useState(false); const { userSettings: { codeEditor: { fontSettings } = {} } = {} } = useShellApi(); - const handleOnMount: EditorDidMount = (_: () => string, editor) => { + const handleOnMount: OnMount = (editor) => { setEditorMounted(true); editorRef.current = editor; editor.onDidDispose(() => { @@ -142,7 +142,6 @@ export const JsonEditor = (props: Props) => { onMouseLeave={() => setHovered(false)} > { }, }} theme="light" + onMount={handleOnMount} {...props} /> {errorMessage && ( diff --git a/extensions/azurePublishNew/src/node/availableResources.ts b/extensions/azurePublishNew/src/node/availableResources.ts index 891220e01f..b82781f2cd 100644 --- a/extensions/azurePublishNew/src/node/availableResources.ts +++ b/extensions/azurePublishNew/src/node/availableResources.ts @@ -7,6 +7,7 @@ import { ResourceConfig, ResourceDefinition, ResourceProvisionService, + ProvisionWorkingSet, } from './types'; import { appInsightsDefinition, @@ -218,7 +219,7 @@ export const setUpProvisionService = (config: ProvisionServiceConfig, onProgress const provisionServices = getProvisionServices(config); const provision = (selectedResources: ResourceConfig[]): void => { - let workingSet: Record = {}; + let workingSet: ProvisionWorkingSet = {}; selectedResources.forEach(async (resourceConfig) => { const service: ResourceProvisionService = provisionServices[resourceConfig.key]; diff --git a/extensions/azurePublishNew/src/node/azureResources/appRegistration.test.ts b/extensions/azurePublishNew/src/node/azureResources/appRegistration.test.ts index dd5199097e..8ff2a8da77 100644 --- a/extensions/azurePublishNew/src/node/azureResources/appRegistration.test.ts +++ b/extensions/azurePublishNew/src/node/azureResources/appRegistration.test.ts @@ -26,7 +26,8 @@ describe('appRegistration', () => { describe('getAppRegistrationProvisionService', () => { it('returns the app registration service', () => { const appRegistrationProvisionService = getAppRegistrationProvisionService({ - token: mockToken, + accessToken: mockToken, + key: 'appRegistration', graphToken: mockGraphToken, subscriptionId: mockSubscriptionId, }); @@ -37,7 +38,8 @@ describe('appRegistration', () => { describe('provision', () => { it('should return appRegistration result on success', async () => { const appRegistrationProvisionService = getAppRegistrationProvisionService({ - token: mockToken, + accessToken: mockToken, + key: 'appRegistration', graphToken: mockGraphToken, subscriptionId: mockSubscriptionId, }); diff --git a/extensions/azurePublishNew/src/node/types.ts b/extensions/azurePublishNew/src/node/types.ts index 1730c5d6e9..1876a86d71 100644 --- a/extensions/azurePublishNew/src/node/types.ts +++ b/extensions/azurePublishNew/src/node/types.ts @@ -3,7 +3,7 @@ import { IBotProject } from '@botframework-composer/types'; -export type ProvisionWorkingSet = Record; +export type ProvisionWorkingSet = Record>; export type OnProvisionProgress = (status: number, message: string) => void; diff --git a/extensions/azurePublishNew/src/services/azureResources/absService.ts b/extensions/azurePublishNew/src/services/azureResources/absService.ts index a0494ce9b3..c5684dc64e 100644 --- a/extensions/azurePublishNew/src/services/azureResources/absService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/absService.ts @@ -7,7 +7,7 @@ import { throwNotImplementedError } from '../throwNotImplementedError'; export const createABSService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const azureBotService = new AzureBotService(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/azureResources/appInsightsService.ts b/extensions/azurePublishNew/src/services/azureResources/appInsightsService.ts index c2b11125aa..8d8a7790dc 100644 --- a/extensions/azurePublishNew/src/services/azureResources/appInsightsService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/appInsightsService.ts @@ -7,7 +7,7 @@ import { throwNotImplementedError } from '../throwNotImplementedError'; const createAppInsightsService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const applicationInsightsManagementClient = new ApplicationInsightsManagementClient(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/azureResources/blobStorageService.ts b/extensions/azurePublishNew/src/services/azureResources/blobStorageService.ts index 244c8dec70..52a6c713dc 100644 --- a/extensions/azurePublishNew/src/services/azureResources/blobStorageService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/blobStorageService.ts @@ -7,7 +7,7 @@ import { throwNotImplementedError } from '../throwNotImplementedError'; const createBlobStorageService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const storageManagementClient = new StorageManagementClient(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/azureResources/cosmosDBService.ts b/extensions/azurePublishNew/src/services/azureResources/cosmosDBService.ts index 4bdf322038..7f5f7fc25f 100644 --- a/extensions/azurePublishNew/src/services/azureResources/cosmosDBService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/cosmosDBService.ts @@ -7,7 +7,7 @@ import { throwNotImplementedError } from '../throwNotImplementedError'; export const createCosmosDBService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const cosmosDBManagementClient = new CosmosDBManagementClient(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/azureResources/luisService.ts b/extensions/azurePublishNew/src/services/azureResources/luisService.ts index 9033f75af7..ae72a826e8 100644 --- a/extensions/azurePublishNew/src/services/azureResources/luisService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/luisService.ts @@ -7,7 +7,7 @@ import { throwNotImplementedError } from '../throwNotImplementedError'; const createLuisService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const cognitiveServicesManagementClient = new CognitiveServicesManagementClient(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/azureResources/qnaService.ts b/extensions/azurePublishNew/src/services/azureResources/qnaService.ts index bcebc3aa51..b96401ee0f 100644 --- a/extensions/azurePublishNew/src/services/azureResources/qnaService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/qnaService.ts @@ -7,11 +7,10 @@ import { TokenCredentials } from '@azure/ms-rest-js'; import { throwNotImplementedError } from '../throwNotImplementedError'; const createQNAService = (token: string, subscriptionId: string) => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const tokenCredentials = new TokenCredentials(token) as any; - // eslint-disable-next-line @typescript-eslint/no-unused-vars + const tokenCredentials = new TokenCredentials(token); + // @ts-expect-error const searchManagementClient = new SearchManagementClient(tokenCredentials, subscriptionId); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const webSiteManagementClient = new WebSiteManagementClient(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/azureResources/webAppAzureFunctionService.ts b/extensions/azurePublishNew/src/services/azureResources/webAppAzureFunctionService.ts index 0ce45e0061..ae2b6a9d49 100644 --- a/extensions/azurePublishNew/src/services/azureResources/webAppAzureFunctionService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/webAppAzureFunctionService.ts @@ -7,7 +7,7 @@ import { throwNotImplementedError } from '../throwNotImplementedError'; const createWebAppAzureFunctionService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const webSiteManagementClient = new WebSiteManagementClient(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/azureResources/webAppService.ts b/extensions/azurePublishNew/src/services/azureResources/webAppService.ts index b970f80f35..b048aa21fe 100644 --- a/extensions/azurePublishNew/src/services/azureResources/webAppService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/webAppService.ts @@ -8,7 +8,7 @@ import { throwNotImplementedError } from '../throwNotImplementedError'; export const createWebAppService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const webSiteManagementClient = new WebSiteManagementClient(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/azureResources/webAppServicePlanService.ts b/extensions/azurePublishNew/src/services/azureResources/webAppServicePlanService.ts index 2949bb3b58..c23b5a5acd 100644 --- a/extensions/azurePublishNew/src/services/azureResources/webAppServicePlanService.ts +++ b/extensions/azurePublishNew/src/services/azureResources/webAppServicePlanService.ts @@ -7,7 +7,7 @@ import { throwNotImplementedError } from '../throwNotImplementedError'; const createWebAppServicePlanService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const webSiteManagementClient = new WebSiteManagementClient(tokenCredentials, subscriptionId); const checkNameAvailability = async () => { diff --git a/extensions/azurePublishNew/src/services/resourceGroupService.ts b/extensions/azurePublishNew/src/services/resourceGroupService.ts index 52f60ff26c..494d1d5afb 100644 --- a/extensions/azurePublishNew/src/services/resourceGroupService.ts +++ b/extensions/azurePublishNew/src/services/resourceGroupService.ts @@ -7,7 +7,7 @@ import { throwNotImplementedError } from './throwNotImplementedError'; const createResourceGroupService = (token: string, subscriptionId: string) => { const tokenCredentials = new TokenCredentials(token); - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // @ts-expect-error const client = new ResourceManagementClient(tokenCredentials, subscriptionId); const list = async () => { diff --git a/extensions/azurePublishNew/tsconfig.json b/extensions/azurePublishNew/tsconfig.json index ae07adba07..7efc382672 100644 --- a/extensions/azurePublishNew/tsconfig.json +++ b/extensions/azurePublishNew/tsconfig.json @@ -13,7 +13,11 @@ "resolveJsonModule": true, "skipLibCheck": true, "sourceMap": true, - "target": "es5" + "target": "es5", + "typeRoots": [ + "./node_modules/@types/", + ], + "types": ["jest"] }, "include": ["src/**/*"], "exclude": ["node_modules"] diff --git a/extensions/azurePublishNew/yarn-berry.lock b/extensions/azurePublishNew/yarn-berry.lock index e689312a95..9bf1379743 100644 --- a/extensions/azurePublishNew/yarn-berry.lock +++ b/extensions/azurePublishNew/yarn-berry.lock @@ -14,42 +14,46 @@ __metadata: languageName: node linkType: hard -"@azure/arm-appinsights@npm:4.0.0": - version: 4.0.0 - resolution: "@azure/arm-appinsights@npm:4.0.0" +"@azure/abort-controller@npm:^1.0.4": + version: 1.1.0 + resolution: "@azure/abort-controller@npm:1.1.0" + dependencies: + tslib: ^2.2.0 + checksum: 0f45e504d4aea799486867179afe7589255f6c111951279958e9d0aa5faebb2c96b8f88e3e3c958ce07b02bcba0b0cddb1bbec94705f573a48ecdb93eec1a92a + languageName: node + linkType: hard + +"@azure/arm-appinsights@npm:^3.0.0": + version: 3.1.1 + resolution: "@azure/arm-appinsights@npm:3.1.1" dependencies: "@azure/core-auth": ^1.1.4 "@azure/ms-rest-azure-js": ^2.1.0 "@azure/ms-rest-js": ^2.2.0 tslib: ^1.10.0 - checksum: c9fadbc1d21e98984e957c7c63542b86da46b9fcf1f13a41c7f563f1859dff765a3a8bcb3aae221cf6ebc97f26d9b353de1a6776b9640ae241b5a6d082d453a5 + checksum: 8eeea6793ca816af442e1109f4118e36783032ec4521a387cfa28052dc9852a4e12c11a192b0e5f2daa46403fa0b31056ee038f4352c70b264973c291152761d languageName: node linkType: hard -"@azure/arm-appservice-profile-2019-03-01-hybrid@npm:1.2.0": - version: 1.2.0 - resolution: "@azure/arm-appservice-profile-2019-03-01-hybrid@npm:1.2.0" +"@azure/arm-appservice-profile-2019-03-01-hybrid@npm:1.0.0": + version: 1.0.0 + resolution: "@azure/arm-appservice-profile-2019-03-01-hybrid@npm:1.0.0" dependencies: - "@azure/core-auth": ^1.1.4 - "@azure/ms-rest-azure-js": ^1.4.0 - "@azure/ms-rest-js": ^1.11.0 + "@azure/ms-rest-azure-js": ^1.3.2 + "@azure/ms-rest-js": ^1.8.1 tslib: ^1.9.3 - checksum: c70f4e73ac8a1f8fe9b1e85be3790f7705c1029e9157dd61d4987dbfdba75fcac984c4ef4318e01be82d00f8fcb605b52e403b10b92d48b7b41ac498065f5475 + checksum: 6433344278ef3fe5bf8795572bcfd18cda9071def9f6081ef1732c7f497ec7f80e3f2d20c23c1d14216f160b126a3282e05cade810b6a2b6b1b4147dfca00cdf languageName: node linkType: hard -"@azure/arm-appservice@npm:13.0.0": - version: 13.0.0 - resolution: "@azure/arm-appservice@npm:13.0.0" +"@azure/arm-appservice@npm:^6.0.0": + version: 6.1.0 + resolution: "@azure/arm-appservice@npm:6.1.0" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.5.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.8.0 - tslib: ^2.2.0 - checksum: 0a21b4d462ac0ba5b46561ef90559bfc2b1f5a2a8ea551ae13f95205b4aafee5b5bd5d03f52fced7687af8d5f37d5451b48b4edc8acabf977b534af1b2790dcd + "@azure/ms-rest-azure-js": ^2.0.1 + "@azure/ms-rest-js": ^2.0.4 + tslib: ^1.10.0 + checksum: 1c2c98b980cecb18c0323f558d39a07bbd78b029d75183f3b8e713a334453eb0ef3139e25bae1196f0d12c4dd5ae3ad7da9c1478ab8247c88d3269eebdff569e languageName: node linkType: hard @@ -65,145 +69,115 @@ __metadata: languageName: node linkType: hard -"@azure/arm-cognitiveservices@npm:7.2.0": - version: 7.2.0 - resolution: "@azure/arm-cognitiveservices@npm:7.2.0" +"@azure/arm-cognitiveservices@npm:^5.2.0": + version: 5.2.0 + resolution: "@azure/arm-cognitiveservices@npm:5.2.0" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.5.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.8.0 - tslib: ^2.2.0 - checksum: de7689e174ed6b25de07357031a5c7c7b1af360753d95dcc98d524ac0f6e42b600b8d832b445bc4a06459e060c04c65b97131b87731441656735ae458ad76b15 + "@azure/ms-rest-azure-js": ^2.0.1 + "@azure/ms-rest-js": ^2.0.4 + tslib: ^1.10.0 + checksum: 20e7988a27f3783165cc82f7eb1aff7f680d888c1b8e698debe90b1e215f945e2f83c9e5035580ab59b6531caa9e0a2481847c746f62f36d226b4fbb8d443276 languageName: node linkType: hard -"@azure/arm-cosmosdb@npm:15.0.0": - version: 15.0.0 - resolution: "@azure/arm-cosmosdb@npm:15.0.0" +"@azure/arm-cosmosdb@npm:^9.0.0": + version: 9.1.0 + resolution: "@azure/arm-cosmosdb@npm:9.1.0" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.0.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.1.0 - tslib: ^2.2.0 - checksum: 4dfb8ad4fb01a68203c757029e6cac4016b8e4687ee3d3b381d57178c9611d6ba978e1c0cef038d6d9713a487fb503d514b423cf11697ad1b58e763d5a56c028 + "@azure/ms-rest-azure-js": ^2.0.1 + "@azure/ms-rest-js": ^2.0.4 + tslib: ^1.10.0 + checksum: 4992ecfbc14b6e923ec628c38b8206e8b0f589ba8ce7697eab0acfd2cbc49e0b334ba145774551b3b5e0bdd7cf22d8687d8aaf96ad77288db0ad49d2c809fa4e languageName: node linkType: hard -"@azure/arm-deploymentmanager@npm:3.1.1": - version: 3.1.1 - resolution: "@azure/arm-deploymentmanager@npm:3.1.1" +"@azure/arm-deploymentmanager@npm:3.0.0": + version: 3.0.0 + resolution: "@azure/arm-deploymentmanager@npm:3.0.0" dependencies: - "@azure/core-auth": ^1.1.4 - "@azure/ms-rest-azure-js": ^2.1.0 - "@azure/ms-rest-js": ^2.2.0 + "@azure/ms-rest-azure-js": ^2.0.1 + "@azure/ms-rest-js": ^2.0.4 tslib: ^1.10.0 - checksum: a570916f3d1acde5b0959e6fe6c84a4c5a69734870cba9091a3cbc85f160f5b805458b600075f78c948af3bc294319a8e522a00e429ec236158690628a1cad0d + checksum: f5ff083cb5b14a1af9f6c0a600ffd8ad60bd9ed21559ddf77b432ba223d2889a0729865b345e3066c145f8ed6c4cf9fc0eb44ff95764f481fb5c758174e40323 languageName: node linkType: hard -"@azure/arm-keyvault-profile-2020-09-01-hybrid@npm:2.0.0": - version: 2.0.0 - resolution: "@azure/arm-keyvault-profile-2020-09-01-hybrid@npm:2.0.0" +"@azure/arm-keyvault-profile-2020-09-01-hybrid@npm:^1.0.0": + version: 1.1.1 + resolution: "@azure/arm-keyvault-profile-2020-09-01-hybrid@npm:1.1.1" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.0.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.1.0 - tslib: ^2.2.0 - checksum: a2aa88865b17a8b64e902cfbd22ee0ccdf0f517537439b45ee6b0f5b19e1fe7f26dc2ab92402d26ce504378359075b7f72756f93fb9776163ca2c3da5223d058 + "@azure/core-auth": ^1.1.4 + "@azure/ms-rest-azure-js": ^2.1.0 + "@azure/ms-rest-js": ^2.2.0 + tslib: ^1.10.0 + checksum: c8ae4cbed3ae65016590ca562a9fd6b6fe39328fb3ee18872aea3efe4e7a2b25ca90980177c52766616b84e6bb8a4a01c77936e2d4a84c66ef7a74874db5d335 languageName: node linkType: hard -"@azure/arm-keyvault@npm:2.0.0": - version: 2.0.0 - resolution: "@azure/arm-keyvault@npm:2.0.0" +"@azure/arm-keyvault@npm:^1.2.1": + version: 1.3.2 + resolution: "@azure/arm-keyvault@npm:1.3.2" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.0.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.1.0 - tslib: ^2.2.0 - checksum: 01198fa2a59e410f1c5086fe0d28ca3b406c073706642bf879edca72e1bdfdb3e520fb18afa99def017f98b7780fd30e832e091ef8271bd10b5bbb2a8b3fcbeb + "@azure/core-auth": ^1.1.4 + "@azure/ms-rest-azure-js": ^1.4.0 + "@azure/ms-rest-js": ^1.11.0 + tslib: ^1.9.3 + checksum: 861dbb54fd07408400a2bbd79a3127d4f22df160205f9ebccf5266eb7cf11f1285cbc6001cccdae7b73700fb532d6f924d90956dba98665bcbda966a1901edb2 languageName: node linkType: hard -"@azure/arm-resources@npm:5.0.1": - version: 5.0.1 - resolution: "@azure/arm-resources@npm:5.0.1" +"@azure/arm-resources@npm:2.1.0": + version: 2.1.0 + resolution: "@azure/arm-resources@npm:2.1.0" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.5.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.8.0 - tslib: ^2.2.0 - checksum: adb305499c8e389b26e2bc2660c77936fea8d33df23c0d46cd76d448b3b88cedd766a6ba869d6ea8bf76508889f7d50e078dde67d9e796ac7c313d9b9bfa47ae + "@azure/ms-rest-azure-js": ^2.0.1 + "@azure/ms-rest-js": ^2.0.4 + tslib: ^1.10.0 + checksum: 5354ba2add7ec9698303c32c00fe1d6c9e949cf68c3f5f08cb4f7feb9bb5208523f02ac8824beaa07fc0e3ac0cbaafdf95d0834e599b6096b9cec8612491ad6c languageName: node linkType: hard -"@azure/arm-search@npm:3.0.1": - version: 3.0.1 - resolution: "@azure/arm-search@npm:3.0.1" +"@azure/arm-search@npm:^1.3.0": + version: 1.4.1 + resolution: "@azure/arm-search@npm:1.4.1" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.5.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.8.0 - tslib: ^2.2.0 - checksum: 31341df443385c8da33c330e52a95704e0776968eb3109d5df143d541bf66232020d525f8ee9ce2027d36c9bd5ba44b7b0f58c9e377bfd81f6f2e607f1620aa1 + "@azure/core-auth": ^1.1.4 + "@azure/ms-rest-azure-js": ^1.4.0 + "@azure/ms-rest-js": ^1.11.0 + tslib: ^1.9.3 + checksum: 7102e38d06a59e108a7780a2cbbd29e9e06a81b6562dd3f56c4179effc1993b4be51b576a6262c77b544e6791e33b8e65b795f42a253d87b8a5896f8138f2ffb languageName: node linkType: hard -"@azure/arm-storage@npm:17.2.1": - version: 17.2.1 - resolution: "@azure/arm-storage@npm:17.2.1" +"@azure/arm-storage@npm:^15.0.0": + version: 15.3.0 + resolution: "@azure/arm-storage@npm:15.3.0" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.5.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.8.0 - tslib: ^2.2.0 - checksum: 7c238e8c0fb04839cdb031e22e0f6494399b1375ebbb72bbef0a34d895659c602f5c7b2b0b84f4d7eecd6eee72e0172ca7893922431feec2e206d816750ae2ff + "@azure/ms-rest-azure-js": ^2.0.1 + "@azure/ms-rest-js": ^2.0.4 + tslib: ^1.10.0 + checksum: 20ca82ebd001d7e6be2bfc2d2d086962249b192ce25e7f1316b2d1e18ec34a5bf02fe73dc865263ed16a86c34a9714de575302e8b89b4861a6b34ee719ee10a5 languageName: node linkType: hard -"@azure/arm-subscriptions@npm:5.0.1": - version: 5.0.1 - resolution: "@azure/arm-subscriptions@npm:5.0.1" +"@azure/arm-subscriptions@npm:2.0.0": + version: 2.0.0 + resolution: "@azure/arm-subscriptions@npm:2.0.0" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-client": ^1.5.0 - "@azure/core-lro": ^2.2.0 - "@azure/core-paging": ^1.2.0 - "@azure/core-rest-pipeline": ^1.8.0 - tslib: ^2.2.0 - checksum: 3b7103635f7d0d6b662ff89c1ab42e522afe79a9fd66207092d9b2683ddca8e9654dd9f14b3de88da6504b9164245acfcaa743d7fac3eebcf3469c47ade6b90a + "@azure/ms-rest-azure-js": ^2.0.1 + "@azure/ms-rest-js": ^2.0.4 + tslib: ^1.10.0 + checksum: b556f16f9b2ab4d3c6a1feece089dcc2b725b6547bd817ef3d0174652db19cf6d1d8619b0ac98f1929007a17c35937e54de2918ee679ba1ef7b0be9501cabc47 languageName: node linkType: hard -"@azure/cognitiveservices-luis-authoring@npm:4.0.0-preview.3": - version: 4.0.0-preview.3 - resolution: "@azure/cognitiveservices-luis-authoring@npm:4.0.0-preview.3" +"@azure/cognitiveservices-luis-authoring@npm:4.0.0-preview.1": + version: 4.0.0-preview.1 + resolution: "@azure/cognitiveservices-luis-authoring@npm:4.0.0-preview.1" dependencies: "@azure/ms-rest-js": ^2.0.3 tslib: ^1.10.0 - checksum: a589c398a49ed5475db998d9d36b9b9126c8363d5e8657b33b8d73313523f304a05db6020f2692d3cf25ca3c0cec8254a76a499d7beb618ab1a58f4c1fe18bfe + checksum: d0bcd63ec9f8903a583e646c55426733e0d14840e3b4ba9aa21a38bf1297677e993deb2896890612702b997d92082e6509e1275b32ec131a727b219adbdd6b18 languageName: node linkType: hard @@ -224,7 +198,32 @@ __metadata: languageName: node linkType: hard -"@azure/core-client@npm:^1.0.0, @azure/core-client@npm:^1.5.0": +"@azure/core-auth@npm:^1.4.0": + version: 1.4.0 + resolution: "@azure/core-auth@npm:1.4.0" + dependencies: + "@azure/abort-controller": ^1.0.0 + tslib: ^2.2.0 + checksum: 1c76c296fe911ad39fc780b033c25a92c41c5a15f011b816d42c13584f627a4dd153dfb4334900ec93eb5b006e14bdda37e8412a7697c5a9636a0abaccffad39 + languageName: node + linkType: hard + +"@azure/core-client@npm:^1.3.0": + version: 1.7.2 + resolution: "@azure/core-client@npm:1.7.2" + dependencies: + "@azure/abort-controller": ^1.0.0 + "@azure/core-auth": ^1.4.0 + "@azure/core-rest-pipeline": ^1.9.1 + "@azure/core-tracing": ^1.0.0 + "@azure/core-util": ^1.0.0 + "@azure/logger": ^1.0.0 + tslib: ^2.2.0 + checksum: 2c6af345ed7f97d7d214873cf08c2564603c659abc8950a1b866b137dfb8b68cc367f75a1c0d0ea840ac8f66a50604661f6f2569184dcda717ec4e62c3c6d977 + languageName: node + linkType: hard + +"@azure/core-client@npm:^1.5.0": version: 1.6.0 resolution: "@azure/core-client@npm:1.6.0" dependencies: @@ -239,26 +238,14 @@ __metadata: languageName: node linkType: hard -"@azure/core-http@npm:^2.0.0": - version: 2.2.3 - resolution: "@azure/core-http@npm:2.2.3" +"@azure/core-http-compat@npm:^1.3.0": + version: 1.3.0 + resolution: "@azure/core-http-compat@npm:1.3.0" dependencies: - "@azure/abort-controller": ^1.0.0 - "@azure/core-asynciterator-polyfill": ^1.0.0 - "@azure/core-auth": ^1.3.0 - "@azure/core-tracing": 1.0.0-preview.13 - "@azure/logger": ^1.0.0 - "@types/node-fetch": ^2.5.0 - "@types/tunnel": ^0.0.3 - form-data: ^4.0.0 - node-fetch: ^2.6.6 - process: ^0.11.10 - tough-cookie: ^4.0.0 - tslib: ^2.2.0 - tunnel: ^0.0.6 - uuid: ^8.3.0 - xml2js: ^0.4.19 - checksum: a19d4f318988f3eb5215624cf428281b589cc834ba0c4928ee05f949861fad3b8da8999ca56adf2b061782fe5d4c3f617f377afaddb8d36e4c8652ba08493076 + "@azure/abort-controller": ^1.0.4 + "@azure/core-client": ^1.3.0 + "@azure/core-rest-pipeline": ^1.3.0 + checksum: 26938e58348c44b7fe3ede0dececaa3bf1f8b2012bdd457a004da973dd3cfbfd093c44184ea3fa0e6b41d4c4bf62574c268bc4cf50325f5dadedb7500158b742 languageName: node linkType: hard @@ -284,47 +271,56 @@ __metadata: languageName: node linkType: hard -"@azure/core-paging@npm:^1.2.0": - version: 1.3.0 - resolution: "@azure/core-paging@npm:1.3.0" +"@azure/core-rest-pipeline@npm:^1.2.0": + version: 1.4.0 + resolution: "@azure/core-rest-pipeline@npm:1.4.0" dependencies: + "@azure/abort-controller": ^1.0.0 + "@azure/core-auth": ^1.3.0 + "@azure/core-tracing": 1.0.0-preview.13 + "@azure/logger": ^1.0.0 + form-data: ^4.0.0 + http-proxy-agent: ^4.0.1 + https-proxy-agent: ^5.0.0 tslib: ^2.2.0 - checksum: 3fbf3d6474e2346f7c3ea8344a41bf41e053789efbbd29df78365e9c9ca66e143da3e5407d8c9dd5ddc82a65680185cd6f0ec851c48635776d18a6a605a98e78 + uuid: ^8.3.0 + checksum: 63addce249281a11c23c3a22d2a7eb0cae8d7d89b5ee16a49cc6d85b5d3e9293e6d8051cf20c15ee1150af5b4295dc162d6a911f064f3f56d6122f2727145a24 languageName: node linkType: hard -"@azure/core-rest-pipeline@npm:^1.1.0, @azure/core-rest-pipeline@npm:^1.5.0, @azure/core-rest-pipeline@npm:^1.8.0": - version: 1.9.0 - resolution: "@azure/core-rest-pipeline@npm:1.9.0" +"@azure/core-rest-pipeline@npm:^1.3.0, @azure/core-rest-pipeline@npm:^1.9.1": + version: 1.10.1 + resolution: "@azure/core-rest-pipeline@npm:1.10.1" dependencies: "@azure/abort-controller": ^1.0.0 - "@azure/core-auth": ^1.3.0 + "@azure/core-auth": ^1.4.0 "@azure/core-tracing": ^1.0.1 "@azure/core-util": ^1.0.0 "@azure/logger": ^1.0.0 form-data: ^4.0.0 - http-proxy-agent: ^4.0.1 + http-proxy-agent: ^5.0.0 https-proxy-agent: ^5.0.0 tslib: ^2.2.0 uuid: ^8.3.0 - checksum: a8d21693251b7c2c87b52c62b4dd4a37901a82be8b050283821a56ec80257ef39cb2aa36f7f57bf0cb425ab4c04d84df74e019db8a6b404f1d40a81a08f8e260 + checksum: d1c165047519c05b702184ffadf900a1f3eca032795b0f4f5b174c8257b663c1b1eab847236579dddcf637ea380896e17328ebf5022050441ee80672ad6c449d languageName: node linkType: hard -"@azure/core-rest-pipeline@npm:^1.2.0": - version: 1.4.0 - resolution: "@azure/core-rest-pipeline@npm:1.4.0" +"@azure/core-rest-pipeline@npm:^1.5.0, @azure/core-rest-pipeline@npm:^1.8.0": + version: 1.9.0 + resolution: "@azure/core-rest-pipeline@npm:1.9.0" dependencies: "@azure/abort-controller": ^1.0.0 "@azure/core-auth": ^1.3.0 - "@azure/core-tracing": 1.0.0-preview.13 + "@azure/core-tracing": ^1.0.1 + "@azure/core-util": ^1.0.0 "@azure/logger": ^1.0.0 form-data: ^4.0.0 http-proxy-agent: ^4.0.1 https-proxy-agent: ^5.0.0 tslib: ^2.2.0 uuid: ^8.3.0 - checksum: 63addce249281a11c23c3a22d2a7eb0cae8d7d89b5ee16a49cc6d85b5d3e9293e6d8051cf20c15ee1150af5b4295dc162d6a911f064f3f56d6122f2727145a24 + checksum: a8d21693251b7c2c87b52c62b4dd4a37901a82be8b050283821a56ec80257ef39cb2aa36f7f57bf0cb425ab4c04d84df74e019db8a6b404f1d40a81a08f8e260 languageName: node linkType: hard @@ -356,12 +352,13 @@ __metadata: languageName: node linkType: hard -"@azure/cosmos@npm:3.16.2": - version: 3.16.2 - resolution: "@azure/cosmos@npm:3.16.2" +"@azure/cosmos@npm:^3.7.4": + version: 3.17.2 + resolution: "@azure/cosmos@npm:3.17.2" dependencies: "@azure/core-auth": ^1.3.0 "@azure/core-rest-pipeline": ^1.2.0 + "@azure/core-tracing": ^1.0.0 debug: ^4.1.1 fast-json-stable-stringify: ^2.1.0 jsbi: ^3.1.3 @@ -371,33 +368,37 @@ __metadata: tslib: ^2.2.0 universal-user-agent: ^6.0.0 uuid: ^8.3.0 - checksum: b18ac2b2f78f73f68c2fbf6820857c53b34e000da262d7657ee259006c34239e9738cc010fd141076b05d2afa3a562d1c80b674e28803c0d8dde16de426634b8 + checksum: f21491dbe23503af43ef74c89689b8f586080f215a0f94d55b44a8896bbd68a11a3e8ae1cf8490ecd0b5a8c45d607ab2387910f5213052c42fb1c9661db6a3b4 languageName: node linkType: hard -"@azure/graph@npm:5.0.3": - version: 5.0.3 - resolution: "@azure/graph@npm:5.0.3" +"@azure/graph@npm:5.0.1": + version: 5.0.1 + resolution: "@azure/graph@npm:5.0.1" dependencies: "@azure/ms-rest-azure-js": ^2.0.0 "@azure/ms-rest-js": ^2.0.3 tslib: ^1.10.0 - checksum: 53ad53eda9fddc6401642e6fbb61f24fd117d343f97a2221932a64f9391f8a74795448bedef401d243710a173c08af1f8b36a69a5921718bafd78f25bd385cdb + checksum: e052b9213ef48402cad153dfc113e82a8ac0ac565165d56738caabd9b77ce2c4522c7210f835159c14e25f02c8fb9a7211f8a962b0044ce0cdd8024f208d6e74 languageName: node linkType: hard -"@azure/keyvault-secrets@npm:4.4.0": - version: 4.4.0 - resolution: "@azure/keyvault-secrets@npm:4.4.0" +"@azure/keyvault-secrets@npm:^4.1.0": + version: 4.6.0 + resolution: "@azure/keyvault-secrets@npm:4.6.0" dependencies: "@azure/abort-controller": ^1.0.0 - "@azure/core-http": ^2.0.0 + "@azure/core-auth": ^1.3.0 + "@azure/core-client": ^1.5.0 + "@azure/core-http-compat": ^1.3.0 "@azure/core-lro": ^2.2.0 "@azure/core-paging": ^1.1.1 - "@azure/core-tracing": 1.0.0-preview.13 + "@azure/core-rest-pipeline": ^1.8.0 + "@azure/core-tracing": ^1.0.0 + "@azure/core-util": ^1.0.0 "@azure/logger": ^1.0.0 tslib: ^2.2.0 - checksum: 4efd2a0215f05dce5be1fe6f3dd675424f0ff000e87154d0d53d4d6d8e5adfaf89f610d2c03ff111c6b31ffaf59a704a3cd61666b107ac1385ad241f8c5c609e + checksum: 27a321b1d9211a0eedda96fbc509788cb71b40e8582a062d7c00f37046ec716259729c0e90e36c946eaaf24a473fea467401b8e68343097fd01cabf2f73e0f70 languageName: node linkType: hard @@ -410,7 +411,7 @@ __metadata: languageName: node linkType: hard -"@azure/ms-rest-azure-js@npm:^1.4.0": +"@azure/ms-rest-azure-js@npm:^1.3.2, @azure/ms-rest-azure-js@npm:^1.4.0": version: 1.4.0 resolution: "@azure/ms-rest-azure-js@npm:1.4.0" dependencies: @@ -421,7 +422,7 @@ __metadata: languageName: node linkType: hard -"@azure/ms-rest-azure-js@npm:^2.0.0, @azure/ms-rest-azure-js@npm:^2.1.0": +"@azure/ms-rest-azure-js@npm:^2.0.0, @azure/ms-rest-azure-js@npm:^2.0.1, @azure/ms-rest-azure-js@npm:^2.1.0": version: 2.1.0 resolution: "@azure/ms-rest-azure-js@npm:2.1.0" dependencies: @@ -432,7 +433,7 @@ __metadata: languageName: node linkType: hard -"@azure/ms-rest-js@npm:^1.10.0, @azure/ms-rest-js@npm:^1.11.0": +"@azure/ms-rest-js@npm:^1.10.0, @azure/ms-rest-js@npm:^1.11.0, @azure/ms-rest-js@npm:^1.8.1": version: 1.11.2 resolution: "@azure/ms-rest-js@npm:1.11.2" dependencies: @@ -465,6 +466,23 @@ __metadata: languageName: node linkType: hard +"@azure/ms-rest-js@npm:^2.0.4": + version: 2.6.4 + resolution: "@azure/ms-rest-js@npm:2.6.4" + dependencies: + "@azure/core-auth": ^1.1.4 + abort-controller: ^3.0.0 + form-data: ^2.5.0 + node-fetch: ^2.6.7 + tough-cookie: ^3.0.1 + tslib: ^1.10.0 + tunnel: 0.0.6 + uuid: ^8.3.2 + xml2js: ^0.4.19 + checksum: eefc1bf2cc00ee5f603a64b6d145aef98287fe9de7fbb3d8cd68c2f24b38eddb4af4535b6bd937f8fac285c47a6c68db3c005095444d78b5e70fb5adaa4f2780 + languageName: node + linkType: hard + "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.16.7": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" @@ -1992,7 +2010,7 @@ __metadata: "@botframework-composer/types@file:../../Composer/packages/types::locator=azure-publish-new%40workspace%3A.": version: 0.0.2 - resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=ff5977&locator=azure-publish-new%40workspace%3A." + resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=a03b13&locator=azure-publish-new%40workspace%3A." dependencies: "@types/express": 4.16.1 "@types/passport": ^1.0.4 @@ -2001,7 +2019,7 @@ __metadata: express-serve-static-core: 0.1.1 json-schema: 0.4.0 tslib: 2.4.0 - checksum: 377541c2d09305b36e9e12a1b200725bf7c37580a959f2d24007f51052b5f9536b7e0dea48f1f7b574fcca0b8858c97658f413c2df50238f9e70cdcbeaf678e5 + checksum: 042462523dc3e89a15817f431da9df2cfd64b5adcbc29b0fb7dfcebe2989dd7e76445890540be2919c7c230912826a5b83bd1bd90398ef3be4c7e35be78ed41d languageName: node linkType: hard @@ -3076,6 +3094,13 @@ __metadata: languageName: node linkType: hard +"@tootallnate/once@npm:2": + version: 2.0.0 + resolution: "@tootallnate/once@npm:2.0.0" + checksum: ad87447820dd3f24825d2d947ebc03072b20a42bfc96cbafec16bff8bbda6c1a81fcb0be56d5b21968560c5359a0af4038a68ba150c3e1694fe4c109a063bed8 + languageName: node + linkType: hard + "@types/archiver@npm:5.3.1": version: 5.3.1 resolution: "@types/archiver@npm:5.3.1" @@ -3311,6 +3336,16 @@ __metadata: languageName: node linkType: hard +"@types/jest@npm:ts3.9": + version: 28.1.1 + resolution: "@types/jest@npm:28.1.1" + dependencies: + jest-matcher-utils: ^27.0.0 + pretty-format: ^27.0.0 + checksum: 0a8b045a7b660372decc807c390d3f99a2b12bb1659a1cd593afe04557f4b7c235b0576a5e35b1577710d20e42759d3d8755eb8bed6edc8733f47007e75a5509 + languageName: node + linkType: hard + "@types/json-schema@npm:*": version: 7.0.11 resolution: "@types/json-schema@npm:7.0.11" @@ -3371,7 +3406,7 @@ __metadata: languageName: node linkType: hard -"@types/node-fetch@npm:^2.5.0, @types/node-fetch@npm:~2.5.5": +"@types/node-fetch@npm:~2.5.5": version: 2.5.12 resolution: "@types/node-fetch@npm:2.5.12" dependencies: @@ -3547,15 +3582,6 @@ __metadata: languageName: node linkType: hard -"@types/tunnel@npm:^0.0.3": - version: 0.0.3 - resolution: "@types/tunnel@npm:0.0.3" - dependencies: - "@types/node": "*" - checksum: 53e23a1f9fb14a491c00425b2a4fc443817564d77be5e1b95fcbeb6d009551b62ea82ffc3e5ca0c6b9f6b186824ca6ec46e7450c1bcd6674a46d1325f0116e24 - languageName: node - linkType: hard - "@types/unist@npm:*, @types/unist@npm:^2.0.0, @types/unist@npm:^2.0.2, @types/unist@npm:^2.0.3": version: 2.0.6 resolution: "@types/unist@npm:2.0.6" @@ -4260,23 +4286,23 @@ __metadata: version: 0.0.0-use.local resolution: "azure-publish-new@workspace:." dependencies: - "@azure/arm-appinsights": 4.0.0 - "@azure/arm-appservice": 13.0.0 - "@azure/arm-appservice-profile-2019-03-01-hybrid": 1.2.0 + "@azure/arm-appinsights": ^3.0.0 + "@azure/arm-appservice": ^6.0.0 + "@azure/arm-appservice-profile-2019-03-01-hybrid": 1.0.0 "@azure/arm-botservice": 3.1.0 - "@azure/arm-cognitiveservices": 7.2.0 - "@azure/arm-cosmosdb": 15.0.0 - "@azure/arm-deploymentmanager": 3.1.1 - "@azure/arm-keyvault": 2.0.0 - "@azure/arm-keyvault-profile-2020-09-01-hybrid": 2.0.0 - "@azure/arm-resources": 5.0.1 - "@azure/arm-search": 3.0.1 - "@azure/arm-storage": 17.2.1 - "@azure/arm-subscriptions": 5.0.1 - "@azure/cognitiveservices-luis-authoring": 4.0.0-preview.3 - "@azure/cosmos": 3.16.2 - "@azure/graph": 5.0.3 - "@azure/keyvault-secrets": 4.4.0 + "@azure/arm-cognitiveservices": ^5.2.0 + "@azure/arm-cosmosdb": ^9.0.0 + "@azure/arm-deploymentmanager": 3.0.0 + "@azure/arm-keyvault": ^1.2.1 + "@azure/arm-keyvault-profile-2020-09-01-hybrid": ^1.0.0 + "@azure/arm-resources": 2.1.0 + "@azure/arm-search": ^1.3.0 + "@azure/arm-storage": ^15.0.0 + "@azure/arm-subscriptions": 2.0.0 + "@azure/cognitiveservices-luis-authoring": 4.0.0-preview.1 + "@azure/cosmos": ^3.7.4 + "@azure/graph": 5.0.1 + "@azure/keyvault-secrets": ^4.1.0 "@babel/plugin-transform-runtime": 7.18.6 "@bfc/extension-client": "file:../../Composer/packages/extension-client" "@bfc/indexers": ../../Composer/packages/lib/indexers @@ -4291,6 +4317,7 @@ __metadata: "@monaco-editor/react": 4.4.5 "@types/archiver": 5.3.1 "@types/fs-extra": 9.0.13 + "@types/jest": ts3.9 "@types/node": 18.0.3 "@types/react": ^16.9.53 "@types/react-dom": 18.0.6 @@ -5494,6 +5521,13 @@ __metadata: languageName: node linkType: hard +"diff-sequences@npm:^27.5.1": + version: 27.5.1 + resolution: "diff-sequences@npm:27.5.1" + checksum: a00db5554c9da7da225db2d2638d85f8e41124eccbd56cbaefb3b276dcbb1c1c2ad851c32defe2055a54a4806f030656cbf6638105fd6ce97bb87b90b32a33ca + languageName: node + linkType: hard + "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -6671,6 +6705,17 @@ __metadata: languageName: node linkType: hard +"http-proxy-agent@npm:^5.0.0": + version: 5.0.0 + resolution: "http-proxy-agent@npm:5.0.0" + dependencies: + "@tootallnate/once": 2 + agent-base: 6 + debug: 4 + checksum: e2ee1ff1656a131953839b2a19cd1f3a52d97c25ba87bd2559af6ae87114abf60971e498021f9b73f9fd78aea8876d1fb0d4656aac8a03c6caa9fc175f22b786 + languageName: node + linkType: hard + "http-signature@npm:~1.2.0": version: 1.2.0 resolution: "http-signature@npm:1.2.0" @@ -7336,6 +7381,18 @@ __metadata: languageName: node linkType: hard +"jest-diff@npm:^27.5.1": + version: 27.5.1 + resolution: "jest-diff@npm:27.5.1" + dependencies: + chalk: ^4.0.0 + diff-sequences: ^27.5.1 + jest-get-type: ^27.5.1 + pretty-format: ^27.5.1 + checksum: 8be27c1e1ee57b2bb2bef9c0b233c19621b4c43d53a3c26e2c00a4e805eb4ea11fe1694a06a9fb0e80ffdcfdc0d2b1cb0b85920b3f5c892327ecd1e7bd96b865 + languageName: node + linkType: hard + "jest-docblock@npm:^26.0.0": version: 26.0.0 resolution: "jest-docblock@npm:26.0.0" @@ -7401,6 +7458,13 @@ __metadata: languageName: node linkType: hard +"jest-get-type@npm:^27.5.1": + version: 27.5.1 + resolution: "jest-get-type@npm:27.5.1" + checksum: 63064ab70195c21007d897c1157bf88ff94a790824a10f8c890392e7d17eda9c3900513cb291ca1c8d5722cad79169764e9a1279f7c8a9c4cd6e9109ff04bbc0 + languageName: node + linkType: hard + "jest-haste-map@npm:^26.6.2": version: 26.6.2 resolution: "jest-haste-map@npm:26.6.2" @@ -7474,6 +7538,18 @@ __metadata: languageName: node linkType: hard +"jest-matcher-utils@npm:^27.0.0": + version: 27.5.1 + resolution: "jest-matcher-utils@npm:27.5.1" + dependencies: + chalk: ^4.0.0 + jest-diff: ^27.5.1 + jest-get-type: ^27.5.1 + pretty-format: ^27.5.1 + checksum: bb2135fc48889ff3fe73888f6cc7168ddab9de28b51b3148f820c89fdfd2effdcad005f18be67d0b9be80eda208ad47290f62f03d0a33f848db2dd0273c8217a + languageName: node + linkType: hard + "jest-message-util@npm:^26.6.2": version: 26.6.2 resolution: "jest-message-util@npm:26.6.2" @@ -8620,7 +8696,7 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.6": +"node-fetch@npm:^2.6.0": version: 2.6.7 resolution: "node-fetch@npm:2.6.7" dependencies: @@ -8634,6 +8710,20 @@ __metadata: languageName: node linkType: hard +"node-fetch@npm:^2.6.7": + version: 2.6.9 + resolution: "node-fetch@npm:2.6.9" + dependencies: + whatwg-url: ^5.0.0 + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + checksum: acb04f9ce7224965b2b59e71b33c639794d8991efd73855b0b250921382b38331ffc9d61bce502571f6cc6e11a8905ca9b1b6d4aeb586ab093e2756a1fd190d0 + languageName: node + linkType: hard + "node-gyp@npm:latest": version: 8.4.1 resolution: "node-gyp@npm:8.4.1" @@ -9121,6 +9211,17 @@ __metadata: languageName: node linkType: hard +"pretty-format@npm:^27.5.1": + version: 27.5.1 + resolution: "pretty-format@npm:27.5.1" + dependencies: + ansi-regex: ^5.0.1 + ansi-styles: ^5.0.0 + react-is: ^17.0.1 + checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088 + languageName: node + linkType: hard + "printj@npm:~1.1.0": version: 1.1.2 resolution: "printj@npm:1.1.2" @@ -9144,13 +9245,6 @@ __metadata: languageName: node linkType: hard -"process@npm:^0.11.10": - version: 0.11.10 - resolution: "process@npm:0.11.10" - checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3 - languageName: node - linkType: hard - "promise-inflight@npm:^1.0.1": version: 1.0.1 resolution: "promise-inflight@npm:1.0.1" @@ -10609,7 +10703,7 @@ __metadata: languageName: node linkType: hard -"tunnel@npm:0.0.6, tunnel@npm:^0.0.6": +"tunnel@npm:0.0.6": version: 0.0.6 resolution: "tunnel@npm:0.0.6" checksum: c362948df9ad34b649b5585e54ce2838fa583aa3037091aaed66793c65b423a264e5229f0d7e9a95513a795ac2bd4cb72cda7e89a74313f182c1e9ae0b0994fa diff --git a/extensions/localPublish/src/index.ts b/extensions/localPublish/src/index.ts index aa5d8316b6..685c6d536c 100644 --- a/extensions/localPublish/src/index.ts +++ b/extensions/localPublish/src/index.ts @@ -259,7 +259,7 @@ class LocalPublisher implements PublishPlugin { // if a port (e.g. --port 5000) is configured in the custom runtime command try to parse and set this port if (settings.runtime.command && settings.runtime.command.includes('--port')) { try { - port = /--port (\d+)/.exec(settings.runtime.command)[1]; + port = Number(/--port (\d+)/.exec(settings.runtime.command)[1]); } catch (err) { console.warn(`Custom runtime command has an invalid port argument.`); } diff --git a/extensions/localPublish/src/runtimeLogServer.ts b/extensions/localPublish/src/runtimeLogServer.ts index 3888602d7b..91d821a7c6 100644 --- a/extensions/localPublish/src/runtimeLogServer.ts +++ b/extensions/localPublish/src/runtimeLogServer.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import http from 'http'; +import http, { IncomingMessage } from 'http'; +import type { Duplex } from 'stream'; import portfinder from 'portfinder'; import express, { Request, Response } from 'express'; @@ -13,6 +14,15 @@ interface WebSocket { send(data: string, cb?: (err?: Error) => void): void; } +interface CustomHttpReq extends Request { + params: Record; + claimUpgrade?: () => { + socket: Duplex; + head: Buffer; + }; +} +type CustomReq = CustomHttpReq | IncomingMessage; + export class RuntimeLogServer { private static restServer: http.Server; private static servers: WSServer = {}; @@ -37,7 +47,7 @@ export class RuntimeLogServer { const app = express(); this.restServer = http.createServer(app); - this.restServer.on('upgrade', (req, socket, head) => { + this.restServer.on('upgrade', (req: any, socket, head) => { req.claimUpgrade = () => ({ head, socket, @@ -53,21 +63,21 @@ export class RuntimeLogServer { log(`Using ${port} port for runtime-log`); this.restServer.listen(port, boundHost); - app.use('/ws/runtimeLog/:projectId', (req: Request, res: Response) => { - if (!(req as any).claimUpgrade) { - return (res as any).status(426).send('Connection must upgrade for web sockets.'); + app.use('/ws/runtimeLog/:projectId', (req: CustomHttpReq, res) => { + if (!req.claimUpgrade) { + return res.status(426).send('Connection must upgrade for web sockets.'); } - const projectId = (req as any).params.projectId; + const projectId = req.params.projectId; // initialize a new web socket server for each new projectId if (projectId && !this.servers[projectId]) { - const { head, socket } = (req as any).claimUpgrade(); + const { head, socket } = req.claimUpgrade(); const wsServer = new WSServer({ noServer: true, }); - wsServer.on('connection', (socket, req) => { + wsServer.on('connection', (socket) => { this.sockets[projectId] = socket; socket.on('close', () => { delete this.servers[projectId]; @@ -76,7 +86,7 @@ export class RuntimeLogServer { }); // upgrade the connection to a ws connection - wsServer.handleUpgrade(req as any, socket, head, (socket) => { + wsServer.handleUpgrade(req, socket, head, (socket) => { wsServer.emit('connection', socket, req); }); this.servers[projectId] = wsServer; diff --git a/extensions/localPublish/yarn-berry.lock b/extensions/localPublish/yarn-berry.lock index b575ad378d..3672f38bd1 100644 --- a/extensions/localPublish/yarn-berry.lock +++ b/extensions/localPublish/yarn-berry.lock @@ -7,7 +7,7 @@ __metadata: "@botframework-composer/types@file:../../Composer/packages/types::locator=localpublish%40workspace%3A.": version: 0.0.2 - resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=ff5977&locator=localpublish%40workspace%3A." + resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=a03b13&locator=localpublish%40workspace%3A." dependencies: "@types/express": 4.16.1 "@types/passport": ^1.0.4 @@ -16,7 +16,7 @@ __metadata: express-serve-static-core: 0.1.1 json-schema: 0.4.0 tslib: 2.4.0 - checksum: 377541c2d09305b36e9e12a1b200725bf7c37580a959f2d24007f51052b5f9536b7e0dea48f1f7b574fcca0b8858c97658f413c2df50238f9e70cdcbeaf678e5 + checksum: 042462523dc3e89a15817f431da9df2cfd64b5adcbc29b0fb7dfcebe2989dd7e76445890540be2919c7c230912826a5b83bd1bd90398ef3be4c7e35be78ed41d languageName: node linkType: hard diff --git a/extensions/mockRemotePublish/yarn-berry.lock b/extensions/mockRemotePublish/yarn-berry.lock index 66f2836775..231a5dcddf 100644 --- a/extensions/mockRemotePublish/yarn-berry.lock +++ b/extensions/mockRemotePublish/yarn-berry.lock @@ -7,7 +7,7 @@ __metadata: "@botframework-composer/types@file:../../Composer/packages/types::locator=mockRemotePublish%40workspace%3A.": version: 0.0.2 - resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=ff5977&locator=mockRemotePublish%40workspace%3A." + resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=a03b13&locator=mockRemotePublish%40workspace%3A." dependencies: "@types/express": 4.16.1 "@types/passport": ^1.0.4 @@ -16,7 +16,7 @@ __metadata: express-serve-static-core: 0.1.1 json-schema: 0.4.0 tslib: 2.4.0 - checksum: 377541c2d09305b36e9e12a1b200725bf7c37580a959f2d24007f51052b5f9536b7e0dea48f1f7b574fcca0b8858c97658f413c2df50238f9e70cdcbeaf678e5 + checksum: 042462523dc3e89a15817f431da9df2cfd64b5adcbc29b0fb7dfcebe2989dd7e76445890540be2919c7c230912826a5b83bd1bd90398ef3be4c7e35be78ed41d languageName: node linkType: hard diff --git a/extensions/mongoStorage/tsconfig.json b/extensions/mongoStorage/tsconfig.json index a5d3eb5917..a21c02648a 100644 --- a/extensions/mongoStorage/tsconfig.json +++ b/extensions/mongoStorage/tsconfig.json @@ -2,6 +2,7 @@ "compilerOptions": { "target": "ES2015", "module": "commonjs", + "skipLibCheck": true, "declaration": false, "sourceMap": true, "outDir": "./lib", diff --git a/extensions/packageManager/package.json b/extensions/packageManager/package.json index 235922edfc..3ab160a7da 100644 --- a/extensions/packageManager/package.json +++ b/extensions/packageManager/package.json @@ -74,6 +74,7 @@ "@botframework-composer/types": "file:../../Composer/packages/types", "@types/express": "4.17.13", "@types/fs-extra": "9.0.13", + "@types/jest": "ts3.9", "@types/node": "18.0.3", "@types/passport": "1.0.9", "@types/react": "^16.9.53", diff --git a/extensions/packageManager/src/components/FeedModal.tsx b/extensions/packageManager/src/components/FeedModal.tsx index e4240646e0..66b50295c5 100644 --- a/extensions/packageManager/src/components/FeedModal.tsx +++ b/extensions/packageManager/src/components/FeedModal.tsx @@ -267,7 +267,7 @@ export const FeedModal: React.FC = (props) => { selection.setKeySelected(newItem.key, true, false); setSelection(selection); - telemetryClient.track('PackageFeedAdded', {}); + telemetryClient.track('PackageFeedAdded'); setEditRow(true); }; @@ -281,7 +281,7 @@ export const FeedModal: React.FC = (props) => { ) { setItems(items.filter((i) => i.key !== selectedItem.key)); setSelectedItem(undefined); - telemetryClient.track('PackageFeedDeleted', {}); + telemetryClient.track('PackageFeedDeleted'); } }; diff --git a/extensions/packageManager/src/node/feeds/nuget/nugetInterfaces.ts b/extensions/packageManager/src/node/feeds/nuget/nugetInterfaces.ts index adccbe1378..10fcb8e4b1 100644 --- a/extensions/packageManager/src/node/feeds/nuget/nugetInterfaces.ts +++ b/extensions/packageManager/src/node/feeds/nuget/nugetInterfaces.ts @@ -22,7 +22,7 @@ export interface INuGetPackage { versions: INuGetVersion[]; tags?: string | string[]; projectUrl?: string; - totalDownloads: number; + totalDownloads?: number; } /** diff --git a/extensions/packageManager/src/node/index.ts b/extensions/packageManager/src/node/index.ts index 85ed12e72a..7d79dd6744 100644 --- a/extensions/packageManager/src/node/index.ts +++ b/extensions/packageManager/src/node/index.ts @@ -311,8 +311,7 @@ export default async (composer: IExtensionRegistration): Promise => { packageName, version, source, - currentProject, - isPreview + currentProject ); const manifestFile = runtime.identifyManifest(runtimePath, currentProject.name); @@ -379,7 +378,9 @@ export default async (composer: IExtensionRegistration): Promise => { const newlyInstalledPlugin = installedComponents.find((c) => hasSchema(c) && c.name == packageName); if ( newlyInstalledPlugin && - !currentProject.settings.runtimeSettings?.components?.find((p) => p.name === newlyInstalledPlugin.name) + !currentProject.settings.runtimeSettings?.components?.find( + (p: { name: string }) => p.name === newlyInstalledPlugin.name + ) ) { const newSettings = await currentProject.getEnvSettings(); // guard against missing settings keys @@ -478,7 +479,9 @@ export default async (composer: IExtensionRegistration): Promise => { }); // update the settings.components array - if (currentProject.settings.runtimeSettings?.components?.find((p) => p.name === packageName)) { + if ( + currentProject.settings.runtimeSettings?.components?.find((p: { name: string }) => p.name === packageName) + ) { const newSettings = await currentProject.getEnvSettings(); newSettings.runtimeSettings.components = newSettings.runtimeSettings.components.filter( (p) => p.name !== packageName diff --git a/extensions/packageManager/tsconfig.json b/extensions/packageManager/tsconfig.json index cc7c0de8da..421dfc363d 100644 --- a/extensions/packageManager/tsconfig.json +++ b/extensions/packageManager/tsconfig.json @@ -2,6 +2,7 @@ "compilerOptions": { "alwaysStrict": true, "jsx": "react", + "skipLibCheck": true, "esModuleInterop": true }, "include": [ diff --git a/extensions/packageManager/yarn-berry.lock b/extensions/packageManager/yarn-berry.lock index 2264cbac54..4db806ae55 100644 --- a/extensions/packageManager/yarn-berry.lock +++ b/extensions/packageManager/yarn-berry.lock @@ -154,7 +154,7 @@ __metadata: "@botframework-composer/types@file:../../Composer/packages/types::locator=package-manager%40workspace%3A.": version: 0.0.2 - resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=ff5977&locator=package-manager%40workspace%3A." + resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=a03b13&locator=package-manager%40workspace%3A." dependencies: "@types/express": 4.16.1 "@types/passport": ^1.0.4 @@ -163,7 +163,7 @@ __metadata: express-serve-static-core: 0.1.1 json-schema: 0.4.0 tslib: 2.4.0 - checksum: 377541c2d09305b36e9e12a1b200725bf7c37580a959f2d24007f51052b5f9536b7e0dea48f1f7b574fcca0b8858c97658f413c2df50238f9e70cdcbeaf678e5 + checksum: 042462523dc3e89a15817f431da9df2cfd64b5adcbc29b0fb7dfcebe2989dd7e76445890540be2919c7c230912826a5b83bd1bd90398ef3be4c7e35be78ed41d languageName: node linkType: hard @@ -1157,6 +1157,16 @@ __metadata: languageName: node linkType: hard +"@types/jest@npm:ts3.9": + version: 28.1.1 + resolution: "@types/jest@npm:28.1.1" + dependencies: + jest-matcher-utils: ^27.0.0 + pretty-format: ^27.0.0 + checksum: 0a8b045a7b660372decc807c390d3f99a2b12bb1659a1cd593afe04557f4b7c235b0576a5e35b1577710d20e42759d3d8755eb8bed6edc8733f47007e75a5509 + languageName: node + linkType: hard + "@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8": version: 7.0.11 resolution: "@types/json-schema@npm:7.0.11" @@ -1620,6 +1630,13 @@ __metadata: languageName: node linkType: hard +"ansi-styles@npm:^5.0.0": + version: 5.2.0 + resolution: "ansi-styles@npm:5.2.0" + checksum: d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469 + languageName: node + linkType: hard + "ansicolors@npm:~0.3.2": version: 0.3.2 resolution: "ansicolors@npm:0.3.2" @@ -1853,7 +1870,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^4.1.0, chalk@npm:^4.1.2": +"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -2217,6 +2234,13 @@ __metadata: languageName: node linkType: hard +"diff-sequences@npm:^27.5.1": + version: 27.5.1 + resolution: "diff-sequences@npm:27.5.1" + checksum: a00db5554c9da7da225db2d2638d85f8e41124eccbd56cbaefb3b276dcbb1c1c2ad851c32defe2055a54a4806f030656cbf6638105fd6ce97bb87b90b32a33ca + languageName: node + linkType: hard + "diff@npm:^5.0.0": version: 5.1.0 resolution: "diff@npm:5.1.0" @@ -3061,6 +3085,37 @@ __metadata: languageName: node linkType: hard +"jest-diff@npm:^27.5.1": + version: 27.5.1 + resolution: "jest-diff@npm:27.5.1" + dependencies: + chalk: ^4.0.0 + diff-sequences: ^27.5.1 + jest-get-type: ^27.5.1 + pretty-format: ^27.5.1 + checksum: 8be27c1e1ee57b2bb2bef9c0b233c19621b4c43d53a3c26e2c00a4e805eb4ea11fe1694a06a9fb0e80ffdcfdc0d2b1cb0b85920b3f5c892327ecd1e7bd96b865 + languageName: node + linkType: hard + +"jest-get-type@npm:^27.5.1": + version: 27.5.1 + resolution: "jest-get-type@npm:27.5.1" + checksum: 63064ab70195c21007d897c1157bf88ff94a790824a10f8c890392e7d17eda9c3900513cb291ca1c8d5722cad79169764e9a1279f7c8a9c4cd6e9109ff04bbc0 + languageName: node + linkType: hard + +"jest-matcher-utils@npm:^27.0.0": + version: 27.5.1 + resolution: "jest-matcher-utils@npm:27.5.1" + dependencies: + chalk: ^4.0.0 + jest-diff: ^27.5.1 + jest-get-type: ^27.5.1 + pretty-format: ^27.5.1 + checksum: bb2135fc48889ff3fe73888f6cc7168ddab9de28b51b3148f820c89fdfd2effdcad005f18be67d0b9be80eda208ad47290f62f03d0a33f848db2dd0273c8217a + languageName: node + linkType: hard + "jest-worker@npm:^27.4.5": version: 27.5.1 resolution: "jest-worker@npm:27.5.1" @@ -3805,6 +3860,7 @@ __metadata: "@microsoft/bf-dialog": 4.15.0 "@types/express": 4.17.13 "@types/fs-extra": 9.0.13 + "@types/jest": ts3.9 "@types/node": 18.0.3 "@types/passport": 1.0.9 "@types/react": ^16.9.53 @@ -3978,6 +4034,17 @@ __metadata: languageName: node linkType: hard +"pretty-format@npm:^27.0.0, pretty-format@npm:^27.5.1": + version: 27.5.1 + resolution: "pretty-format@npm:27.5.1" + dependencies: + ansi-regex: ^5.0.1 + ansi-styles: ^5.0.0 + react-is: ^17.0.1 + checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088 + languageName: node + linkType: hard + "process@npm:^0.11.1": version: 0.11.10 resolution: "process@npm:0.11.10" @@ -4054,6 +4121,13 @@ __metadata: languageName: node linkType: hard +"react-is@npm:^17.0.1": + version: 17.0.2 + resolution: "react-is@npm:17.0.2" + checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8 + languageName: node + linkType: hard + "react-is@npm:^18.0.0": version: 18.2.0 resolution: "react-is@npm:18.2.0" diff --git a/extensions/pvaPublish/src/node/publish.ts b/extensions/pvaPublish/src/node/publish.ts index c8131d5b20..a842cd6e5d 100644 --- a/extensions/pvaPublish/src/node/publish.ts +++ b/extensions/pvaPublish/src/node/publish.ts @@ -54,7 +54,7 @@ export const publish = async ( botContentData.push(chunk); callback(); // let the internal write() call know that the _write() was successful }; - await new Promise((resolve, reject) => { + await new Promise((resolve, reject) => { project.exportToZip( { files: ['*.botproject'], directories: ['/knowledge-base/'] }, (archive: NodeJS.ReadStream & { finalize: () => void; on: (ev, listener) => void }) => { @@ -86,7 +86,7 @@ export const publish = async ( ...getAuthHeaders(accessToken, tenantId), 'Content-Type': 'application/zip', 'Content-Length': botContent.buffer.byteLength.toString(), - 'If-Match': project.eTag, + 'If-Match': project.eTag ?? '', }, }); if (res.status === 202) { @@ -124,7 +124,7 @@ export const publish = async ( return { status: 500, result: { - message: e.message, + message: (e as Error)?.message, }, }; } @@ -200,7 +200,7 @@ export const getStatus = async ( return { status: 500, result: { - message: e.message, + message: (e as Error)?.message, }, }; } diff --git a/extensions/pvaPublish/tsconfig.json b/extensions/pvaPublish/tsconfig.json index e157ebbc15..2822ac6512 100644 --- a/extensions/pvaPublish/tsconfig.json +++ b/extensions/pvaPublish/tsconfig.json @@ -5,7 +5,12 @@ "noImplicitAny": false, "noUnusedLocals": true, "sourceMap": true, - "strict": true + "strict": true, + "skipLibCheck": true, + "typeRoots": [ + "./node_modules/@types/", + ], + "types": ["jest"] }, "include": [ "src/**/*", diff --git a/extensions/pvaPublish/yarn-berry.lock b/extensions/pvaPublish/yarn-berry.lock index 9e78497f46..9390e1d69c 100644 --- a/extensions/pvaPublish/yarn-berry.lock +++ b/extensions/pvaPublish/yarn-berry.lock @@ -1643,7 +1643,7 @@ __metadata: "@botframework-composer/types@file:../../Composer/packages/types::locator=pva-publish-composer%40workspace%3A.": version: 0.0.2 - resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=ff5977&locator=pva-publish-composer%40workspace%3A." + resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=a03b13&locator=pva-publish-composer%40workspace%3A." dependencies: "@types/express": 4.16.1 "@types/passport": ^1.0.4 @@ -1652,7 +1652,7 @@ __metadata: express-serve-static-core: 0.1.1 json-schema: 0.4.0 tslib: 2.4.0 - checksum: 377541c2d09305b36e9e12a1b200725bf7c37580a959f2d24007f51052b5f9536b7e0dea48f1f7b574fcca0b8858c97658f413c2df50238f9e70cdcbeaf678e5 + checksum: 042462523dc3e89a15817f431da9df2cfd64b5adcbc29b0fb7dfcebe2989dd7e76445890540be2919c7c230912826a5b83bd1bd90398ef3be4c7e35be78ed41d languageName: node linkType: hard diff --git a/extensions/runtimes/src/copyDir.ts b/extensions/runtimes/src/copyDir.ts index d5b321adef..5826a5060e 100644 --- a/extensions/runtimes/src/copyDir.ts +++ b/extensions/runtimes/src/copyDir.ts @@ -4,7 +4,7 @@ import Path from 'path'; -import { IFileStorage } from './interface'; +import { IFileStorage } from '@botframework-composer/types'; export async function copyDir( srcDir: string, diff --git a/extensions/runtimes/src/index.ts b/extensions/runtimes/src/index.ts index bd2558c34b..2366b001a7 100644 --- a/extensions/runtimes/src/index.ts +++ b/extensions/runtimes/src/index.ts @@ -8,9 +8,9 @@ import { exec } from 'child_process'; import { DialogSetting, IBotProject } from '@botframework-composer/types'; import rimraf from 'rimraf'; import * as fs from 'fs-extra'; +import { IFileStorage } from '@botframework-composer/types'; import { copyDir } from './copyDir'; -import { IFileStorage } from './interface'; const execAsync = promisify(exec); const removeDirAndFiles = promisify(rimraf); diff --git a/extensions/runtimes/src/interface.ts b/extensions/runtimes/src/interface.ts deleted file mode 100644 index e3719be686..0000000000 --- a/extensions/runtimes/src/interface.ts +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. - -export interface Stat { - isDir: boolean; - isFile: boolean; - lastModified: string; - size: string; -} - -export interface MakeDirectoryOptions { - recursive?: boolean; -} - -export interface IFileStorage { - stat(path: string): Promise; - readFile(path: string): Promise; - readDir(path: string): Promise; - exists(path: string): Promise; - writeFile(path: string, content: any): Promise; - removeFile(path: string): Promise; - mkDir(path: string, options?: MakeDirectoryOptions): Promise; - rmDir(path: string): Promise; - glob(pattern: string, path: string): Promise; - copyFile(src: string, dest: string): Promise; - rename(oldPath: string, newPath: string): Promise; -} diff --git a/extensions/runtimes/yarn-berry.lock b/extensions/runtimes/yarn-berry.lock index a45cd473e7..87e783a912 100644 --- a/extensions/runtimes/yarn-berry.lock +++ b/extensions/runtimes/yarn-berry.lock @@ -7,7 +7,7 @@ __metadata: "@botframework-composer/types@file:../../Composer/packages/types::locator=plugin-runtimes%40workspace%3A.": version: 0.0.2 - resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=ff5977&locator=plugin-runtimes%40workspace%3A." + resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=a03b13&locator=plugin-runtimes%40workspace%3A." dependencies: "@types/express": 4.16.1 "@types/passport": ^1.0.4 @@ -16,7 +16,7 @@ __metadata: express-serve-static-core: 0.1.1 json-schema: 0.4.0 tslib: 2.4.0 - checksum: 377541c2d09305b36e9e12a1b200725bf7c37580a959f2d24007f51052b5f9536b7e0dea48f1f7b574fcca0b8858c97658f413c2df50238f9e70cdcbeaf678e5 + checksum: 042462523dc3e89a15817f431da9df2cfd64b5adcbc29b0fb7dfcebe2989dd7e76445890540be2919c7c230912826a5b83bd1bd90398ef3be4c7e35be78ed41d languageName: node linkType: hard diff --git a/extensions/sample-ui-plugin/tsconfig.json b/extensions/sample-ui-plugin/tsconfig.json index 8730ce80dc..479a4b6422 100644 --- a/extensions/sample-ui-plugin/tsconfig.json +++ b/extensions/sample-ui-plugin/tsconfig.json @@ -2,6 +2,7 @@ "compilerOptions": { "alwaysStrict": true, "jsx": "react", + "skipLibCheck": true, "esModuleInterop": true }, "include": [ diff --git a/extensions/sample-ui-plugin/yarn-berry.lock b/extensions/sample-ui-plugin/yarn-berry.lock index 209337693d..015abf2fc3 100644 --- a/extensions/sample-ui-plugin/yarn-berry.lock +++ b/extensions/sample-ui-plugin/yarn-berry.lock @@ -104,7 +104,7 @@ __metadata: "@botframework-composer/types@file:../../Composer/packages/types::locator=sample-ui-plugin%40workspace%3A.": version: 0.0.2 - resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=ff5977&locator=sample-ui-plugin%40workspace%3A." + resolution: "@botframework-composer/types@file:../../Composer/packages/types#../../Composer/packages/types::hash=a03b13&locator=sample-ui-plugin%40workspace%3A." dependencies: "@types/express": 4.16.1 "@types/passport": ^1.0.4 @@ -113,7 +113,7 @@ __metadata: express-serve-static-core: 0.1.1 json-schema: 0.4.0 tslib: 2.4.0 - checksum: 377541c2d09305b36e9e12a1b200725bf7c37580a959f2d24007f51052b5f9536b7e0dea48f1f7b574fcca0b8858c97658f413c2df50238f9e70cdcbeaf678e5 + checksum: 042462523dc3e89a15817f431da9df2cfd64b5adcbc29b0fb7dfcebe2989dd7e76445890540be2919c7c230912826a5b83bd1bd90398ef3be4c7e35be78ed41d languageName: node linkType: hard diff --git a/extensions/scripts/build.js b/extensions/scripts/build.js index 7b5e65e4a0..fba609b284 100644 --- a/extensions/scripts/build.js +++ b/extensions/scripts/build.js @@ -146,8 +146,7 @@ const compile = async (name, extPath, watch = false) => { try { await cleanDist(name, extPath); - // fixme: temproary skip untill release - // work.push(typecheck(extPath)); + work.push(typecheck(extPath)); for (const config of getBundleConfigs(extPath, packageJSON, watch)) { work.push(service.build(config)); }