From a56266b23239bc574bccc6a227adcca540ee1cda Mon Sep 17 00:00:00 2001 From: Shuai Wang Date: Fri, 5 Feb 2021 14:33:39 +0800 Subject: [PATCH 1/2] update package version --- Composer/packages/adaptive-flow/package.json | 4 +- Composer/packages/lib/indexers/package.json | 4 +- .../src/builtInFunctionsMap.ts | 300 ++++++++++++++---- .../language-generation/package.json | 2 +- Composer/yarn.lock | 104 ++++-- 5 files changed, 323 insertions(+), 91 deletions(-) diff --git a/Composer/packages/adaptive-flow/package.json b/Composer/packages/adaptive-flow/package.json index a2d3064032..b3cc729b75 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.11.0-dev.20201013.d5458bf", - "botbuilder-lg": "4.12.0-dev-20201119.9afa93623c3e", + "adaptive-expressions": "4.12.0-dev-20210203.ebda93d5647a", + "botbuilder-lg": "4.12.0-dev-20210203.ebda93d5647a", "create-react-class": "^15.6.3", "d3": "^5.9.1", "dagre": "^0.8.4", diff --git a/Composer/packages/lib/indexers/package.json b/Composer/packages/lib/indexers/package.json index ae8b60a5a9..f143d9738d 100644 --- a/Composer/packages/lib/indexers/package.json +++ b/Composer/packages/lib/indexers/package.json @@ -27,8 +27,8 @@ }, "dependencies": { "@microsoft/bf-lu": "^4.12.0-dev.20210129.82760de", - "adaptive-expressions": "^4.11.0-dev.20201013.d5458bf", - "botbuilder-lg": "4.12.0-dev-20201119.9afa93623c3e", + "adaptive-expressions": "4.12.0-dev-20210203.ebda93d5647a", + "botbuilder-lg": "4.12.0-dev-20210203.ebda93d5647a", "lodash": "^4.17.19" }, "peerDependencies": { diff --git a/Composer/packages/tools/built-in-functions/src/builtInFunctionsMap.ts b/Composer/packages/tools/built-in-functions/src/builtInFunctionsMap.ts index 1177dd878c..955dbeeeac 100644 --- a/Composer/packages/tools/built-in-functions/src/builtInFunctionsMap.ts +++ b/Composer/packages/tools/built-in-functions/src/builtInFunctionsMap.ts @@ -73,7 +73,7 @@ export const buildInFunctionsMap: Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map"Yesterday"' + 'Uses the date-time library to provide a date readback. dateReadBack(currentDate, targetDate). E.g. dateReadBack(‘2016/05/30’,’2016/05/23’)=>"Yesterday".' ), ], [ @@ -329,7 +414,63 @@ export const buildInFunctionsMap: Map = new Map = new Map = new Map = new Map, )' + 'Returns a random number between specified min and max value – rand(, ).' ), ], [ @@ -398,6 +551,14 @@ export const buildInFunctionsMap: Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map = new Map=0.6.0" xmlbuilder "~9.0.1" +xml2js@^0.4.23: + version "0.4.23" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" + integrity sha1-oMaVFnUkIesqx1juTUzPWIQ+rGY= + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha1-vpuuHIoEbnazESdyY0fQrXACvrM= + xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== +xmldom@^0.1.19: + version "0.1.31" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" + integrity sha1-t2yaG9nwqXN+WnLcNyMc84N14v8= + +xmldom@^0.4.0: + version "0.4.0" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830" + integrity sha1-h3HkgqMzr0RYfjDOAm8JmMI/ODA= + xmlhttprequest@1: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw= +xpath@^0.0.32: + version "0.0.32" + resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af" + integrity sha1-G3PTNRr3NuF+wHjW2kuBdUBcSK8= + xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" From c677efbd872616e88458e2129c94c3470f10db28 Mon Sep 17 00:00:00 2001 From: Shuai Wang Date: Fri, 5 Feb 2021 15:51:04 +0800 Subject: [PATCH 2/2] fix version and add sqrt and abs --- Composer/packages/adaptive-flow/package.json | 4 +- Composer/packages/lib/indexers/package.json | 4 +- .../src/builtInFunctionsMap.ts | 5 ++ .../language-generation/package.json | 2 +- Composer/yarn.lock | 52 ++++--------------- 5 files changed, 19 insertions(+), 48 deletions(-) diff --git a/Composer/packages/adaptive-flow/package.json b/Composer/packages/adaptive-flow/package.json index b3cc729b75..a60b09d6ab 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.12.0-dev-20210203.ebda93d5647a", - "botbuilder-lg": "4.12.0-dev-20210203.ebda93d5647a", + "adaptive-expressions": "4.12.0-dev-20210125.e5a4fc60f438", + "botbuilder-lg": "4.12.0-dev-20210125.e5a4fc60f438", "create-react-class": "^15.6.3", "d3": "^5.9.1", "dagre": "^0.8.4", diff --git a/Composer/packages/lib/indexers/package.json b/Composer/packages/lib/indexers/package.json index f143d9738d..32eeafb819 100644 --- a/Composer/packages/lib/indexers/package.json +++ b/Composer/packages/lib/indexers/package.json @@ -27,8 +27,8 @@ }, "dependencies": { "@microsoft/bf-lu": "^4.12.0-dev.20210129.82760de", - "adaptive-expressions": "4.12.0-dev-20210203.ebda93d5647a", - "botbuilder-lg": "4.12.0-dev-20210203.ebda93d5647a", + "adaptive-expressions": "4.12.0-dev-20210125.e5a4fc60f438", + "botbuilder-lg": "4.12.0-dev-20210125.e5a4fc60f438", "lodash": "^4.17.19" }, "peerDependencies": { diff --git a/Composer/packages/tools/built-in-functions/src/builtInFunctionsMap.ts b/Composer/packages/tools/built-in-functions/src/builtInFunctionsMap.ts index 955dbeeeac..fe5e1ebcf5 100644 --- a/Composer/packages/tools/built-in-functions/src/builtInFunctionsMap.ts +++ b/Composer/packages/tools/built-in-functions/src/builtInFunctionsMap.ts @@ -28,6 +28,11 @@ export const buildInFunctionsMap: Map = new Map