From 34ad7f089ebbf9be4eff31f14bb76fec6750cc7a Mon Sep 17 00:00:00 2001 From: leilzh Date: Wed, 4 Nov 2020 12:46:20 +0800 Subject: [PATCH] fix: azure publish fail --- .../server/src/models/bot/botProject.ts | 1 + extensions/azurePublish/package.json | 2 +- extensions/azurePublish/src/index.ts | 2 +- extensions/azurePublish/yarn.lock | 22 +++++++++++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts index 3090957ba4..2cd53302f7 100644 --- a/Composer/packages/server/src/models/bot/botProject.ts +++ b/Composer/packages/server/src/models/bot/botProject.ts @@ -193,6 +193,7 @@ export class BotProject implements IBotProject { skills: this.skills, diagnostics: this.diagnostics, settings: this.settings, + filesWithoutRecognizers: Array.from(this.files.values()).filter(({ name }) => !isRecognizer(name)), }; }; diff --git a/extensions/azurePublish/package.json b/extensions/azurePublish/package.json index d693a038d5..2f4a501c0f 100644 --- a/extensions/azurePublish/package.json +++ b/extensions/azurePublish/package.json @@ -22,7 +22,7 @@ "@bfc/indexers": "../../Composer/packages/lib/indexers", "@bfc/shared": "../../Composer/packages/lib/shared", "@botframework-composer/types": "0.0.1", - "@microsoft/bf-lu": "^4.11.0-rc.20201030.a9f9b96", + "@microsoft/bf-lu": "4.11.0-dev.20201005.7e5e1b8", "@microsoft/bf-luis-cli": "^4.10.0-dev.20200721.8bb21ac", "@types/archiver": "3.1.0", "@types/fs-extra": "8.1.0", diff --git a/extensions/azurePublish/src/index.ts b/extensions/azurePublish/src/index.ts index ee94004024..9b5fe29f1c 100644 --- a/extensions/azurePublish/src/index.ts +++ b/extensions/azurePublish/src/index.ts @@ -127,7 +127,7 @@ export default async (composer: ExtensionRegistration): Promise => { */ private init = async (project: any, srcTemplate: string, resourcekey: string, runtime: any) => { // point to the declarative assets (possibly in remote storage) - const botFiles = project.getProject().files; + const botFiles = project.getProject().filesWithoutRecognizers; const botFolder = this.getBotFolder(resourcekey, this.mode); const runtimeFolder = this.getRuntimeFolder(resourcekey); diff --git a/extensions/azurePublish/yarn.lock b/extensions/azurePublish/yarn.lock index 2116966183..410ba5593d 100644 --- a/extensions/azurePublish/yarn.lock +++ b/extensions/azurePublish/yarn.lock @@ -233,6 +233,28 @@ semver "^5.5.1" tslib "^1.10.0" +"@microsoft/bf-lu@4.11.0-dev.20201005.7e5e1b8": + version "4.11.0-dev.20201005.7e5e1b8" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/@microsoft/bf-lu/-/@microsoft/bf-lu-4.11.0-dev.20201005.7e5e1b8.tgz#62f9a37bb8340456e41853e179f2941dab9dfc87" + integrity sha1-Yvmje7g0BFbkGFPhefKUHaud/Ic= + dependencies: + "@azure/cognitiveservices-luis-authoring" "4.0.0-preview.1" + "@azure/ms-rest-azure-js" "2.0.1" + "@types/node-fetch" "~2.5.5" + antlr4 "^4.7.2" + chalk "2.4.1" + console-stream "^0.1.1" + deep-equal "^1.0.1" + delay "^4.3.0" + fs-extra "^8.1.0" + get-stdin "^6.0.0" + globby "^10.0.1" + intercept-stdout "^0.1.2" + lodash "^4.17.19" + node-fetch "~2.6.0" + semver "^5.5.1" + tslib "^1.10.0" + "@microsoft/bf-lu@^4.11.0-rc.20201030.a9f9b96": version "4.11.0-rc.20201030.a9f9b96" resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/@microsoft/bf-lu/-/@microsoft/bf-lu-4.11.0-rc.20201030.a9f9b96.tgz#9fcb2a18d66bcef74eabc98f06df4574215c402f"