From 902046b9756fff689b6408a60d0c86588412aa5a Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 7 Jul 2021 15:22:20 -0600 Subject: [PATCH 1/5] Update everything to GA --- .../generator-bot-adaptive/platforms.js | 2 +- .../test/js-functions.test.js | 6 ++-- .../test/js-webapp.test.js | 6 ++-- packages/Teams/js/package.json | 28 +++++++++---------- .../CodeFirst/WaterfallHostBot/package.json | 4 +-- .../CodeFirst/EchoSkillBot/package.json | 2 +- .../CodeFirst/WaterfallSkillBot/package.json | 4 +-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/generators/generator-bot-adaptive/platforms.js b/generators/generator-bot-adaptive/platforms.js index bb01da0bf2..9d58605090 100644 --- a/generators/generator-bot-adaptive/platforms.js +++ b/generators/generator-bot-adaptive/platforms.js @@ -8,7 +8,7 @@ const dotnet = { const js = { name: 'js', - defaultSdkVersion: '4.14.0-preview.rc1', + defaultSdkVersion: '4.14.0-preview', }; module.exports = { dotnet, js }; diff --git a/generators/generator-bot-adaptive/test/js-functions.test.js b/generators/generator-bot-adaptive/test/js-functions.test.js index 0d0ed536b5..c22b1be238 100644 --- a/generators/generator-bot-adaptive/test/js-functions.test.js +++ b/generators/generator-bot-adaptive/test/js-functions.test.js @@ -107,10 +107,10 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat }, dependencies: { 'cross-env': 'latest', - 'botbuilder-ai-luis': '4.14.0-preview.rc1', - 'botbuilder-ai-qna': '4.14.0-preview.rc1', + 'botbuilder-ai-luis': '4.14.0-preview', + 'botbuilder-ai-qna': '4.14.0-preview', 'botbuilder-dialogs-adaptive-runtime-integration-azure-functions': - '4.14.0-preview.rc1', + '4.14.0-preview', }, }; diff --git a/generators/generator-bot-adaptive/test/js-webapp.test.js b/generators/generator-bot-adaptive/test/js-webapp.test.js index 679d2f74dc..d76e3995cd 100644 --- a/generators/generator-bot-adaptive/test/js-webapp.test.js +++ b/generators/generator-bot-adaptive/test/js-webapp.test.js @@ -86,10 +86,10 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat }, dependencies: { 'cross-env': 'latest', - 'botbuilder-ai-luis': '4.14.0-preview.rc1', - 'botbuilder-ai-qna': '4.14.0-preview.rc1', + 'botbuilder-ai-luis': '4.14.0-preview', + 'botbuilder-ai-qna': '4.14.0-preview', 'botbuilder-dialogs-adaptive-runtime-integration-express': - '4.14.0-preview.rc1', + '4.14.0-preview', }, }; diff --git a/packages/Teams/js/package.json b/packages/Teams/js/package.json index 9e349899ce..12d288fb20 100644 --- a/packages/Teams/js/package.json +++ b/packages/Teams/js/package.json @@ -29,13 +29,13 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "peerDependencies": { - "adaptive-expressions": "~4.14.0-rc0", - "botbuilder": "~4.14.0-rc0", - "botbuilder-dialogs": "~4.14.0-rc0", - "botbuilder-dialogs-adaptive": "~4.14.0-preview.rc0", - "botbuilder-dialogs-adaptive-runtime-core": "~4.14.0-preview.rc0", - "botbuilder-dialogs-declarative": "~4.14.0-preview.rc0", - "botbuilder-stdlib": "~4.14.0-internal.rc0", + "adaptive-expressions": "~4.14.0", + "botbuilder": "~4.14.0", + "botbuilder-dialogs": "~4.14.0", + "botbuilder-dialogs-adaptive": "~4.14.0-preview", + "botbuilder-dialogs-adaptive-runtime-core": "~4.14.0-preview", + "botbuilder-dialogs-declarative": "~4.14.0-preview", + "botbuilder-stdlib": "~4.14.0-internal", "lodash": "^4.17.21" }, "devDependencies": { @@ -43,13 +43,13 @@ "@types/lodash": "^4.14.168", "@typescript-eslint/eslint-plugin": "latest", "@typescript-eslint/parser": "latest", - "adaptive-expressions": "4.14.0-rc0", - "botbuilder": "4.14.0-rc0", - "botbuilder-dialogs": "4.14.0-rc0", - "botbuilder-dialogs-adaptive": "~4.14.0-preview.rc0", - "botbuilder-dialogs-adaptive-runtime-core": "~4.14.0-preview.rc0", - "botbuilder-dialogs-declarative": "~4.14.0-preview.rc0", - "botbuilder-stdlib": "~4.14.0-internal.rc0", + "adaptive-expressions": "4.14.0", + "botbuilder": "4.14.0", + "botbuilder-dialogs": "4.14.0", + "botbuilder-dialogs-adaptive": "~4.14.0-preview", + "botbuilder-dialogs-adaptive-runtime-core": "~4.14.0-preview", + "botbuilder-dialogs-declarative": "~4.14.0-preview", + "botbuilder-stdlib": "~4.14.0-internal", "eslint": "latest", "lodash": "^4.17.21", "rimraf": "^3.0.2", diff --git a/tests/functional/Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/package.json b/tests/functional/Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/package.json index 378267472e..333bab7282 100644 --- a/tests/functional/Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/package.json +++ b/tests/functional/Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/package.json @@ -15,8 +15,8 @@ "url": "https://github.com" }, "dependencies": { - "botbuilder": "~4.14.0-rc0", - "botbuilder-dialogs": "~4.14.0-rc0", + "botbuilder": "~4.14.0", + "botbuilder-dialogs": "~4.14.0", "dotenv": "~8.2.0", "restify": "~8.5.1" }, diff --git a/tests/functional/Bots/JavaScript/Skills/CodeFirst/EchoSkillBot/package.json b/tests/functional/Bots/JavaScript/Skills/CodeFirst/EchoSkillBot/package.json index 507be68816..862c06e364 100644 --- a/tests/functional/Bots/JavaScript/Skills/CodeFirst/EchoSkillBot/package.json +++ b/tests/functional/Bots/JavaScript/Skills/CodeFirst/EchoSkillBot/package.json @@ -15,7 +15,7 @@ "url": "https://github.com" }, "dependencies": { - "botbuilder": "~4.14.0-rc0", + "botbuilder": "~4.14.0", "dotenv": "^8.2.0", "restify": "~8.5.1" }, diff --git a/tests/functional/Bots/JavaScript/Skills/CodeFirst/WaterfallSkillBot/package.json b/tests/functional/Bots/JavaScript/Skills/CodeFirst/WaterfallSkillBot/package.json index 678f147e71..2ebcff1533 100644 --- a/tests/functional/Bots/JavaScript/Skills/CodeFirst/WaterfallSkillBot/package.json +++ b/tests/functional/Bots/JavaScript/Skills/CodeFirst/WaterfallSkillBot/package.json @@ -15,8 +15,8 @@ "url": "https://github.com" }, "dependencies": { - "botbuilder": "~4.14.0-rc0", - "botbuilder-dialogs": "~4.14.0-rc0", + "botbuilder": "~4.14.0", + "botbuilder-dialogs": "~4.14.0", "dotenv": "^8.2.0", "node-fetch": "^2.6.1", "restify": "~8.5.1" From 7bc09810625fa84a884953b8e1685489e3b02d3c Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 7 Jul 2021 15:25:26 -0600 Subject: [PATCH 2/5] Update yarn lock --- .../JavaScript/Consumers/CodeFirst/SimpleHostBot/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/package.json b/tests/functional/Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/package.json index a36b9f459d..2f072f539a 100644 --- a/tests/functional/Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/package.json +++ b/tests/functional/Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/package.json @@ -15,8 +15,8 @@ "url": "https://github.com" }, "dependencies": { - "botbuilder": "4.14.0-rc0", - "botbuilder-dialogs": "~4.14.0-rc0", + "botbuilder": "4.14.0", + "botbuilder-dialogs": "~4.14.0", "dotenv": "~8.2.0", "restify": "~8.5.1" }, From 9b85f85f1074308c17cb1b7693aac7407496c6db Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 7 Jul 2021 15:25:41 -0600 Subject: [PATCH 3/5] Update yarn lock --- yarn.lock | 312 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 225 insertions(+), 87 deletions(-) diff --git a/yarn.lock b/yarn.lock index c213ce3dde..c76e4b1c7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -99,25 +99,25 @@ __metadata: "@types/lodash": ^4.14.168 "@typescript-eslint/eslint-plugin": latest "@typescript-eslint/parser": latest - adaptive-expressions: 4.14.0-rc0 - botbuilder: 4.14.0-rc0 - botbuilder-dialogs: 4.14.0-rc0 - botbuilder-dialogs-adaptive: ~4.14.0-preview.rc0 - botbuilder-dialogs-adaptive-runtime-core: ~4.14.0-preview.rc0 - botbuilder-dialogs-declarative: ~4.14.0-preview.rc0 - botbuilder-stdlib: ~4.14.0-internal.rc0 + adaptive-expressions: 4.14.0 + botbuilder: 4.14.0 + botbuilder-dialogs: 4.14.0 + botbuilder-dialogs-adaptive: ~4.14.0-preview + botbuilder-dialogs-adaptive-runtime-core: ~4.14.0-preview + botbuilder-dialogs-declarative: ~4.14.0-preview + botbuilder-stdlib: ~4.14.0-internal eslint: latest lodash: ^4.17.21 rimraf: ^3.0.2 typescript: ^4.0.5 peerDependencies: - adaptive-expressions: ~4.14.0-rc0 - botbuilder: ~4.14.0-rc0 - botbuilder-dialogs: ~4.14.0-rc0 - botbuilder-dialogs-adaptive: ~4.14.0-preview.rc0 - botbuilder-dialogs-adaptive-runtime-core: ~4.14.0-preview.rc0 - botbuilder-dialogs-declarative: ~4.14.0-preview.rc0 - botbuilder-stdlib: ~4.14.0-internal.rc0 + adaptive-expressions: ~4.14.0 + botbuilder: ~4.14.0 + botbuilder-dialogs: ~4.14.0 + botbuilder-dialogs-adaptive: ~4.14.0-preview + botbuilder-dialogs-adaptive-runtime-core: ~4.14.0-preview + botbuilder-dialogs-declarative: ~4.14.0-preview + botbuilder-stdlib: ~4.14.0-internal lodash: ^4.17.21 languageName: unknown linkType: soft @@ -825,9 +825,9 @@ __metadata: languageName: node linkType: hard -"adaptive-expressions@npm:4.14.0-rc0": - version: 4.14.0-rc0 - resolution: "adaptive-expressions@npm:4.14.0-rc0" +"adaptive-expressions@npm:4.14.0": + version: 4.14.0 + resolution: "adaptive-expressions@npm:4.14.0" dependencies: "@microsoft/recognizers-text-data-types-timex-expression": 1.3.0 "@types/atob-lite": ^2.0.0 @@ -849,7 +849,35 @@ __metadata: xml2js: ^0.4.23 xmldom: ^0.5.0 xpath: ^0.0.32 - checksum: efb2c322116fe5385ea7b9daade4656c5569b0bfb63ee15e9d756a73d100ebaba0fbfa342bd1c7091eb82c4092b64cd3730ada9ccb008413cad3c8d91e9d507d + checksum: de9b382e92ffe2bea6236ad40a19e73ab797e65943180e54392159c1731f3dc2138dda1d1af81c51bcc36e9a41410f64783f3ca13085933d36cbb2826e3a55b0 + languageName: node + linkType: hard + +"adaptive-expressions@npm:4.14.0-rc2": + version: 4.14.0-rc2 + resolution: "adaptive-expressions@npm:4.14.0-rc2" + dependencies: + "@microsoft/recognizers-text-data-types-timex-expression": 1.3.0 + "@types/atob-lite": ^2.0.0 + "@types/btoa-lite": ^1.0.0 + "@types/lodash.isequal": ^4.5.5 + "@types/lru-cache": ^5.1.0 + "@types/xmldom": ^0.1.30 + antlr4ts: 0.5.0-alpha.3 + atob-lite: ^2.0.0 + big-integer: ^1.6.48 + btoa-lite: ^1.0.0 + d3-format: ^1.4.4 + dayjs: ^1.10.3 + jspath: ^0.4.0 + lodash.isequal: ^4.5.0 + lru-cache: ^5.1.1 + uuid: ^8.3.2 + x2js: ^3.4.0 + xml2js: ^0.4.23 + xmldom: ^0.5.0 + xpath: ^0.0.32 + checksum: 97e1680fdc7d71614104bea5ba7a1cd4127967911688f5c287e30511f848f66b996df099412bb89ab668a81544662fa4c7e4c4822a3a512fddfc892715099193 languageName: node linkType: hard @@ -1527,119 +1555,188 @@ __metadata: languageName: node linkType: hard -"botbuilder-core@npm:4.14.0-rc0": - version: 4.14.0-rc0 - resolution: "botbuilder-core@npm:4.14.0-rc0" +"botbuilder-core@npm:4.14.0": + version: 4.14.0 + resolution: "botbuilder-core@npm:4.14.0" dependencies: - botbuilder-dialogs-adaptive-runtime-core: 4.14.0-preview.rc0 - botbuilder-stdlib: 4.14.0-internal.rc0 - botframework-connector: 4.14.0-rc0 - botframework-schema: 4.14.0-rc0 + botbuilder-dialogs-adaptive-runtime-core: 4.14.0-preview + botbuilder-stdlib: 4.14.0-internal + botframework-connector: 4.14.0 + botframework-schema: 4.14.0 uuid: ^8.3.2 zod: ~1.11.17 - checksum: 5e7aa040d6d0e0f2a130e197e8be4472e3bf33562e10fe0dad2843c67dc7f93f53b793626f371af544429473acd75901c4a413835ab96ec01be6833cb1b73956 + checksum: b617e7fea0120460113d59062cdf12f7903eea36d7941089dfe55aae3ba4abf8b3990e09273d76a584095303c972712762a0d87263360f7b4eab3e2c5ed6e017 + languageName: node + linkType: hard + +"botbuilder-core@npm:4.14.0-rc2": + version: 4.14.0-rc2 + resolution: "botbuilder-core@npm:4.14.0-rc2" + dependencies: + botbuilder-dialogs-adaptive-runtime-core: 4.14.0-preview.rc2 + botbuilder-stdlib: 4.14.0-internal.rc2 + botframework-connector: 4.14.0-rc2 + botframework-schema: 4.14.0-rc2 + uuid: ^8.3.2 + zod: ~1.11.17 + checksum: 6a0a55bb576bdfb60e67d5779e7a663db9c546ef5520d75718e30389ddb0d6291fcdc7e7df104ba0443304b28ffe363d41a31ae961d59447be85328a02285cdf + languageName: node + linkType: hard + +"botbuilder-dialogs-adaptive-runtime-core@npm:4.14.0-preview": + version: 4.14.0-preview + resolution: "botbuilder-dialogs-adaptive-runtime-core@npm:4.14.0-preview" + dependencies: + dependency-graph: ^0.10.0 + checksum: 8bc38639faa59e541a32feac99d7eb3428d6a5a2071d2cdaaee3b1480224ed213cfa00f974236f76b4169848bf2189e19e4e08a1415b4646b4e58ebc3aee1da1 languageName: node linkType: hard -"botbuilder-dialogs-adaptive-runtime-core@npm:4.14.0-preview.rc0, botbuilder-dialogs-adaptive-runtime-core@npm:~4.14.0-preview.rc0": - version: 4.14.0-preview.rc0 - resolution: "botbuilder-dialogs-adaptive-runtime-core@npm:4.14.0-preview.rc0" +"botbuilder-dialogs-adaptive-runtime-core@npm:4.14.0-preview.rc2, botbuilder-dialogs-adaptive-runtime-core@npm:~4.14.0-preview": + version: 4.14.0-preview.rc2 + resolution: "botbuilder-dialogs-adaptive-runtime-core@npm:4.14.0-preview.rc2" dependencies: dependency-graph: ^0.10.0 - checksum: 0e74a0d0264a760f8ede0ce3652589767618df1f0182e4e845661fc69d45db29a573d7ae83c86e5f1162cf70e93743d774f1ec35c7fd3f87a3f5c53451dc9adc + checksum: ae23051cb664122f4f40ab5753a1655f34b6b06596bba25d347b3c877dfc986de5da8c30680946a154afc3925f6c9ab4d4ff286821306e570429380d0839dda8 languageName: node linkType: hard -"botbuilder-dialogs-adaptive@npm:~4.14.0-preview.rc0": - version: 4.14.0-preview.rc0 - resolution: "botbuilder-dialogs-adaptive@npm:4.14.0-preview.rc0" +"botbuilder-dialogs-adaptive@npm:~4.14.0-preview": + version: 4.14.0-preview.rc2 + resolution: "botbuilder-dialogs-adaptive@npm:4.14.0-preview.rc2" dependencies: "@microsoft/recognizers-text-suite": 1.1.4 - adaptive-expressions: 4.14.0-rc0 - botbuilder: 4.14.0-rc0 - botbuilder-dialogs: 4.14.0-rc0 - botbuilder-dialogs-adaptive-runtime-core: 4.14.0-preview.rc0 - botbuilder-dialogs-declarative: 4.14.0-preview.rc0 - botbuilder-lg: 4.14.0-rc0 + adaptive-expressions: 4.14.0-rc2 + botbuilder: 4.14.0-rc2 + botbuilder-dialogs: 4.14.0-rc2 + botbuilder-dialogs-adaptive-runtime-core: 4.14.0-preview.rc2 + botbuilder-dialogs-declarative: 4.14.0-preview.rc2 + botbuilder-lg: 4.14.0-rc2 lodash: ^4.17.21 node-fetch: ^2.6.0 - checksum: 22c93799df01a5620a6188f1be55d99f7dae17f7411846d98ff871cc5e60cbde61054a5f95493f0615d50c21a01f0de591d9ea3487757a382afc5fdc8278a5f6 + checksum: 59ac133abad4fd91cf45b06de5ffc08d9839f2196d393d4f40f9863fb0a731b009bfd8df98985b066ba64e1050745a9422a7bbfbc762eb9e2c200b9ee8b05f3d languageName: node linkType: hard -"botbuilder-dialogs-declarative@npm:4.14.0-preview.rc0, botbuilder-dialogs-declarative@npm:~4.14.0-preview.rc0": - version: 4.14.0-preview.rc0 - resolution: "botbuilder-dialogs-declarative@npm:4.14.0-preview.rc0" +"botbuilder-dialogs-declarative@npm:4.14.0-preview.rc2, botbuilder-dialogs-declarative@npm:~4.14.0-preview": + version: 4.14.0-preview.rc2 + resolution: "botbuilder-dialogs-declarative@npm:4.14.0-preview.rc2" dependencies: - botbuilder-core: 4.14.0-rc0 - botbuilder-dialogs: 4.14.0-rc0 - botbuilder-stdlib: 4.14.0-internal.rc0 + botbuilder-core: 4.14.0-rc2 + botbuilder-dialogs: 4.14.0-rc2 + botbuilder-stdlib: 4.14.0-internal.rc2 chokidar: ^3.4.0 - checksum: 62b8b7e0f52f2be96d221df0254875bf848ae91eb945c81f1c911ea65fd2d76ff51029673347932da77c424d4b205d1050fb975fea8edbb5ad035d818ac1cee7 + checksum: 65c685b15e7a9257bef4a0f8481f274909c10c2db93a2f72040ed66aa1c1e937c07ef389754e37e3f40a08e816eb85a76843c16f39b8dd4f1ae8aae221fec3ec languageName: node linkType: hard -"botbuilder-dialogs@npm:4.14.0-rc0": - version: 4.14.0-rc0 - resolution: "botbuilder-dialogs@npm:4.14.0-rc0" +"botbuilder-dialogs@npm:4.14.0": + version: 4.14.0 + resolution: "botbuilder-dialogs@npm:4.14.0" dependencies: "@microsoft/recognizers-text-choice": 1.1.4 "@microsoft/recognizers-text-date-time": 1.1.4 "@microsoft/recognizers-text-number": 1.1.4 "@microsoft/recognizers-text-suite": 1.1.4 - botbuilder-core: 4.14.0-rc0 - botbuilder-dialogs-adaptive-runtime-core: 4.14.0-preview.rc0 - botbuilder-stdlib: 4.14.0-internal.rc0 - botframework-connector: 4.14.0-rc0 + botbuilder-core: 4.14.0 + botbuilder-dialogs-adaptive-runtime-core: 4.14.0-preview + botbuilder-stdlib: 4.14.0-internal + botframework-connector: 4.14.0 globalize: ^1.4.2 lodash: ^4.17.21 zod: ~1.11.17 - checksum: 77b6161bfc04e1e19ad2b0cd0ec96b073a1f617734f52697a7bb2ad21f470410eedeb54e604a414d997b6747b542a008753553f94e3b517724cbe8575fac68f2 + checksum: c1f58e6b4bddeeea500f5bea3e1552478b39e11ea679f7d7771cf1bfb29cb79df627ac8405f3997a713338dde6861e0c465e4ab5fa78bf817264b5e49132a56a languageName: node linkType: hard -"botbuilder-lg@npm:4.14.0-rc0": - version: 4.14.0-rc0 - resolution: "botbuilder-lg@npm:4.14.0-rc0" +"botbuilder-dialogs@npm:4.14.0-rc2": + version: 4.14.0-rc2 + resolution: "botbuilder-dialogs@npm:4.14.0-rc2" dependencies: - adaptive-expressions: 4.14.0-rc0 + "@microsoft/recognizers-text-choice": 1.1.4 + "@microsoft/recognizers-text-date-time": 1.1.4 + "@microsoft/recognizers-text-number": 1.1.4 + "@microsoft/recognizers-text-suite": 1.1.4 + botbuilder-core: 4.14.0-rc2 + botbuilder-dialogs-adaptive-runtime-core: 4.14.0-preview.rc2 + botbuilder-stdlib: 4.14.0-internal.rc2 + botframework-connector: 4.14.0-rc2 + globalize: ^1.4.2 + lodash: ^4.17.21 + zod: ~1.11.17 + checksum: 552f8f244a5b3109071d8e930fd24ff08a5063db4d92005350e1e99ddd41a1dd159c6dedd739f9f76653d3b61f00f16e2d67d3c6176bc2a29cd17ce0a36395b8 + languageName: node + linkType: hard + +"botbuilder-lg@npm:4.14.0-rc2": + version: 4.14.0-rc2 + resolution: "botbuilder-lg@npm:4.14.0-rc2" + dependencies: + adaptive-expressions: 4.14.0-rc2 antlr4ts: 0.5.0-alpha.3 lodash: ^4.17.19 uuid: ^8.3.2 - checksum: 40e02788ece6eafd553ca2b3bf3d29e9eae71b4c5d3a63e9d8e6b6c83675f37059049c28dee8106659ee5b9e94288148429aad4fad474bc01365c7fc49f6a5ef + checksum: 28f2fd8d6fba0a2feb9887773034a42c4bf730cd4c414a33a5d6bdde795c7a4231a27750e8cdef29a0a5d24b418ce0d9252ebc326e07b337b0181aed9bd0776b + languageName: node + linkType: hard + +"botbuilder-stdlib@npm:4.14.0-internal": + version: 4.14.0-internal + resolution: "botbuilder-stdlib@npm:4.14.0-internal" + checksum: e38630a1ae535c06422033b1301b764977cfd06259904d25c6a8bd72a676865c456fcdb792ce3abf03a3bb508bb212ab93a4b81702a32384cf297abe7dc9b8d4 languageName: node linkType: hard -"botbuilder-stdlib@npm:4.14.0-internal.rc0, botbuilder-stdlib@npm:~4.14.0-internal.rc0": - version: 4.14.0-internal.rc0 - resolution: "botbuilder-stdlib@npm:4.14.0-internal.rc0" - checksum: 2dfd1d9d7fe3ee0fc166277f6728ce07e6dc5c411af02f518d0cf4a684d0c735744330c652e83d884ee863c64a3ec76baf4132e07baaf0f8484926c749def05a +"botbuilder-stdlib@npm:4.14.0-internal.rc2, botbuilder-stdlib@npm:~4.14.0-internal": + version: 4.14.0-internal.rc2 + resolution: "botbuilder-stdlib@npm:4.14.0-internal.rc2" + checksum: fa437e8cc3d689901ff3a24276e64d7de998a5ce573793b28e026c0dc13631fb391ad7464367049da0e3249bc6a6f0b5a76392c013f351d9b97f6e2454030f07 + languageName: node + linkType: hard + +"botbuilder@npm:4.14.0": + version: 4.14.0 + resolution: "botbuilder@npm:4.14.0" + dependencies: + "@azure/ms-rest-js": 1.9.1 + axios: ^0.21.1 + botbuilder-core: 4.14.0 + botbuilder-stdlib: 4.14.0-internal + botframework-connector: 4.14.0 + botframework-streaming: 4.14.0 + dayjs: ^1.10.3 + filenamify: ^4.1.0 + fs-extra: ^7.0.1 + htmlparser2: ^6.0.1 + uuid: ^8.3.2 + zod: ~1.11.17 + checksum: a916227bc341fc106be36f8fde60f7e83ebb8e05014d5c314c0a515711cd70595615d183989286557bad1ef08a5ad923a4bb03758a03cbc28440facafb9b0932 languageName: node linkType: hard -"botbuilder@npm:4.14.0-rc0": - version: 4.14.0-rc0 - resolution: "botbuilder@npm:4.14.0-rc0" +"botbuilder@npm:4.14.0-rc2": + version: 4.14.0-rc2 + resolution: "botbuilder@npm:4.14.0-rc2" dependencies: "@azure/ms-rest-js": 1.9.1 axios: ^0.21.1 - botbuilder-core: 4.14.0-rc0 - botbuilder-stdlib: 4.14.0-internal.rc0 - botframework-connector: 4.14.0-rc0 - botframework-streaming: 4.14.0-rc0 + botbuilder-core: 4.14.0-rc2 + botbuilder-stdlib: 4.14.0-internal.rc2 + botframework-connector: 4.14.0-rc2 + botframework-streaming: 4.14.0-rc2 dayjs: ^1.10.3 filenamify: ^4.1.0 fs-extra: ^7.0.1 htmlparser2: ^6.0.1 uuid: ^8.3.2 zod: ~1.11.17 - checksum: 3d00f49a6dd34fb6bc6a63f5fb42645b5da87b3d2299576331c7a15e3b8e732a196181101fd62d13d7483a3c969b2fd8e3e623f15d4fce337b3ede87c99bec43 + checksum: 324beaa09fb3870a03247f6b76925c05f1c61d7b193184c71f55dcb5abf2f1efe1edebe3da84a0e182af7b3534b6273c4390e89faf282036f7a8e2a5d2dc3a35 languageName: node linkType: hard -"botframework-connector@npm:4.14.0-rc0": - version: 4.14.0-rc0 - resolution: "botframework-connector@npm:4.14.0-rc0" +"botframework-connector@npm:4.14.0": + version: 4.14.0 + resolution: "botframework-connector@npm:4.14.0" dependencies: "@azure/ms-rest-js": 1.9.1 "@types/jsonwebtoken": 7.2.8 @@ -1647,34 +1744,75 @@ __metadata: adal-node: 0.2.2 axios: ^0.21.1 base64url: ^3.0.0 - botbuilder-stdlib: 4.14.0-internal.rc0 - botframework-schema: 4.14.0-rc0 + botbuilder-stdlib: 4.14.0-internal + botframework-schema: 4.14.0 cross-fetch: ^3.0.5 jsonwebtoken: 8.0.1 rsa-pem-from-mod-exp: ^0.8.4 - checksum: 64331d4b0c62159487aba3dcfef2b5a8225967484e21badf4cc6d3dd3b1a5437863a6b8d90eb777428f4328204d61b28d956260ee5002c89a6cdd7b4a8a84f44 + checksum: 565e2475524cd3ee3d2e4ddd83890e58a15e68f128daf9be5ad943e38c3088e8ed1a7f04c082825059a83fb007106ec1047e90aec19235665c27a526d0e9443e languageName: node linkType: hard -"botframework-schema@npm:4.14.0-rc0": - version: 4.14.0-rc0 - resolution: "botframework-schema@npm:4.14.0-rc0" +"botframework-connector@npm:4.14.0-rc2": + version: 4.14.0-rc2 + resolution: "botframework-connector@npm:4.14.0-rc2" dependencies: - botbuilder-stdlib: 4.14.0-internal.rc0 + "@azure/ms-rest-js": 1.9.1 + "@types/jsonwebtoken": 7.2.8 + "@types/node": ^10.17.27 + adal-node: 0.2.2 + axios: ^0.21.1 + base64url: ^3.0.0 + botbuilder-stdlib: 4.14.0-internal.rc2 + botframework-schema: 4.14.0-rc2 + cross-fetch: ^3.0.5 + jsonwebtoken: 8.0.1 + rsa-pem-from-mod-exp: ^0.8.4 + checksum: 188c646db252281469786ee5964c394897995ef74ca604df14dead099a8681db77c2477e2928f5af5c532e7aba1e0b0ed4c24dfefe34d819f676e9ac6e71120d + languageName: node + linkType: hard + +"botframework-schema@npm:4.14.0": + version: 4.14.0 + resolution: "botframework-schema@npm:4.14.0" + dependencies: + botbuilder-stdlib: 4.14.0-internal uuid: ^8.3.2 - checksum: 510bf414ba745f37bc227ca3bd4d15ec1b993effa879cfa92ef960f3c74c74b148463faf64fe5570e4fd70feac17edd128b21fd2245d77d6bfc25f13659c474d + checksum: fd86f0a6eb5be4f84c90bdb58de20129fdd92138652aaebc4cc29ccdf7e0f7944e85c1c007ecb654d576b734fce984466ff2d7edc2f98c344f1210b23f0badf1 + languageName: node + linkType: hard + +"botframework-schema@npm:4.14.0-rc2": + version: 4.14.0-rc2 + resolution: "botframework-schema@npm:4.14.0-rc2" + dependencies: + botbuilder-stdlib: 4.14.0-internal.rc2 + uuid: ^8.3.2 + checksum: 580a64fc1ebf6141497ed832025908f29a19b4dfafcb2a4b39897d6e66cab4696f793cb13ce8c0a5ea5138c47ecc9b595f49d6d01dac9159982124e2b7656541 + languageName: node + linkType: hard + +"botframework-streaming@npm:4.14.0": + version: 4.14.0 + resolution: "botframework-streaming@npm:4.14.0" + dependencies: + "@types/node": ^10.17.27 + "@types/ws": ^6.0.3 + uuid: ^8.3.2 + ws: ^7.1.2 + checksum: c23f75c1ddd95f2265bbf77c68ba0c188492398daaa0cda1cab113e9d22dcf63aec1831a5ce1df7382b91f20c0202c12e9afa4c6de799d64690825d3c3b5f76a languageName: node linkType: hard -"botframework-streaming@npm:4.14.0-rc0": - version: 4.14.0-rc0 - resolution: "botframework-streaming@npm:4.14.0-rc0" +"botframework-streaming@npm:4.14.0-rc2": + version: 4.14.0-rc2 + resolution: "botframework-streaming@npm:4.14.0-rc2" dependencies: "@types/node": ^10.17.27 "@types/ws": ^6.0.3 uuid: ^8.3.2 ws: ^7.1.2 - checksum: 3da7ae9029e040436d72a8b35ca29baa684608522a221ac81379eac1be1d74f1dedb19fc171cb09f6d75564496fb0e76ea3f67602e7bcf0b83f609809eab9d7c + checksum: e069264b1adb922a3aee3ee3bee3962d46a8db5176a29a5ab121f96b88b9294af59fa1176d10d85f344bc6c5ccac0c01bd29614617e49aa00e2e69a387788e84 languageName: node linkType: hard From 4eb68fa48e4b04be96c0ad147cd1b617ff6b0d81 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Thu, 8 Jul 2021 09:41:09 -0600 Subject: [PATCH 4/5] Update dependency package version --- .../generators/app/index.js | 2 +- .../generator-bot-core-assistant/package.json | 2 +- .../generators/app/index.js | 4 ++-- .../generator-bot-core-qna/package.json | 2 +- generators/generator-bot-empty/package.json | 2 +- .../package.json | 6 ++--- .../generators/app/index.js | 2 +- .../package.json | 2 +- .../generators/app/index.js | 2 +- .../package.json | 2 +- yarn.lock | 22 +++++++++---------- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/generators/generator-bot-core-assistant/generators/app/index.js b/generators/generator-bot-core-assistant/generators/app/index.js index e94d490605..c79b946aee 100644 --- a/generators/generator-bot-core-assistant/generators/app/index.js +++ b/generators/generator-bot-core-assistant/generators/app/index.js @@ -12,7 +12,7 @@ const packageReferences = { [platforms.dotnet.name]: [ { name: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.1.0-preview.0', + version: '1.1.0-preview.1', }, ], [platforms.js.name]: [ diff --git a/generators/generator-bot-core-assistant/package.json b/generators/generator-bot-core-assistant/package.json index 4409105f09..4e62f483d7 100644 --- a/generators/generator-bot-core-assistant/package.json +++ b/generators/generator-bot-core-assistant/package.json @@ -24,7 +24,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-core-language/generators/app/index.js b/generators/generator-bot-core-language/generators/app/index.js index 4e8f46b514..15261dab2c 100644 --- a/generators/generator-bot-core-language/generators/app/index.js +++ b/generators/generator-bot-core-language/generators/app/index.js @@ -12,11 +12,11 @@ const packageReferences = { [platforms.dotnet.name]: [ { name: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.1.0-preview.0', + version: '1.1.0-preview.1', }, { name: 'Microsoft.Bot.Components.Welcome', - version: '1.1.0-preview.0', + version: '1.1.0-preview.1', }, ], [platforms.js.name]: [ diff --git a/generators/generator-bot-core-qna/package.json b/generators/generator-bot-core-qna/package.json index 2acfcfa686..672384002a 100644 --- a/generators/generator-bot-core-qna/package.json +++ b/generators/generator-bot-core-qna/package.json @@ -23,7 +23,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-empty/package.json b/generators/generator-bot-empty/package.json index 7bbd901cf6..1a0cfb9ab0 100644 --- a/generators/generator-bot-empty/package.json +++ b/generators/generator-bot-empty/package.json @@ -26,7 +26,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-enterprise-assistant/package.json b/generators/generator-bot-enterprise-assistant/package.json index 1232ba3204..f070104838 100644 --- a/generators/generator-bot-enterprise-assistant/package.json +++ b/generators/generator-bot-enterprise-assistant/package.json @@ -25,9 +25,9 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", - "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.0", - "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", + "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.1", + "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.1", "uuid": "^8.3.2", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" diff --git a/generators/generator-bot-enterprise-calendar/generators/app/index.js b/generators/generator-bot-enterprise-calendar/generators/app/index.js index 586eb8dc6d..3a796495aa 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/index.js +++ b/generators/generator-bot-enterprise-calendar/generators/app/index.js @@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator { { isPlugin: true, name: 'Microsoft.Bot.Components.Graph', - version: '1.1.0-preview.0', + version: '1.1.0-preview.1', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/generators/generator-bot-enterprise-calendar/package.json b/generators/generator-bot-enterprise-calendar/package.json index cd491abfdf..bdabd77b4c 100644 --- a/generators/generator-bot-enterprise-calendar/package.json +++ b/generators/generator-bot-enterprise-calendar/package.json @@ -24,7 +24,7 @@ "lint": "eslint ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-enterprise-people/generators/app/index.js b/generators/generator-bot-enterprise-people/generators/app/index.js index 2fde064d9f..2ddfd43a15 100644 --- a/generators/generator-bot-enterprise-people/generators/app/index.js +++ b/generators/generator-bot-enterprise-people/generators/app/index.js @@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator { { isPlugin: true, name: 'Microsoft.Bot.Components.Graph', - version: '1.1.0-preview.0', + version: '1.1.0-preview.1', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/generators/generator-bot-enterprise-people/package.json b/generators/generator-bot-enterprise-people/package.json index 446e84f18b..66086d3aa8 100644 --- a/generators/generator-bot-enterprise-people/package.json +++ b/generators/generator-bot-enterprise-people/package.json @@ -24,7 +24,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/yarn.lock b/yarn.lock index 73cf9007a6..815d18dfe5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -134,7 +134,7 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-adaptive@workspace:^1.1.0, @microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.0, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive": +"@microsoft/generator-bot-adaptive@workspace:^1.1.0, @microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.1, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive": version: 0.0.0-use.local resolution: "@microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive" dependencies: @@ -157,7 +157,7 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-core-assistant@workspace:generators/generator-bot-core-assistant" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -185,7 +185,7 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-core-qna@workspace:generators/generator-bot-core-qna" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -199,7 +199,7 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-empty@workspace:generators/generator-bot-empty" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -213,9 +213,9 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-enterprise-assistant@workspace:generators/generator-bot-enterprise-assistant" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" - "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.0" - "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" + "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.1" + "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.1" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -226,11 +226,11 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-enterprise-calendar@workspace:^1.1.0-preview.0, @microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar": +"@microsoft/generator-bot-enterprise-calendar@workspace:^1.1.0-preview.1, @microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar": version: 0.0.0-use.local resolution: "@microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -240,11 +240,11 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-enterprise-people@workspace:^1.1.0-preview.0, @microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people": +"@microsoft/generator-bot-enterprise-people@workspace:^1.1.0-preview.1, @microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people": version: 0.0.0-use.local resolution: "@microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest From e858dd25d170d30dfe31eb03e35831b7655554ba Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Thu, 8 Jul 2021 09:42:52 -0600 Subject: [PATCH 5/5] Add missing dependency --- generators/generator-bot-core-language/package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/generator-bot-core-language/package.json b/generators/generator-bot-core-language/package.json index 72a347e11d..94f3837c58 100644 --- a/generators/generator-bot-core-language/package.json +++ b/generators/generator-bot-core-language/package.json @@ -26,7 +26,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/yarn.lock b/yarn.lock index 815d18dfe5..e749ae9e05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -134,7 +134,7 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-adaptive@workspace:^1.1.0, @microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.1, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive": +"@microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.1, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive": version: 0.0.0-use.local resolution: "@microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive" dependencies: @@ -171,7 +171,7 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-core-language@workspace:generators/generator-bot-core-language" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest