diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json index f3601c5ac8..b57fcf527c 100644 --- a/Composer/packages/server/package.json +++ b/Composer/packages/server/package.json @@ -48,6 +48,12 @@ "@types/jest": "^24.0.9", "@types/jsonwebtoken": "^8.3.3", "@types/lodash": "^4.14.123", + "@types/lodash.find": "^4.6.6", + "@types/lodash.get": "^4.4.6", + "@types/lodash.has": "^4.5.6", + "@types/lodash.isequal": "^4.5.5", + "@types/lodash.merge": "^4.6.6", + "@types/lodash.uniq": "^4.5.6", "@types/mock-fs": "^3.6.30", "@types/morgan": "^1.7.35", "@types/node": "^11.9.6", @@ -85,6 +91,12 @@ "jsonwebtoken": "^8.5.1", "jwks-rsa": "^1.6.0", "lodash": "^4.17.11", + "lodash.find": "^4.6.0", + "lodash.get": "^4.4.2", + "lodash.has": "^4.5.2", + "lodash.isequal": "^4.5.0", + "lodash.merge": "^4.6.2", + "lodash.uniq": "^4.5.0", "lubuild": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lubuild/-/1.0.3-preview.tgz", "ludown": "^1.3.3", "luis-apis": "2.5.1", diff --git a/Composer/packages/server/src/models/asset/assetManager.ts b/Composer/packages/server/src/models/asset/assetManager.ts index 5b982df80e..487f512bf9 100644 --- a/Composer/packages/server/src/models/asset/assetManager.ts +++ b/Composer/packages/server/src/models/asset/assetManager.ts @@ -1,4 +1,4 @@ -import { find } from 'lodash'; +import find from 'lodash.find'; import { LocalDiskStorage } from '../storage/localDiskStorage'; import { LocationRef } from '../bot/interface'; diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts index 9cc3b1faaf..9d9da69236 100644 --- a/Composer/packages/server/src/models/bot/botProject.ts +++ b/Composer/packages/server/src/models/bot/botProject.ts @@ -1,6 +1,6 @@ import fs from 'fs'; -import { isEqual } from 'lodash'; +import isEqual from 'lodash.isequal'; import { Path } from '../../utility/path'; import { copyDir } from '../../utility/storage'; diff --git a/Composer/packages/server/src/models/bot/dialogChecker.ts b/Composer/packages/server/src/models/bot/dialogChecker.ts index a5bc0e31c7..f0bd662c5c 100644 --- a/Composer/packages/server/src/models/bot/dialogChecker.ts +++ b/Composer/packages/server/src/models/bot/dialogChecker.ts @@ -1,4 +1,4 @@ -import { get } from 'lodash'; +import get from 'lodash.get'; import { ExpressionEngine } from 'botbuilder-expression-parser'; const ExpressionParser = new ExpressionEngine(); diff --git a/Composer/packages/server/src/models/bot/indexers/dialogIndexers.ts b/Composer/packages/server/src/models/bot/indexers/dialogIndexers.ts index 329ff18d4a..a061aa0820 100644 --- a/Composer/packages/server/src/models/bot/indexers/dialogIndexers.ts +++ b/Composer/packages/server/src/models/bot/indexers/dialogIndexers.ts @@ -1,4 +1,5 @@ -import { has, uniq } from 'lodash'; +import has from 'lodash.has'; +import uniq from 'lodash.uniq'; import { JsonWalk, VisitorFunc } from '../../../utility/jsonWalk'; import { DialogChecker } from '../dialogChecker'; diff --git a/Composer/packages/server/src/models/bot/luPublisher.ts b/Composer/packages/server/src/models/bot/luPublisher.ts index 15132273f9..0a0b0752a4 100644 --- a/Composer/packages/server/src/models/bot/luPublisher.ts +++ b/Composer/packages/server/src/models/bot/luPublisher.ts @@ -1,4 +1,4 @@ -import { isEqual } from 'lodash'; +import isEqual from 'lodash.isequal'; import { runBuild } from 'lubuild'; import { Path } from './../../utility/path'; diff --git a/Composer/packages/server/src/settings/settings.ts b/Composer/packages/server/src/settings/settings.ts index 109a47cc51..168065dba5 100644 --- a/Composer/packages/server/src/settings/settings.ts +++ b/Composer/packages/server/src/settings/settings.ts @@ -1,4 +1,4 @@ -import { merge } from 'lodash'; +import merge from 'lodash.merge'; import settings from './settings.json'; diff --git a/Composer/yarn.lock b/Composer/yarn.lock index f974bbd9d7..5d66c5ad36 100644 --- a/Composer/yarn.lock +++ b/Composer/yarn.lock @@ -2260,24 +2260,38 @@ dependencies: "@types/lodash" "*" +"@types/lodash.find@^4.6.6": + version "4.6.6" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/lodash.find/-/@types/lodash.find-4.6.6.tgz#9b298092ff15642ddf0c6b04d9e0a2f3c49ac845" + integrity sha1-mymAkv8VZC3fDGsE2eCi88SayEU= + dependencies: + "@types/lodash" "*" + "@types/lodash.get@^4.4.6": version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/lodash.get/-/lodash.get-4.4.6.tgz#0c7ac56243dae0f9f09ab6f75b29471e2e777240" - integrity sha512-E6zzjR3GtNig8UJG/yodBeJeIOtgPkMgsLjDU3CbgCAPC++vJ0eCMnJhVpRZb/ENqEFlov1+3K9TKtY4UdWKtQ== + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/lodash.get/-/@types/lodash.get-4.4.6.tgz#0c7ac56243dae0f9f09ab6f75b29471e2e777240" + integrity sha1-DHrFYkPa4Pnwmrb3WylHHi53ckA= + dependencies: + "@types/lodash" "*" + +"@types/lodash.has@^4.5.6": + version "4.5.6" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/lodash.has/-/@types/lodash.has-4.5.6.tgz#d94d3f0b45ced2ae76d632080daf70e9b76e29eb" + integrity sha1-2U0/C0XO0q521jIIDa9w6bduKes= dependencies: "@types/lodash" "*" "@types/lodash.isequal@^4.5.5": version "4.5.5" - resolved "https://registry.yarnpkg.com/@types/lodash.isequal/-/lodash.isequal-4.5.5.tgz#4fed1b1b00bef79e305de0352d797e9bb816c8ff" - integrity sha512-4IKbinG7MGP131wRfceK6W4E/Qt3qssEFLF30LnJbjYiSfHGGRU/Io8YxXrZX109ir+iDETC8hw8QsDijukUVg== + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/lodash.isequal/-/@types/lodash.isequal-4.5.5.tgz#4fed1b1b00bef79e305de0352d797e9bb816c8ff" + integrity sha1-T+0bGwC+954wXeA1LXl+m7gWyP8= dependencies: "@types/lodash" "*" "@types/lodash.merge@^4.6.6": version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.merge/-/lodash.merge-4.6.6.tgz#b84b403c1d31bc42d51772d1cd5557fa008cd3d6" - integrity sha512-IB90krzMf7YpfgP3u/EvZEdXVvm4e3gJbUvh5ieuI+o+XqiNEt6fCzqNRaiLlPVScLI59RxIGZMQ3+Ko/DJ8vQ== + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/lodash.merge/-/@types/lodash.merge-4.6.6.tgz#b84b403c1d31bc42d51772d1cd5557fa008cd3d6" + integrity sha1-uEtAPB0xvELVF3LRzVVX+gCM09Y= dependencies: "@types/lodash" "*" @@ -2316,6 +2330,13 @@ dependencies: "@types/lodash" "*" +"@types/lodash.uniq@^4.5.6": + version "4.5.6" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/lodash.uniq/-/@types/lodash.uniq-4.5.6.tgz#adb052f6c7eeb38b920c13166e7a972dd960b4c5" + integrity sha1-rbBS9sfus4uSDBMWbnqXLdlgtMU= + dependencies: + "@types/lodash" "*" + "@types/lodash@*", "@types/lodash@^4.14.123": version "4.14.123" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d" @@ -2397,7 +2418,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@16.9.0", "@types/react@^16.9.2": +"@types/react@*", "@types/react@16.9.0": version "16.9.0" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.0.tgz#27434f16d889a335eb4626d1f1e67eda54039e5b" integrity sha512-eOct1hyZI9YZf/eqNlYu7jxA9qyTw1EGXruAJhHhBDBpc00W0C1vwlnh+hkOf7UFZkNK+UxnFBpwAZe3d7XJhQ== @@ -2405,6 +2426,14 @@ "@types/prop-types" "*" csstype "^2.2.0" +"@types/react@^16.9.2": + version "16.9.9" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/react/-/@types/react-16.9.9.tgz#a62c6f40f04bc7681be5e20975503a64fe783c3a" + integrity sha1-pixvQPBLx2gb5eIJdVA6ZP54PDo= + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + "@types/rimraf@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e" @@ -12525,7 +12554,7 @@ lodash.difference@^4.5.0: lodash.find@^4.6.0: version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E= lodash.findindex@^4.6.0: @@ -12545,9 +12574,14 @@ lodash.flatten@^4.4.0: lodash.get@^4.4.2: version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lodash.has@^4.5.2: + version "4.5.2" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" + integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI= + lodash.includes@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" @@ -12570,7 +12604,7 @@ lodash.isboolean@^3.0.3: lodash.isequal@^4.5.0: version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= lodash.isinteger@^4.0.4: @@ -12609,8 +12643,8 @@ lodash.memoize@^4.1.2: lodash.merge@^4.6.2: version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha1-VYqlO0O2YeGSWgr9+japoQhf5Xo= lodash.omit@^4.5.0: version "4.5.0" @@ -12693,7 +12727,7 @@ lodash.union@^4.6.0: lodash.uniq@^4.5.0: version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= lodash@4.17.11, lodash@>=2.4.0, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1: