Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

feat: Update everything with JS to GA #1195

Merged
thomas-chung merged 6 commits into from
Jul 8, 2021
Merged

feat: Update everything with JS to GA #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
902046b
Update everything to GA
Jul 7, 2021
7bc0981
Update yarn lock
Jul 7, 2021
9b85f85
Update yarn lock
Jul 7, 2021
84024eb
Merge branch '4.14' into thchung/updateToGA
Jul 8, 2021
4eb68fa
Update dependency package version
Jul 8, 2021
e858dd2
Add missing dependency
Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generators/generator-bot-adaptive/platforms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
6 changes: 3 additions & 3 deletions generators/generator-bot-adaptive/test/js-functions.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
};

Expand Down
6 changes: 3 additions & 3 deletions generators/generator-bot-adaptive/test/js-webapp.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
};

Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-core-assistant/generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]: [
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-core-assistant/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-bot-core-language/generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]: [
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-core-language/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-core-qna/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-empty/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions generators/generator-bot-enterprise-assistant/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-enterprise-calendar/generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-enterprise-calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-enterprise-people/generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-enterprise-people/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
28 changes: 14 additions & 14 deletions packages/Teams/js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@
"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": {
"@tsconfig/recommended": "^1.0.1",
"@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",
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/Bots/JavaScript/Skills/CodeFirst/EchoSkillBot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/Bots/JavaScript/Skills/CodeFirst/WaterfallSkillBot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading