Skip to content

[R7, Cherry-pick] Cherry-pick TypeScript 3.5.3 pin from 4.6 branch #1442

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

Merged
stevengum merged 3 commits into from
Nov 22, 2019
Merged

[R7, Cherry-pick] Cherry-pick TypeScript 3.5.3 pin from 4.6 branch #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abfe7a2
[4.6.x] Pin TypeScript devDependency in each library. (Fixes #1436) (…
stevengum Nov 21, 2019
f21644c
[4.6.x] Fix set-dependency-versions script (#1438)
stevengum Nov 21, 2019
105f23d
add typescript@3.5.3 as devDependency to bb-lg & bf-expressions packages
stevengum Nov 22, 2019
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
3 changes: 2 additions & 1 deletion libraries/botbuilder-ai/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"nock": "^10.0.3",
"nyc": "^11.4.1",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0"
"ts-node": "^4.1.0",
"typescript": "3.5.3"
},
"scripts": {
"test": "tsc && nyc mocha tests/",
Expand Down
3 changes: 2 additions & 1 deletion libraries/botbuilder-applicationinsights/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"mocha": "^5.2.0",
"nyc": "^11.4.1",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0"
"ts-node": "^4.1.0",
"typescript": "3.5.3"
},
"scripts": {
"test": "tsc && nyc mocha tests/",
Expand Down
5 changes: 3 additions & 2 deletions libraries/botbuilder-azure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@
"@types/semaphore": "^1.1.0",
"codelyzer": "^4.1.0",
"mocha": "^5.2.0",
"nyc": "^11.4.1",
"nock": "^10.0.3",
"nyc": "^11.4.1",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0"
"ts-node": "^4.1.0",
"typescript": "3.5.3"
},
"scripts": {
"test": "tsc && nyc mocha tests/",
Expand Down
1 change: 1 addition & 0 deletions libraries/botbuilder-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"nyc": "^11.4.1",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0",
"typescript": "3.5.3",
"unzip": "^0.1.11"
},
"scripts": {
Expand Down
4 changes: 3 additions & 1 deletion libraries/botbuilder-core/src/skypeMentionNormalizeMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License.
*/
import { Activity, Middleware, TurnContext } from 'botbuilder-core';
import { Activity } from 'botframework-schema';
import { Middleware } from './middlewareSet';
import { TurnContext } from './turnContext';


/**
Expand Down
3 changes: 2 additions & 1 deletion libraries/botbuilder-dialogs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"mocha": "^5.2.0",
"nyc": "^11.4.1",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0"
"ts-node": "^4.1.0",
"typescript": "3.5.3"
},
"scripts": {
"test": "tsc && nyc mocha tests/",
Expand Down
3 changes: 2 additions & 1 deletion libraries/botbuilder-lg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"@types/mocha": "^5.2.5",
"@types/node": "^10.12.18",
"nyc": "^11.4.1",
"ts-node": "^4.1.0"
"ts-node": "^4.1.0",
"typescript": "3.5.3"
},
"scripts": {
"test": "tsc && nyc mocha tests/ --timeout 60000",
Expand Down
1 change: 1 addition & 0 deletions libraries/botbuilder-testing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"nyc": "^11.4.1",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0",
"typescript": "3.5.3",
"unzip": "^0.1.11",
"uuid": "^3.3.2"
},
Expand Down
1 change: 1 addition & 0 deletions libraries/botbuilder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"nyc": "^11.4.1",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0",
"typescript": "3.5.3",
"uuid": "^3.3.2"
},
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion libraries/botframework-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
},
"devDependencies": {
"@types/uuid": "^3.4.3",
"mocha": "^5.2.0"
"mocha": "^5.2.0",
"typescript": "3.5.3"
},
"dependencies": {
"fs-extra": "^7.0.0",
Expand Down
3 changes: 2 additions & 1 deletion libraries/botframework-connector/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"nyc": "^11.4.1",
"should": "^13.2.3",
"source-map-support": "^0.5.3",
"ts-node": "^4.1.0"
"ts-node": "^4.1.0",
"typescript": "3.5.3"
},
"scripts": {
"build": "tsc",
Expand Down
3 changes: 2 additions & 1 deletion libraries/botframework-expressions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"@types/mocha": "^5.2.5",
"@types/node": "^10.12.18",
"nyc": "^11.4.1",
"ts-node": "^4.1.0"
"ts-node": "^4.1.0",
"typescript": "3.5.3"
},
"scripts": {
"build": "tsc",
Expand Down
7 changes: 4 additions & 3 deletions libraries/botframework-schema/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@
},
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
"dependencies": {},
"devDependencies": {},
"devDependencies": {
"typescript": "3.5.3"
},
"scripts": {
"build": "tsc",
"clean": "erase /q /s .\\lib",
"set-version": "npm version --allow-same-version ${Version}"
},
"files": [
"/lib",
"/src"
"/src"
]
}
3 changes: 2 additions & 1 deletion libraries/botframework-streaming/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"sinon": "^7.4.1",
"ts-node": "^4.1.0",
"tslint": "^5.16.0",
"tslint-microsoft-contrib": "^5.2.1"
"tslint-microsoft-contrib": "^5.2.1",
"typescript": "3.5.3"
},
"scripts": {
"test": "tsc && nyc mocha tests/",
Expand Down
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build-docs": "lerna run build-docs",
"eslint": "eslint ./libraries/*/src/*.ts ./libraries/*/src/**/*.ts",
"eslint-fix": "eslint ./libraries/*/src/*.ts ./libraries/*/src/**/*.ts --fix",
"set-dependency-versions": "node tools/util/updateDependenciesInPackageJsons.js ./libraries ^${Version} botframework-expressions botbuilder-lg botframework-streaming botbuilder botbuilder-choices botbuilder-dialogs botbuilder-core botbuilder-prompts botbuilder-testing botframework-connector botframework-config botframework-schema testbot && node tools/util/updateDependenciesInPackageJsons.js ./transcripts ^${Version} botframework-streaming botbuilder botbuilder-ai botbuilder-dialogs botbuilder-testing",
"set-dependency-versions": "node tools/util/updateDependenciesInPackageJsons.js ./libraries ${Version} botframework-expressions botbuilder-lg botframework-streaming botbuilder botbuilder-ai botbuilder-dialogs botbuilder-core botbuilder-applicationinsights botbuilder-testing botframework-connector botframework-config botframework-schema testbot && node tools/util/updateDependenciesInPackageJsons.js ./transcripts ${Version} botbuilder botbuilder-ai botbuilder-dialogs",
"update-versions": "lerna run set-version && npm run set-dependency-versions"
},
"dependencies": {
Expand All @@ -34,8 +34,7 @@
"sinon": "^7.3.2",
"typedoc": "^0.15.0",
"typedoc-plugin-external-module-name": "^2.1.0",
"typedoc-plugin-markdown": "^2.2.10",
"typescript": "^3.5.2"
"typedoc-plugin-markdown": "^2.2.10"
},
"nyc": {
"exclude": [
Expand Down
6 changes: 3 additions & 3 deletions transcripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"dependencies": {
"@types/node": "^10.12.18",
"@types/restify": "^7.2.1",
"botbuilder": "^4.2.1",
"botbuilder-ai": "^4.2.1",
"botbuilder-dialogs": "^4.2.1"
"botbuilder": "4.1.6",
"botbuilder-ai": "4.1.6",
"botbuilder-dialogs": "4.1.6"
},
"devDependencies": {
"mocha": "^5.2.0",
Expand Down