diff --git a/Composer/packages/adaptive-flow/package.json b/Composer/packages/adaptive-flow/package.json index 6eed65671c..212046f398 100644 --- a/Composer/packages/adaptive-flow/package.json +++ b/Composer/packages/adaptive-flow/package.json @@ -28,8 +28,8 @@ "@bfc/ui-shared": "*", "@emotion/core": "^10.0.27", "@emotion/styled": "^10.0.27", - "adaptive-expressions": "4.10.0-preview-147186", - "botbuilder-lg": "^4.10.0-preview-150886", + "adaptive-expressions": "^4.11.0-dev.20201013.d5458bf", + "botbuilder-lg": "4.11.0-dev.20201010.6e4a99e", "create-react-class": "^15.6.3", "d3": "^5.9.1", "dagre": "^0.8.4", diff --git a/Composer/packages/client/src/hooks/useResolver.ts b/Composer/packages/client/src/hooks/useResolver.ts index 48d4dd35cb..7637ceb894 100644 --- a/Composer/packages/client/src/hooks/useResolver.ts +++ b/Composer/packages/client/src/hooks/useResolver.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. import { useRef } from 'react'; -import { importResolverGenerator } from '@bfc/shared'; +import { lgImportResolverGenerator } from '@bfc/shared'; import { useRecoilValue } from 'recoil'; import { dialogsState, luFilesState, lgFilesState, localeState, qnaFilesState } from '../recoilModel'; @@ -28,7 +28,7 @@ export const useResolvers = (projectId: string) => { const dialogsRef = useRef(dialogs); dialogsRef.current = dialogs; - const lgImportresolver = () => importResolverGenerator(lgFilesRef.current, '.lg'); + const lgImportresolver = () => lgImportResolverGenerator(lgFilesRef.current, '.lg'); const lgFileResolver = (id: string) => { const fileId = id.includes('.') ? id : `${id}.${localeRef.current}`; diff --git a/Composer/packages/client/src/recoilModel/parsers/workers/lgParser.worker.ts b/Composer/packages/client/src/recoilModel/parsers/workers/lgParser.worker.ts index 169e3949e2..f36e3db387 100644 --- a/Composer/packages/client/src/recoilModel/parsers/workers/lgParser.worker.ts +++ b/Composer/packages/client/src/recoilModel/parsers/workers/lgParser.worker.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. import { lgUtil } from '@bfc/indexers'; -import { importResolverGenerator, LgFile } from '@bfc/shared'; +import { lgImportResolverGenerator, LgFile } from '@bfc/shared'; import { LgActionType, @@ -92,7 +92,7 @@ type LgMessageEvent = type LgResources = Map; const lgFileResolver = (lgFiles) => { - return importResolverGenerator(lgFiles, '.lg'); + return lgImportResolverGenerator(lgFiles, '.lg'); }; export class LgCache { diff --git a/Composer/packages/lib/indexers/package.json b/Composer/packages/lib/indexers/package.json index 89f5186a10..6f866c01a0 100644 --- a/Composer/packages/lib/indexers/package.json +++ b/Composer/packages/lib/indexers/package.json @@ -27,8 +27,8 @@ }, "dependencies": { "@microsoft/bf-lu": "^4.11.0-dev.20201013.7ccb128", - "adaptive-expressions": "4.10.0-preview-147186", - "botbuilder-lg": "^4.10.0-preview-150886", + "adaptive-expressions": "^4.11.0-dev.20201013.d5458bf", + "botbuilder-lg": "4.11.0-dev.20201010.6e4a99e", "lodash": "^4.17.19" }, "peerDependencies": { diff --git a/Composer/packages/lib/indexers/src/index.ts b/Composer/packages/lib/indexers/src/index.ts index 95ec8c8b76..497ef04958 100644 --- a/Composer/packages/lib/indexers/src/index.ts +++ b/Composer/packages/lib/indexers/src/index.ts @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import { DialogSetting, FileInfo, importResolverGenerator } from '@bfc/shared'; +import { DialogSetting, FileInfo, lgImportResolverGenerator } from '@bfc/shared'; import { dialogIndexer } from './dialogIndexer'; import { dialogSchemaIndexer } from './dialogSchemaIndexer'; @@ -46,7 +46,7 @@ class Indexer { }; }); - return importResolverGenerator(lgFiles, '.lg', locale); + return lgImportResolverGenerator(lgFiles, '.lg', locale); }; public index(files: FileInfo[], botName: string, locale: string, skillContent: any, settings: DialogSetting) { diff --git a/Composer/packages/lib/indexers/src/utils/lgUtil.ts b/Composer/packages/lib/indexers/src/utils/lgUtil.ts index 7b6754cea2..c3e55bb56d 100644 --- a/Composer/packages/lib/indexers/src/utils/lgUtil.ts +++ b/Composer/packages/lib/indexers/src/utils/lgUtil.ts @@ -8,7 +8,7 @@ */ import { Templates, Template, Diagnostic as LGDiagnostic, ImportResolverDelegate } from 'botbuilder-lg'; -import { LgTemplate, importResolverGenerator, TextFile, Diagnostic, Position, Range, LgFile } from '@bfc/shared'; +import { LgTemplate, lgImportResolverGenerator, TextFile, Diagnostic, Position, Range, LgFile } from '@bfc/shared'; import formatMessage from 'format-message'; import isEmpty from 'lodash/isEmpty'; import { SourceRange } from 'botbuilder-lg/lib/sourceRange'; @@ -260,7 +260,7 @@ export function extractOptionByKey(nameOfKey: string, options: string[]): string } export function parse(id: string, content: string, lgFiles: TextFile[]): LgFile { - const lgImportResolver = importResolverGenerator(lgFiles, '.lg'); + const lgImportResolver = lgImportResolverGenerator(lgFiles, '.lg'); return lgIndexer.parse(content, id, lgImportResolver); } diff --git a/Composer/packages/lib/shared/src/resolverFactory.ts b/Composer/packages/lib/shared/src/resolverFactory.ts index 105b15a8bc..89dd224139 100644 --- a/Composer/packages/lib/shared/src/resolverFactory.ts +++ b/Composer/packages/lib/shared/src/resolverFactory.ts @@ -2,9 +2,10 @@ // Licensed under the MIT License. import formatMessage from 'format-message'; +import { LGResource, ImportResolverDelegate } from 'botbuilder-lg'; export declare type ResolverResource = { content: string; id: string }; -export declare type ImportResolverDelegate = (source: string, resourceId: string) => ResolverResource; +export declare type LUImportResolverDelegate = (source: string, resourceId: string) => ResolverResource; function getFileName(path: string): string { return path.split('/').pop() || path; @@ -16,11 +17,11 @@ function getFileName(path: string): string { * @param ext resource extension, e.g. .lg, .lu * @param defaultLocale complete resource id = [id].[locale][ext] */ -export function importResolverGenerator( +export function luImportResolverGenerator( resources: ResolverResource[], ext = '', defaultLocale = 'en-us' -): ImportResolverDelegate { +): LUImportResolverDelegate { /** * @param source current file id * @param resourceId imported file id @@ -51,3 +52,42 @@ export function importResolverGenerator( }; }; } + +/** + * + * @param resources resources feed to resolver + * @param ext resource extension, e.g. .lg, .lu + * @param defaultLocale complete resource id = [id].[locale][ext] + */ +export function lgImportResolverGenerator( + resources: ResolverResource[], + ext = '', + defaultLocale = 'en-us' +): ImportResolverDelegate { + /** + * @param source current file id + * @param resourceId imported file id + * for example: + * in todosample.en-us.lg: + * [import](../common/common.lg) + * + * would resolve to common.en-us.lg || common.lg + * + * lgResource = todosample || todosample.en-us || todosample.en-us.lg || todosample.lg || . + * resourceId = common || common.lg || ../common/common.lg + * + */ + return (lgResource: LGResource, resourceId: string) => { + // eslint-disable-next-line security/detect-non-literal-regexp + const extReg = new RegExp(ext + '$'); + const sourceId = getFileName(lgResource.id).replace(extReg, ''); + const locale = /\w\.\w/.test(sourceId) ? sourceId.split('.').pop() : defaultLocale; + const targetId = getFileName(resourceId).replace(extReg, ''); + + const targetFile = + resources.find(({ id }) => id === `${targetId}.${locale}`) || resources.find(({ id }) => id === targetId); + + if (!targetFile) throw new Error(formatMessage(`File not found`)); + return new LGResource(resourceId, resourceId, targetFile.content); + }; +} diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts index 31d0eaac8e..3558741b18 100644 --- a/Composer/packages/server/src/services/project.ts +++ b/Composer/packages/server/src/services/project.ts @@ -4,7 +4,7 @@ import merge from 'lodash/merge'; import find from 'lodash/find'; import flatten from 'lodash/flatten'; -import { importResolverGenerator, ResolverResource } from '@bfc/shared'; +import { luImportResolverGenerator, ResolverResource } from '@bfc/shared'; import extractMemoryPaths from '@bfc/indexers/lib/dialogUtils/extractMemoryPaths'; import { UserIdentity } from '@bfc/extension'; @@ -54,7 +54,7 @@ export class BotProjectService { const { name, content } = file; return { id: Path.basename(name, '.lu'), content }; }); - const resolver = importResolverGenerator(resource, '.lu'); + const resolver = luImportResolverGenerator(resource, '.lu'); return resolver(source, id); } diff --git a/Composer/packages/tools/language-servers/language-generation/package.json b/Composer/packages/tools/language-servers/language-generation/package.json index b2b847753b..8d2736fe51 100644 --- a/Composer/packages/tools/language-servers/language-generation/package.json +++ b/Composer/packages/tools/language-servers/language-generation/package.json @@ -15,10 +15,10 @@ "lint:typecheck": "tsc --noEmit" }, "dependencies": { + "@bfc/built-in-functions": "*", "@bfc/indexers": "*", - "botbuilder-lg": "^4.10.0-preview-150886", - "vscode-languageserver": "^5.3.0-next", - "@bfc/built-in-functions": "*" + "botbuilder-lg": "4.11.0-dev.20201010.6e4a99e", + "vscode-languageserver": "^5.3.0-next" }, "devDependencies": { "@botframework-composer/test-utils": "*", diff --git a/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts index d256dc46db..368932bac3 100644 --- a/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts +++ b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts @@ -16,7 +16,7 @@ import { import { TextDocumentPositionParams, DocumentOnTypeFormattingParams } from 'vscode-languageserver-protocol'; import get from 'lodash/get'; import { filterTemplateDiagnostics, isValid, lgUtil } from '@bfc/indexers'; -import { MemoryResolver, ResolverResource, LgFile, importResolverGenerator } from '@bfc/shared'; +import { MemoryResolver, ResolverResource, LgFile, lgImportResolverGenerator } from '@bfc/shared'; import { buildInFunctionsMap } from '@bfc/built-in-functions'; import { LgParser } from './lgParser'; @@ -166,7 +166,7 @@ export class LGServer { const lgTextFile = lgTextFiles.find((item) => item.id === fileId); if (lgTextFile) { const lgFile = lgUtil.parse(lgTextFile.id, lgTextFile.content, lgTextFiles); - const lgResolver = importResolverGenerator(lgTextFiles, '.lg'); + const lgResolver = lgImportResolverGenerator(lgTextFiles, '.lg'); return lgUtil.updateTemplate(lgFile, templateId, { body: content }, lgResolver); } } diff --git a/Composer/packages/tools/language-servers/language-generation/src/lgParser.ts b/Composer/packages/tools/language-servers/language-generation/src/lgParser.ts index c9d986296e..a35feb740b 100644 --- a/Composer/packages/tools/language-servers/language-generation/src/lgParser.ts +++ b/Composer/packages/tools/language-servers/language-generation/src/lgParser.ts @@ -4,7 +4,7 @@ import { fork, ChildProcess } from 'child_process'; import path from 'path'; -import { importResolverGenerator } from '@bfc/shared'; +import { lgImportResolverGenerator } from '@bfc/shared'; import { ResolverResource } from '@bfc/shared'; import uniqueId from 'lodash/uniqueId'; import { lgIndexer } from '@bfc/indexers'; @@ -18,7 +18,7 @@ export interface WorkerMsg { class LgParserWithoutWorker { public async parseText(content: string, id: string, resources: ResolverResource[]) { - const lgImportResolver = importResolverGenerator(resources, '.lg'); + const lgImportResolver = lgImportResolverGenerator(resources, '.lg'); return lgIndexer.parse(content, id, lgImportResolver); } } diff --git a/Composer/packages/tools/language-servers/language-generation/src/lgWorker.ts b/Composer/packages/tools/language-servers/language-generation/src/lgWorker.ts index ec9d11bb14..fb62ffc83d 100644 --- a/Composer/packages/tools/language-servers/language-generation/src/lgWorker.ts +++ b/Composer/packages/tools/language-servers/language-generation/src/lgWorker.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import { importResolverGenerator } from '@bfc/shared'; +import { lgImportResolverGenerator } from '@bfc/shared'; import { lgIndexer } from '@bfc/indexers'; import { WorkerMsg } from './lgParser'; @@ -10,7 +10,7 @@ process.on('message', (message: WorkerMsg) => { const { content, id, resources } = message.payload; try { - const lgImportResolver = importResolverGenerator(resources, '.lg'); + const lgImportResolver = lgImportResolverGenerator(resources, '.lg'); const { templates, allTemplates, diagnostics } = lgIndexer.parse(content, id, lgImportResolver); process.send?.({ id: message.id, payload: { id, content, templates, allTemplates, diagnostics } }); } catch (error) { diff --git a/Composer/packages/tools/language-servers/language-understanding/src/LUServer.ts b/Composer/packages/tools/language-servers/language-understanding/src/LUServer.ts index 691797b5e6..9464da157c 100644 --- a/Composer/packages/tools/language-servers/language-understanding/src/LUServer.ts +++ b/Composer/packages/tools/language-servers/language-understanding/src/LUServer.ts @@ -21,7 +21,7 @@ import { parser } from '@microsoft/bf-lu/lib/parser'; import { EntityTypesObj, LineState } from './entityEnum'; import * as util from './matchingPattern'; -import { ImportResolverDelegate, LUOption, LUDocument, generageDiagnostic, convertDiagnostics } from './utils'; +import { LUImportResolverDelegate, LUOption, LUDocument, generageDiagnostic, convertDiagnostics } from './utils'; // define init methods call from client const LABELEXPERIENCEREQUEST = 'labelingExperienceRequest'; @@ -162,7 +162,7 @@ export class LUServer { const { uri } = document; const { fileId, sectionId, projectId, luFeatures = {} } = luOption || {}; const index = () => { - const importResolver: ImportResolverDelegate = this.getImportResolver(document); + const importResolver: LUImportResolverDelegate = this.getImportResolver(document); let content: string = document.getText(); // if inline mode, composite local with server resolved file. if (this.importResolver && fileId && sectionId) { diff --git a/Composer/packages/tools/language-servers/language-understanding/src/utils.ts b/Composer/packages/tools/language-servers/language-understanding/src/utils.ts index 02f15ec8b1..63f95e46b0 100644 --- a/Composer/packages/tools/language-servers/language-understanding/src/utils.ts +++ b/Composer/packages/tools/language-servers/language-understanding/src/utils.ts @@ -27,7 +27,7 @@ export interface LUDocument { index: () => any; } -export declare type ImportResolverDelegate = ( +export declare type LUImportResolverDelegate = ( source: string, resourceId: string ) => { diff --git a/Composer/yarn.lock b/Composer/yarn.lock index 2647d29d24..23c5fe9822 100644 --- a/Composer/yarn.lock +++ b/Composer/yarn.lock @@ -882,7 +882,7 @@ "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.10.5", "@babel/parser@^7.11.3", "@babel/parser@^7.11.5", "@babel/parser@^7.2.2", "@babel/parser@^7.3.4", "@babel/parser@^7.4.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.4", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.6": version "7.11.5" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@babel/parser/-/@babel/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/@babel/parser/-/@babel/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037" integrity sha1-x/9jA99xCA7HpPW4wAPFjxz1EDc= "@babel/plugin-proposal-async-generator-functions@^7.2.0": @@ -3736,13 +3736,6 @@ dependencies: "@types/node" "*" -"@types/moment-timezone@^0.5.12": - version "0.5.12" - resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/@types/moment-timezone/-/@types/moment-timezone-0.5.12.tgz#0fb680c03db194fe8ff4551eaeb1eec8d3d80e9f" - integrity sha1-D7aAwD2xlP6P9FUerrHuyNPYDp8= - dependencies: - moment ">=2.14.0" - "@types/moment-timezone@^0.5.13": version "0.5.13" resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/@types/moment-timezone/-/@types/moment-timezone-0.5.13.tgz#0317ccc91eb4c7f4901704166166395c39276528" @@ -4531,28 +4524,29 @@ acorn@^7.4.0: resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" integrity sha1-4a1IbmxUUBY0xsOXxcEh2qODYHw= -adaptive-expressions@4.10.0-preview-147186: - version "4.10.0-preview-147186" - resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/adaptive-expressions/-/adaptive-expressions-4.10.0-preview-147186.tgz#4468fcb00a27d955d4f1fd46566fda5a46baef87" +adaptive-expressions@4.11.0-dev.20200929.ca9de94: + version "4.11.0-dev.20200929.ca9de94" + resolved "https://registry.yarnpkg.com/adaptive-expressions/-/adaptive-expressions-4.11.0-dev.20200929.ca9de94.tgz#305c8462e7e0c329f55aa8cd2b2496bb81c2490c" + integrity sha512-xq5QG19kIPio6piHEA4aPkqqi2ejYoYCBEovF55gJXaW5jKG+Q7bao3yqb2VTq9vISEyIq9VabmIlHzRQrOXyg== dependencies: "@microsoft/recognizers-text-data-types-timex-expression" "1.1.4" "@types/atob-lite" "^2.0.0" "@types/lru-cache" "^5.1.0" - "@types/moment-timezone" "^0.5.12" + "@types/moment-timezone" "^0.5.13" "@types/xmldom" "^0.1.29" antlr4ts "0.5.0-alpha.3" atob-lite "^2.0.0" big-integer "^1.6.48" jspath "^0.4.0" - lodash "^4.17.15" + lodash "^4.17.19" lru-cache "^5.1.1" moment "^2.25.1" moment-timezone "^0.5.28" -adaptive-expressions@4.10.0-preview-150886: - version "4.10.0-preview-150886" - resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/adaptive-expressions/-/adaptive-expressions-4.10.0-preview-150886.tgz#27d147b8b9389318e1b608601d83f5003701cf7b" - integrity sha1-J9FHuLk4kxjhtghgHYP1ADcBz3s= +adaptive-expressions@4.11.0-dev.20201010.6e4a99e: + version "4.11.0-dev.20201010.6e4a99e" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/adaptive-expressions/-/adaptive-expressions-4.11.0-dev.20201010.6e4a99e.tgz#493292c1619ef243901e041849b9ed42af9fb6fd" + integrity sha1-STKSwWGe8kOQHgQYSbntQq+ftv0= dependencies: "@microsoft/recognizers-text-data-types-timex-expression" "1.1.4" "@types/atob-lite" "^2.0.0" @@ -4568,10 +4562,10 @@ adaptive-expressions@4.10.0-preview-150886: moment "^2.25.1" moment-timezone "^0.5.28" -adaptive-expressions@4.11.0-dev.20200929.ca9de94: - version "4.11.0-dev.20200929.ca9de94" - resolved "https://registry.yarnpkg.com/adaptive-expressions/-/adaptive-expressions-4.11.0-dev.20200929.ca9de94.tgz#305c8462e7e0c329f55aa8cd2b2496bb81c2490c" - integrity sha512-xq5QG19kIPio6piHEA4aPkqqi2ejYoYCBEovF55gJXaW5jKG+Q7bao3yqb2VTq9vISEyIq9VabmIlHzRQrOXyg== +adaptive-expressions@^4.11.0-dev.20201013.d5458bf: + version "4.11.0-dev.20201013.d5458bf" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/adaptive-expressions/-/adaptive-expressions-4.11.0-dev.20201013.d5458bf.tgz#d7573dab8d883985b80df8c8859edc4dead7593a" + integrity sha1-11c9q42IOYW4DfjIhZ7cTerXWTo= dependencies: "@microsoft/recognizers-text-data-types-timex-expression" "1.1.4" "@types/atob-lite" "^2.0.0" @@ -5719,12 +5713,12 @@ boolean@^3.0.0: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.1.tgz#35ecf2b4a2ee191b0b44986f14eb5f052a5cbb4f" integrity sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA== -botbuilder-lg@^4.10.0-preview-150886: - version "4.10.0-preview-150886" - resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/botbuilder-lg/-/botbuilder-lg-4.10.0-preview-150886.tgz#bbc91011c1c3be3a343acfdb3168f152d71fadc1" - integrity sha1-u8kQEcHDvjo0Os/bMWjxUtcfrcE= +botbuilder-lg@4.11.0-dev.20201010.6e4a99e: + version "4.11.0-dev.20201010.6e4a99e" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/botbuilder-lg/-/botbuilder-lg-4.11.0-dev.20201010.6e4a99e.tgz#6201f1fb29756cd968589fcfd7980016b1f33369" + integrity sha1-YgHx+yl1bNloWJ/P15gAFrHzM2k= dependencies: - adaptive-expressions "4.10.0-preview-150886" + adaptive-expressions "4.11.0-dev.20201010.6e4a99e" antlr4ts "0.5.0-alpha.3" lodash "^4.17.19" path "^0.12.7" @@ -8676,7 +8670,7 @@ elegant-spinner@^1.0.1: elliptic@^6.0.0, elliptic@^6.5.3: version "6.5.3" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" integrity sha1-y1nrLv2vc6C9eMzXAVpirW4Pk9Y= dependencies: bn.js "^4.4.0" @@ -12769,7 +12763,7 @@ killable@^1.0.1: kind-of@^2.0.1, kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0= kleur@^3.0.2: @@ -13184,7 +13178,7 @@ lodash.uniq@^4.5.0: "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0: version "4.17.20" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha1-tEqbYpe8tpjxxRo1RaKzs2jVnFI= log-driver@^1.2.7: @@ -13712,7 +13706,7 @@ mixin-object@^2.0.1: mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.2, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^1.0.3, mkdirp@~0.5.1: version "0.5.5" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha1-2Rzv1i0UNsoPQWIOJRKI1CAJne8= dependencies: minimist "^1.2.5" @@ -16405,7 +16399,7 @@ read-text-file@^1.1.0: readable-stream@^2.3.5: version "2.3.7" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c= dependencies: core-util-is "~1.0.0" @@ -17223,7 +17217,7 @@ select-hose@^2.0.0: selfsigned@1.10.8, selfsigned@^1.10.7: version "1.10.8" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" integrity sha1-DRcgi30Swz+OrIXEGDXyf8PYGjA= dependencies: node-forge "^0.10.0" @@ -17367,7 +17361,7 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: set-value@^0.4.3, set-value@^2.0.0, set-value@^3.0.2: version "3.0.2" - resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90" integrity sha1-dOjs0CPDPQ93GZ1BVAmkDyHmG5A= dependencies: is-plain-object "^2.0.4" diff --git a/extensions/azurePublish/yarn.lock b/extensions/azurePublish/yarn.lock index e0615073af..6e6a2209a1 100644 --- a/extensions/azurePublish/yarn.lock +++ b/extensions/azurePublish/yarn.lock @@ -172,8 +172,8 @@ version "0.0.0" dependencies: "@microsoft/bf-lu" "^4.11.0-dev.20201013.7ccb128" - adaptive-expressions "4.10.0-preview-147186" - botbuilder-lg "^4.10.0-preview-150886" + adaptive-expressions "^4.11.0-dev.20201013.d5458bf" + botbuilder-lg "4.11.0-dev.20201010.6e4a99e" lodash "^4.17.19" "@bfc/shared@../../Composer/packages/lib/shared": @@ -491,7 +491,7 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/moment-timezone@^0.5.12", "@types/moment-timezone@^0.5.13": +"@types/moment-timezone@^0.5.13": version "0.5.30" resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/@types/moment-timezone/-/@types/moment-timezone-0.5.30.tgz#340ed45fe3e715f4a011f5cfceb7cb52aad46fc7" integrity sha1-NA7UX+PnFfSgEfXPzrfLUqrUb8c= @@ -615,29 +615,29 @@ adal-node@^0.1.28: xmldom ">= 0.1.x" xpath.js "~1.1.0" -adaptive-expressions@4.10.0-preview-147186: - version "4.10.0-preview-147186" - resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/adaptive-expressions/-/adaptive-expressions-4.10.0-preview-147186.tgz#4468fcb00a27d955d4f1fd46566fda5a46baef87" - integrity sha1-RGj8sAon2VXU8f1GVm/aWka674c= +adaptive-expressions@4.11.0-dev.20201010.6e4a99e: + version "4.11.0-dev.20201010.6e4a99e" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/adaptive-expressions/-/adaptive-expressions-4.11.0-dev.20201010.6e4a99e.tgz#493292c1619ef243901e041849b9ed42af9fb6fd" + integrity sha1-STKSwWGe8kOQHgQYSbntQq+ftv0= dependencies: "@microsoft/recognizers-text-data-types-timex-expression" "1.1.4" "@types/atob-lite" "^2.0.0" "@types/lru-cache" "^5.1.0" - "@types/moment-timezone" "^0.5.12" + "@types/moment-timezone" "^0.5.13" "@types/xmldom" "^0.1.29" antlr4ts "0.5.0-alpha.3" atob-lite "^2.0.0" big-integer "^1.6.48" jspath "^0.4.0" - lodash "^4.17.15" + lodash "^4.17.19" lru-cache "^5.1.1" moment "^2.25.1" moment-timezone "^0.5.28" -adaptive-expressions@4.10.1: - version "4.10.1" - resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/adaptive-expressions/-/adaptive-expressions-4.10.1.tgz#11308cd3aff402dc454dfaaa8d2af0ea3812554e" - integrity sha1-ETCM06/0AtxFTfqqjSrw6jgSVU4= +adaptive-expressions@^4.11.0-dev.20201013.d5458bf: + version "4.11.0-dev.20201013.d5458bf" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/adaptive-expressions/-/adaptive-expressions-4.11.0-dev.20201013.d5458bf.tgz#d7573dab8d883985b80df8c8859edc4dead7593a" + integrity sha1-11c9q42IOYW4DfjIhZ7cTerXWTo= dependencies: "@microsoft/recognizers-text-data-types-timex-expression" "1.1.4" "@types/atob-lite" "^2.0.0" @@ -859,12 +859,12 @@ bluebird@^3.5.0: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -botbuilder-lg@^4.10.0-preview-150886: - version "4.10.1" - resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/botbuilder-lg/-/botbuilder-lg-4.10.1.tgz#fb74d81fa32fb9bc07bfe58aea58d06052681134" - integrity sha1-+3TYH6MvubwHv+WK6ljQYFJoETQ= +botbuilder-lg@4.11.0-dev.20201010.6e4a99e: + version "4.11.0-dev.20201010.6e4a99e" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/botbuilder-lg/-/botbuilder-lg-4.11.0-dev.20201010.6e4a99e.tgz#6201f1fb29756cd968589fcfd7980016b1f33369" + integrity sha1-YgHx+yl1bNloWJ/P15gAFrHzM2k= dependencies: - adaptive-expressions "4.10.1" + adaptive-expressions "4.11.0-dev.20201010.6e4a99e" antlr4ts "0.5.0-alpha.3" lodash "^4.17.19" path "^0.12.7"