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: inline editing LU mess up whole file #3478

Merged
merged 7 commits into from
Jun 29, 2020
Merged

fix: inline editing LU mess up whole file #3478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e322a92
upgrade lu packages
zhixzhan Jun 24, 2020
7e20c51
Merge branch 'master' into luparse-fix
zhixzhan Jun 28, 2020
ab8d8c5
update package
zhixzhan Jun 28, 2020
d5ce4bf
clean
zhixzhan Jun 28, 2020
e592a67
update
zhixzhan Jun 28, 2020
069937a
clean up
zhixzhan Jun 28, 2020
8a5b6ac
Merge branch 'master' into luparse-fix
a-b-r-o-w-n Jun 29, 2020
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
4 changes: 2 additions & 2 deletions Composer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"build:plugins": "yarn build:plugins:localpublish && yarn build:plugins:samples && yarn build:plugins:azurePublish && yarn build:plugins:azureFunctionsPublish",
"build:plugins:localpublish": "cd plugins/localPublish && yarn install && yarn build",
"build:plugins:samples": "cd plugins/samples && yarn install && yarn build",
"build:plugins:azurePublish": "cd plugins/azurePublish && rimraf yarn.lock && yarn install && yarn build",
"build:plugins:azureFunctionsPublish": "cd plugins/azureFunctionsPublish && rimraf yarn.lock && yarn install && yarn build",
"build:plugins:azurePublish": "cd plugins/azurePublish && yarn install && yarn build",
"build:plugins:azureFunctionsPublish": "cd plugins/azureFunctionsPublish && yarn install && yarn build",
"start": "cross-env NODE_ENV=production PORT=3000 yarn start:server",
"startall": "yarn start",
"start:dev": "concurrently \"npm:start:client\" \"npm:start:server:dev\"",
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
},
"proxy": "http://localhost:5000",
"dependencies": {
"@bfc/adaptive-flow": "*",
"@bfc/adaptive-form": "*",
"@bfc/code-editor": "*",
"@bfc/extension": "*",
Expand All @@ -29,9 +30,8 @@
"@bfc/ui-plugin-prompts": "*",
"@bfc/ui-plugin-select-dialog": "*",
"@bfc/ui-plugin-select-skill-dialog": "*",
"@bfc/adaptive-flow": "*",
"@emotion/core": "^10.0.7",
"@microsoft/bf-lu": "4.9.1",
"@microsoft/bf-lu": "^4.10.0-preview.141651",
"@reach/router": "^1.2.1",
"@uifabric/fluent-theme": "^7.1.13",
"@uifabric/icons": "^7.3.4",
Expand Down
6 changes: 3 additions & 3 deletions Composer/packages/lib/bot-deploy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"@azure/graph": "^5.0.1",
"@azure/ms-rest-browserauth": "^0.1.4",
"@azure/ms-rest-nodeauth": "^3.0.3",
"@microsoft/bf-lu": "4.9.1",
"@microsoft/bf-luis-cli": "4.9.1",
"@microsoft/bf-lu": "^4.10.0-preview.141651",
"@microsoft/bf-luis-cli": "^4.10.0-preview.141651",
"@types/archiver": "^3.1.0",
"@types/fs-extra": "^8.1.0",
"@types/request": "^2.48.4",
Expand All @@ -31,4 +31,4 @@
"request": "^2.88.2",
"request-promise": "^4.2.5"
}
}
}
2 changes: 1 addition & 1 deletion Composer/packages/lib/indexers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"dependencies": {
"@bfc/shared": "*",
"@microsoft/bf-lu": "4.9.1",
"@microsoft/bf-lu": "^4.10.0-preview.141651",
"adaptive-expressions": "4.10.0-preview-135858",
"botbuilder-lg": "4.10.0-preview-135858",
"lodash": "^4.17.15"
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"@bfc/lu-languageserver": "*",
"@bfc/plugin-loader": "*",
"@bfc/shared": "*",
"@microsoft/bf-dispatcher": "4.9.1",
"@microsoft/bf-lu": "4.9.1",
"@microsoft/bf-dispatcher": "^4.10.0-preview.141651",
"@microsoft/bf-lu": "^4.10.0-preview.141651",
"archiver": "^3.0.0",
"axios": "^0.19.2",
"azure-storage": "^2.10.3",
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/tools/language-servers/language-understanding/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"start:server": "cd demo && ts-node ./src/server.ts"
},
"dependencies": {
"@microsoft/bf-cli-command": "4.9.1",
"@microsoft/bf-lu": "4.9.1",
"@microsoft/bf-cli-command": "^4.10.0-preview.141651",
"@microsoft/bf-lu": "^4.10.0-preview.141651",
"express": "^4.15.2",
"monaco-languageclient": "^0.10.0",
"normalize-url": "^2.0.1",
Expand Down
1,161 changes: 581 additions & 580 deletions Composer/plugins/azureFunctionsPublish/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

856 changes: 428 additions & 428 deletions Composer/plugins/azurePublish/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 29 additions & 28 deletions Composer/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2873,10 +2873,10 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"

"@microsoft/bf-cli-command@4.9.1":
version "4.9.1"
resolved "https://registry.yarnpkg.com/@microsoft/bf-cli-command/-/bf-cli-command-4.9.1.tgz#708976bb9e882a40a2d64c6dff3df5eb9a1264a8"
integrity sha512-zylOEeybbOrNGLUit0U9eak4IxTCzsBEp3ovvYpRiJ6uL7ADGi6rELwSEaEmbaAezYU0qnaUkcqPXWjwYvCTpw==
"@microsoft/bf-cli-command@4.10.0-preview.141651", "@microsoft/bf-cli-command@^4.10.0-preview.141651":
version "4.10.0-preview.141651"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-cli-command/-/@microsoft/bf-cli-command-4.10.0-preview.141651.tgz#680875f716285fb8658da8098a0ee524b07c5765"
integrity sha1-aAh19xYoX7hljagJig7lJLB8V2U=
dependencies:
"@oclif/command" "~1.5.19"
"@oclif/config" "~1.13.3"
Expand All @@ -2888,20 +2888,21 @@
fs-extra "^7.0.1"
tslib "~1.10.0"

"@microsoft/bf-dispatcher@4.9.1":
version "4.9.1"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-dispatcher/-/@microsoft/bf-dispatcher-4.9.1#45766580e1bc34bfb60aeefdc96142e9415fe817"
"@microsoft/bf-dispatcher@^4.10.0-preview.141651":
version "4.10.0-preview.141651"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-dispatcher/-/@microsoft/bf-dispatcher-4.10.0-preview.141651.tgz#d943197c42e15894a55eadf4c5e3d85d9bbccfd7"
integrity sha1-2UMZfELhWJSlXq30xePYXZu8z9c=
dependencies:
"@microsoft/bf-lu" "4.9.1"
"@microsoft/bf-lu" "4.10.0-preview.141651"
"@oclif/command" "~1.5.19"
"@oclif/config" "~1.13.3"
argparse "~1.0.10"
tslib "^1.10.0"

"@microsoft/bf-lu@4.9.1":
version "4.9.1"
resolved "https://registry.yarnpkg.com/@microsoft/bf-lu/-/bf-lu-4.9.1.tgz#06e85e85cbd3fad508473d24e07b8f9d05fa2b11"
integrity sha512-ge39GhTNRQB4LSuT71txRO+R7VKMAHHF2vDNi8Mkcr+8boDXLGagWl3gUB57SjcQTPCXCe1iVEAirYAgMXNFUA==
"@microsoft/bf-lu@4.10.0-preview.141651", "@microsoft/bf-lu@^4.10.0-preview.141651":
version "4.10.0-preview.141651"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-lu/-/@microsoft/bf-lu-4.10.0-preview.141651.tgz#29ed2af803d23ee760354913f5b814873bc1285c"
integrity sha1-Ke0q+APSPudgNUkT9bgUhzvBKFw=
dependencies:
"@azure/cognitiveservices-luis-authoring" "4.0.0-preview.1"
"@azure/ms-rest-azure-js" "2.0.1"
Expand All @@ -2922,16 +2923,16 @@
semver "^5.5.1"
tslib "^1.10.0"

"@microsoft/bf-luis-cli@4.9.1":
version "4.9.1"
resolved "https://registry.yarnpkg.com/@microsoft/bf-luis-cli/-/bf-luis-cli-4.9.1.tgz#8c6ab2c089ef03aad83d0ec8b04dfe0cc30aaf99"
integrity sha512-yahftpxlly40k5Td2i5mfHpAOuA1+kOsvX4/J3B4pDTcV/cCHaW18W14tKLOZCWSG9EOlMkCclYqeWjmJCvnXQ==
"@microsoft/bf-luis-cli@^4.10.0-preview.141651":
version "4.10.0-preview.141651"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-luis-cli/-/@microsoft/bf-luis-cli-4.10.0-preview.141651.tgz#29ef283f23d9b59841faff4872cb6900b91ec2e8"
integrity sha1-Ke8oPyPZtZhB+v9IcstpALkewug=
dependencies:
"@azure/cognitiveservices-luis-authoring" "4.0.0-preview.1"
"@azure/cognitiveservices-luis-runtime" "5.0.0"
"@azure/ms-rest-azure-js" "2.0.1"
"@microsoft/bf-cli-command" "4.9.1"
"@microsoft/bf-lu" "4.9.1"
"@microsoft/bf-cli-command" "4.10.0-preview.141651"
"@microsoft/bf-lu" "4.10.0-preview.141651"
"@oclif/command" "~1.5.19"
"@oclif/config" "~1.13.3"
"@oclif/errors" "~1.2.2"
Expand Down Expand Up @@ -8456,8 +8457,8 @@ elegant-spinner@^1.0.1:

elliptic@^6.0.0, elliptic@^6.5.3:
version "6.5.3"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
integrity sha1-y1nrLv2vc6C9eMzXAVpirW4Pk9Y=
dependencies:
bn.js "^4.4.0"
brorand "^1.0.1"
Expand Down Expand Up @@ -12152,8 +12153,8 @@ killable@^1.0.1:

kind-of@^2.0.1, kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
version "6.0.3"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=

kleur@^3.0.2:
version "3.0.2"
Expand Down Expand Up @@ -12577,8 +12578,8 @@ lodash.uniq@^4.5.0:

lodash@4.17.15, "lodash@>=3.5 <5", lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=

log-driver@^1.2.7:
version "1.2.7"
Expand Down Expand Up @@ -13098,8 +13099,8 @@ mixin-object@^2.0.1:

mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.2, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1:
version "0.5.5"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
integrity sha1-2Rzv1i0UNsoPQWIOJRKI1CAJne8=
dependencies:
minimist "^1.2.5"

Expand Down Expand Up @@ -16520,8 +16521,8 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:

set-value@^0.4.3, set-value@^2.0.0, set-value@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90"
integrity sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90"
integrity sha1-dOjs0CPDPQ93GZ1BVAmkDyHmG5A=
dependencies:
is-plain-object "^2.0.4"

Expand Down