Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: [#4520] Upgrade restify to fix error on Node version 18+ #4528

Merged
merged 5 commits into from
Sep 6, 2023
Merged

fix: [#4520] Upgrade restify to fix error on Node version 18+ #4528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f951dc
Upgrade restify in JS and TS generators
ceciliaavila Aug 22, 2023
39567d2
Upgrade botbuilder version in generators
ceciliaavila Aug 23, 2023
5f062fb
Fix lint issue in core bot TS
ceciliaavila Aug 23, 2023
0eb924b
Merge branch 'main' into southworks/update/generators
ceciliaavila Aug 23, 2023
784b0eb
Merge remote-tracking branch 'origin/main' into southworks/update/gen…
ceciliaavila Sep 6, 2023
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-botbuilder/generators/app/templates/core/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { INodeSocket } from 'botframework-streaming';

// Import required bot services.
// See https://aka.ms/bot-services to learn more about the different parts of a bot.
import {
import {
CloudAdapter,
ConfigurationServiceClientCredentialFactory,
ConversationState,
Expand Down
10 changes: 5 additions & 5 deletions generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
},
"dependencies": {
"@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
"botbuilder": "~4.15.0",
"botbuilder-ai": "~4.15.0",
"botbuilder-dialogs": "~4.15.0",
"botbuilder-testing": "~4.15.0",
"botbuilder": "~4.20.0",
"botbuilder-ai": "~4.20.0",
"botbuilder-dialogs": "~4.20.0",
"botbuilder-testing": "~4.20.0",
"dotenv": "^8.2.0",
"restify": "^8.5.1"
"restify": "^11.1.0"
},
"devDependencies": {
"eslint": "^7.0.0",
Expand Down
10 changes: 5 additions & 5 deletions generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
},
"dependencies": {
"@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
"botbuilder": "~4.15.0",
"botbuilder-ai": "~4.15.0",
"botbuilder-dialogs": "~4.15.0",
"botbuilder-testing": "~4.15.0",
"botbuilder": "~4.20.0",
"botbuilder-ai": "~4.20.0",
"botbuilder-dialogs": "~4.20.0",
"botbuilder-testing": "~4.20.0",
"dotenv": "^8.2.0",
"replace": "~1.2.0",
"restify": "~8.5.1"
"restify": "~11.1.0"
},
"devDependencies": {
"@types/mocha": "^7.0.2",
Expand Down
8 changes: 4 additions & 4 deletions generators/generator-botbuilder/generators/app/templates/core/package.json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
},
"dependencies": {
"@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
"botbuilder": "~4.15.0",
"botbuilder-ai": "~4.15.0",
"botbuilder-dialogs": "~4.15.0",
"botbuilder": "~4.20.0",
"botbuilder-ai": "~4.20.0",
"botbuilder-dialogs": "~4.20.0",
"dotenv": "~8.2.0",
"restify": "~10.0.0"
"restify": "~11.1.0"
},
"devDependencies": {
"eslint": "^7.0.0",
Expand Down
8 changes: 4 additions & 4 deletions generators/generator-botbuilder/generators/app/templates/core/package.json.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
},
"dependencies": {
"@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
"botbuilder": "~4.15.0",
"botbuilder-ai": "~4.15.0",
"botbuilder-dialogs": "~4.15.0",
"botbuilder": "~4.20.0",
"botbuilder-ai": "~4.20.0",
"botbuilder-dialogs": "~4.20.0",
"dotenv": "~8.2.0",
"replace": "~1.2.0",
"restify": "~8.5.1"
"restify": "~11.1.0"
},
"devDependencies": {
"@types/mocha": "^7.0.2",
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-botbuilder/generators/app/templates/core/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"composite": true,
"declaration": true,
"target": "es2016",
"target": "es2017",
"module": "commonjs",
"outDir": "./lib",
"rootDir": "./src",
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-botbuilder/generators/app/templates/echo/package.json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"url": "https://github.com"
},
"dependencies": {
"botbuilder": "~4.15.0",
"botbuilder": "~4.20.0",
"dotenv": "~8.2.0",
"restify": "~11.1.0"
},
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-botbuilder/generators/app/templates/echo/package.json.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"url": "https://github.com"
},
"dependencies": {
"botbuilder": "~4.15.0",
"botbuilder": "~4.20.0",
"dotenv": "~8.2.0",
"replace": "~1.2.0",
"restify": "~8.5.1"
"restify": "~11.1.0"
},
"devDependencies": {
"@types/restify": "8.4.2",
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-botbuilder/generators/app/templates/echo/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"declaration": true,
"target": "es2016",
"target": "es2017",
"module": "commonjs",
"outDir": "./lib",
"rootDir": "./src",
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-botbuilder/generators/app/templates/empty/package.json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"url": "https://github.com"
},
"dependencies": {
"botbuilder": "~4.15.0",
"restify": "~10.0.0"
"botbuilder": "~4.20.0",
"restify": "~11.1.0"
},
"devDependencies": {
"eslint": "^7.0.0",
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-botbuilder/generators/app/templates/empty/package.json.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"url": "https://github.com"
},
"dependencies": {
"botbuilder": "~4.15.0",
"botbuilder": "~4.20.0",
"replace": "~1.2.0",
"restify": "~8.5.1"
"restify": "~11.1.0"
},
"devDependencies": {
"@types/restify": "8.4.2",
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-botbuilder/generators/app/templates/empty/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"declaration": true,
"target": "es2016",
"target": "es2017",
"module": "commonjs",
"outDir": "./lib",
"rootDir": "./src",
Expand Down
Loading