From abfe7a28ca96a4655732ea9f4f6360fb1fe5af39 Mon Sep 17 00:00:00 2001 From: Steven Gum <14935595+stevengum@users.noreply.github.com> Date: Thu, 21 Nov 2019 12:53:04 -0800 Subject: [PATCH 1/3] [4.6.x] Pin TypeScript devDependency in each library. (Fixes #1436) (#1437) * move pinned typescript@3.5.2 devDependency into each package * pin transcripts/ botbuilder dependencies, fix import in Skype Middleware * bump to typescript@3.5.3 --- libraries/botbuilder-ai/package.json | 3 ++- libraries/botbuilder-applicationinsights/package.json | 3 ++- libraries/botbuilder-azure/package.json | 5 +++-- libraries/botbuilder-core/package.json | 1 + .../botbuilder-core/src/skypeMentionNormalizeMiddleware.ts | 4 +++- libraries/botbuilder-dialogs/package.json | 3 ++- libraries/botbuilder-testing/package.json | 1 + libraries/botbuilder/package.json | 1 + libraries/botframework-config/package.json | 3 ++- libraries/botframework-connector/package.json | 3 ++- libraries/botframework-schema/package.json | 7 ++++--- libraries/botframework-streaming/package.json | 3 ++- package.json | 3 +-- transcripts/package.json | 6 +++--- 14 files changed, 29 insertions(+), 17 deletions(-) diff --git a/libraries/botbuilder-ai/package.json b/libraries/botbuilder-ai/package.json index 83d3cf5bce..dabecca65f 100644 --- a/libraries/botbuilder-ai/package.json +++ b/libraries/botbuilder-ai/package.json @@ -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/", diff --git a/libraries/botbuilder-applicationinsights/package.json b/libraries/botbuilder-applicationinsights/package.json index 9b73683a6d..39f24c5c5b 100644 --- a/libraries/botbuilder-applicationinsights/package.json +++ b/libraries/botbuilder-applicationinsights/package.json @@ -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/", diff --git a/libraries/botbuilder-azure/package.json b/libraries/botbuilder-azure/package.json index 5eb875ccbc..8995d9b98b 100644 --- a/libraries/botbuilder-azure/package.json +++ b/libraries/botbuilder-azure/package.json @@ -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/", diff --git a/libraries/botbuilder-core/package.json b/libraries/botbuilder-core/package.json index 1c3d309349..200e646878 100644 --- a/libraries/botbuilder-core/package.json +++ b/libraries/botbuilder-core/package.json @@ -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": { diff --git a/libraries/botbuilder-core/src/skypeMentionNormalizeMiddleware.ts b/libraries/botbuilder-core/src/skypeMentionNormalizeMiddleware.ts index 770bd97526..48fd4c2e28 100644 --- a/libraries/botbuilder-core/src/skypeMentionNormalizeMiddleware.ts +++ b/libraries/botbuilder-core/src/skypeMentionNormalizeMiddleware.ts @@ -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'; /** diff --git a/libraries/botbuilder-dialogs/package.json b/libraries/botbuilder-dialogs/package.json index 5d575a6f23..29faa7e76d 100644 --- a/libraries/botbuilder-dialogs/package.json +++ b/libraries/botbuilder-dialogs/package.json @@ -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/", diff --git a/libraries/botbuilder-testing/package.json b/libraries/botbuilder-testing/package.json index 651c5a6a1a..cefa88c438 100644 --- a/libraries/botbuilder-testing/package.json +++ b/libraries/botbuilder-testing/package.json @@ -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" }, diff --git a/libraries/botbuilder/package.json b/libraries/botbuilder/package.json index 6262b2d440..9eb64a75d7 100644 --- a/libraries/botbuilder/package.json +++ b/libraries/botbuilder/package.json @@ -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": { diff --git a/libraries/botframework-config/package.json b/libraries/botframework-config/package.json index 3e3ec65b67..983b13ee4f 100644 --- a/libraries/botframework-config/package.json +++ b/libraries/botframework-config/package.json @@ -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", diff --git a/libraries/botframework-connector/package.json b/libraries/botframework-connector/package.json index 48868f5355..86e65e69b1 100644 --- a/libraries/botframework-connector/package.json +++ b/libraries/botframework-connector/package.json @@ -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", diff --git a/libraries/botframework-schema/package.json b/libraries/botframework-schema/package.json index 8921a9840f..e940ac81a6 100644 --- a/libraries/botframework-schema/package.json +++ b/libraries/botframework-schema/package.json @@ -19,8 +19,9 @@ }, "main": "./lib/index.js", "typings": "./lib/index.d.ts", - "dependencies": {}, - "devDependencies": {}, + "devDependencies": { + "typescript": "3.5.3" + }, "scripts": { "build": "tsc", "clean": "erase /q /s .\\lib", @@ -28,6 +29,6 @@ }, "files": [ "/lib", - "/src" + "/src" ] } diff --git a/libraries/botframework-streaming/package.json b/libraries/botframework-streaming/package.json index 803652f063..8be71b270b 100644 --- a/libraries/botframework-streaming/package.json +++ b/libraries/botframework-streaming/package.json @@ -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/", diff --git a/package.json b/package.json index f724b4752f..1eed278cc5 100644 --- a/package.json +++ b/package.json @@ -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": [ diff --git a/transcripts/package.json b/transcripts/package.json index 540633c258..8da5a16101 100644 --- a/transcripts/package.json +++ b/transcripts/package.json @@ -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", From f21644cf23e1f1147d9041983acbe4cdba07651c Mon Sep 17 00:00:00 2001 From: Steven Gum <14935595+stevengum@users.noreply.github.com> Date: Thu, 21 Nov 2019 14:43:06 -0800 Subject: [PATCH 2/3] [4.6.x] Fix set-dependency-versions script (#1438) * change set-dependency-versions script to use ~ not ^, update changed libs * use pinned versions for intra-dependencies per @cleemullins feedback --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1eed278cc5..7accfe9f92 100644 --- a/package.json +++ b/package.json @@ -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": { From 105f23dc9cac254a580c79eac2f227c620a7a92d Mon Sep 17 00:00:00 2001 From: stgum <14935595+stevengum@users.noreply.github.com> Date: Fri, 22 Nov 2019 13:43:57 -0800 Subject: [PATCH 3/3] add typescript@3.5.3 as devDependency to bb-lg & bf-expressions packages --- libraries/botbuilder-lg/package.json | 3 ++- libraries/botframework-expressions/package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-lg/package.json b/libraries/botbuilder-lg/package.json index db0a7bd6e9..ae88830f54 100644 --- a/libraries/botbuilder-lg/package.json +++ b/libraries/botbuilder-lg/package.json @@ -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", diff --git a/libraries/botframework-expressions/package.json b/libraries/botframework-expressions/package.json index 7b4146eee5..1276c84138 100644 --- a/libraries/botframework-expressions/package.json +++ b/libraries/botframework-expressions/package.json @@ -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",