Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: update bf-dialog to latest rc, adjust syntax #6849

Merged
benbrown merged 4 commits into from
Apr 12, 2021
Merged

fix: update bf-dialog to latest rc, adjust syntax #6849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac97b13
update bf-dialog to latest rc, adjust syntax
benbrown Apr 9, 2021
4a55dbc
Merge branch 'main' into benbrown/pkrc1
benbrown Apr 9, 2021
cfb4ff5
Merge branch 'main' into benbrown/pkrc1
benbrown Apr 12, 2021
86a1e1d
Merge branch 'main' into benbrown/pkrc1
benbrown Apr 12, 2021
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 Composer/packages/server-workers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "benbro@microsoft.com",
"license": "MIT",
"dependencies": {
"@microsoft/bf-dialog": "4.11.0-dev.20201025.69cf2b9",
"@microsoft/bf-dialog": "4.13.0-rc1",
"debug": "^4.3.1",
"yeoman-environment": "^2.10.3"
},
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/server-workers/src/workers/dialogMerge.worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const log = logger.extend('dialogMerge');

if (!isMainThread) {
const realMerge = new SchemaMerger(
[workerData.manifestFile, '!**/imported/**', '!**/generated/**'],
[workerData.manifestFile, `!${path.join(workerData.currentProjectDataDir, 'generated')}/**`],
path.join(workerData.currentProjectDataDir, 'schemas/sdk'),
path.join(workerData.currentProjectDataDir, 'dialogs/imported'),
false,
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@bfc/server-workers": "*",
"@bfc/shared": "*",
"@botframework-composer/types": "*",
"@microsoft/bf-dialog": "4.11.0-dev.20201025.69cf2b9",
"@microsoft/bf-dialog": "4.13.0-rc1",
"@microsoft/bf-dispatcher": "^4.11.0-beta.20201016.393c6b2",
"@microsoft/bf-generate-library": "^4.10.0-daily.20210317.224602",
"@microsoft/bf-lu": "4.14.0-dev.20210408.1a5070e",
Expand Down
26 changes: 17 additions & 9 deletions Composer/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3958,10 +3958,10 @@
resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==

"@microsoft/bf-cli-command@4.11.0-dev.20201025.69cf2b9":
version "4.11.0-dev.20201025.69cf2b9"
resolved "https://registry.yarnpkg.com/@microsoft/bf-cli-command/-/bf-cli-command-4.11.0-dev.20201025.69cf2b9.tgz#286b9dfef6483a55562baf4ebf7a0d99a43075e4"
integrity sha512-jhcpVBrFrFepevPZlP9iGJrUPh30E/L8yHr5wvX6jcSt/7RSVD+A7DIShDO+b8n45ii+8ZxVGqEGv7aN5ggp6g==
"@microsoft/bf-cli-command@4.13.0-rc1":
version "4.13.0-rc1"
resolved "https://registry.yarnpkg.com/@microsoft/bf-cli-command/-/bf-cli-command-4.13.0-rc1.tgz#7fb517c0fc6df91f8e09e991b9f8613d6f261ea6"
integrity sha512-eQGeTlThxuQ2+vKFjeAuOn8YHRuYnrHcteyBRIWJfT+D9QORkTYu8oo1lr6IT6IXh9pwf+ThK5zkbAnXrK62mQ==
dependencies:
"@oclif/command" "~1.5.19"
"@oclif/config" "~1.13.3"
Expand All @@ -3988,13 +3988,13 @@
fs-extra "^7.0.1"
tslib "^2.0.3"

"@microsoft/bf-dialog@4.11.0-dev.20201025.69cf2b9":
version "4.11.0-dev.20201025.69cf2b9"
resolved "https://registry.yarnpkg.com/@microsoft/bf-dialog/-/bf-dialog-4.11.0-dev.20201025.69cf2b9.tgz#7f33e2b4d52e355d1f5888b9d1f341ae32fe90c3"
integrity sha512-gzBRwKSEkHXgPN9bB5ttuEORRbK7o6Py+7P9JKYQjDrytt2C7ZSqKn7UtVm8/OBO8BDwu9EMONpfq2Ep3FPUtw==
"@microsoft/bf-dialog@4.13.0-rc1":
version "4.13.0-rc1"
resolved "https://registry.yarnpkg.com/@microsoft/bf-dialog/-/bf-dialog-4.13.0-rc1.tgz#323abfbff2e6c9040e70ba4a55e6c5b7d71a7f60"
integrity sha512-7huJdUg1XvgTCCCnvXt+YpNoVVLqUxdtxnPaNTf2Pl4iFx59w6U6hlod9+KGzz2qpv0oHCMjARr1WEcoL8zPHQ==
dependencies:
"@apidevtools/json-schema-ref-parser" "^9.0.1"
"@microsoft/bf-cli-command" "4.11.0-dev.20201025.69cf2b9"
"@microsoft/bf-cli-command" "4.13.0-rc1"
"@oclif/command" "~1.5.19"
"@oclif/config" "~1.13.3"
"@oclif/errors" "~1.2.2"
Expand All @@ -4012,6 +4012,7 @@
os "~0.1.1"
path "^0.12.7"
seedrandom "~3.0.5"
semver "^7.3.4"
tslib "^2.0.3"
xml2js "^0.4.19"

Expand Down Expand Up @@ -20623,6 +20624,13 @@ semver@^7.1.2, semver@^7.1.3:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==

semver@^7.3.4:
version "7.3.5"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
dependencies:
lru-cache "^6.0.0"

send@0.16.2:
version "0.16.2"
resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
Expand Down
2 changes: 1 addition & 1 deletion extensions/packageManager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@bfc/extension-client": "file:../../Composer/packages/extension-client",
"@bfc/ui-shared": "file:../../Composer/packages/lib/ui-shared",
"@emotion/core": "^10.0.35",
"@microsoft/bf-dialog": "4.13.0-dev.20210401.8dc6ffe",
"@microsoft/bf-dialog": "4.13.0-rc1",
"@uifabric/fluent-theme": "^7.1.4",
"axios": "^0.19.2",
"date-fns": "^2.16.1",
Expand Down
8 changes: 4 additions & 4 deletions extensions/packageManager/src/node/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
const manifestFile = runtime.identifyManifest(runtimePath, currentProject.name);

const dryrun = new SchemaMerger(
[manifestFile, '!**/imported/**', '!**/generated/**'],
[manifestFile, `!${path.join(currentProject.dir, 'generated')}/**`],
path.join(currentProject.dataDir, 'schemas/sdk'),
path.join(currentProject.dataDir, 'dialogs/imported'),
true, // copy only? true = dry run
Expand Down Expand Up @@ -335,7 +335,7 @@ export default async (composer: IExtensionRegistration): Promise<void> => {

// call do a dry run on the dialog merge
const dryrun = new SchemaMerger(
[manifestFile, '!**/imported/**', '!**/generated/**'],
[manifestFile, `!${path.join(currentProject.dir, 'generated')}/**`],
path.join(currentProject.dataDir, 'schemas/sdk'),
path.join(currentProject.dataDir, 'dialogs/imported'),
true, // copy only? true = dry run
Expand Down Expand Up @@ -363,7 +363,7 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
});
} else {
const realMerge = new SchemaMerger(
[manifestFile, '!**/imported/**', '!**/generated/**'],
[manifestFile, `!${path.join(currentProject.dir, 'generated')}/**`],
path.join(currentProject.dataDir, 'schemas/sdk'),
path.join(currentProject.dataDir, 'dialogs/imported'),
false, // copy only? true = dry run
Expand Down Expand Up @@ -468,7 +468,7 @@ export default async (composer: IExtensionRegistration): Promise<void> => {

// call do a dry run on the dialog merge
const merger = new SchemaMerger(
[manifestFile, '!**/imported/**', '!**/generated/**'],
[manifestFile, `!${path.join(currentProject.dir, 'generated')}/**`],
Copy link
Contributor

@a-b-r-o-w-n a-b-r-o-w-n Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like this could benefit from extracting a method.

path.join(currentProject.dataDir, 'schemas/sdk'),
path.join(currentProject.dataDir, 'dialogs/imported'),
false, // copy only? true = dry run
Expand Down
31 changes: 22 additions & 9 deletions extensions/packageManager/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
"@types/express" "^4.16.1"
"@types/passport" "^1.0.4"
axios "^0.21.1"
botframework-schema "^4.11.1"
express-serve-static-core "0.1.1"
json-schema "^0.2.5"

Expand Down Expand Up @@ -253,10 +254,10 @@
resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==

"@microsoft/bf-cli-command@4.13.0-dev.20210401.8dc6ffe":
version "4.13.0-dev.20210401.8dc6ffe"
resolved "https://registry.yarnpkg.com/@microsoft/bf-cli-command/-/bf-cli-command-4.13.0-dev.20210401.8dc6ffe.tgz#c391d6a4cda03063a74fff186c4b2ee247cb0afa"
integrity sha512-daGbfwXcBwNWkBAR23MsFags18eMNUCpH8BNfZKEv0El3bLifVhfbGILQhpsM0BFCzcgVyooLA6cnBAUPopZ0Q==
"@microsoft/bf-cli-command@4.13.0-rc1":
version "4.13.0-rc1"
resolved "https://registry.yarnpkg.com/@microsoft/bf-cli-command/-/bf-cli-command-4.13.0-rc1.tgz#7fb517c0fc6df91f8e09e991b9f8613d6f261ea6"
integrity sha512-eQGeTlThxuQ2+vKFjeAuOn8YHRuYnrHcteyBRIWJfT+D9QORkTYu8oo1lr6IT6IXh9pwf+ThK5zkbAnXrK62mQ==
dependencies:
"@oclif/command" "~1.5.19"
"@oclif/config" "~1.13.3"
Expand All @@ -268,13 +269,13 @@
fs-extra "^7.0.1"
tslib "^2.0.3"

"@microsoft/bf-dialog@4.13.0-dev.20210401.8dc6ffe":
version "4.13.0-dev.20210401.8dc6ffe"
resolved "https://registry.yarnpkg.com/@microsoft/bf-dialog/-/bf-dialog-4.13.0-dev.20210401.8dc6ffe.tgz#160ec22f79e1049e48e8e40e0eaf13206a29b267"
integrity sha512-zg4z3Svvq0KFhO8GEjdMPC5dNUjUSm/7lm0Qmq1rxFgVNQJscBpaOwV2e6dwnJJmKgq5sSUjQSIAdkzLKufMDw==
"@microsoft/bf-dialog@4.13.0-rc1":
version "4.13.0-rc1"
resolved "https://registry.yarnpkg.com/@microsoft/bf-dialog/-/bf-dialog-4.13.0-rc1.tgz#323abfbff2e6c9040e70ba4a55e6c5b7d71a7f60"
integrity sha512-7huJdUg1XvgTCCCnvXt+YpNoVVLqUxdtxnPaNTf2Pl4iFx59w6U6hlod9+KGzz2qpv0oHCMjARr1WEcoL8zPHQ==
dependencies:
"@apidevtools/json-schema-ref-parser" "^9.0.1"
"@microsoft/bf-cli-command" "4.13.0-dev.20210401.8dc6ffe"
"@microsoft/bf-cli-command" "4.13.0-rc1"
"@oclif/command" "~1.5.19"
"@oclif/config" "~1.13.3"
"@oclif/errors" "~1.2.2"
Expand Down Expand Up @@ -1106,6 +1107,18 @@ bn.js@^5.0.0, bn.js@^5.1.1:
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==

botbuilder-stdlib@4.12.0-internal:
version "4.12.0-internal"
resolved "https://registry.yarnpkg.com/botbuilder-stdlib/-/botbuilder-stdlib-4.12.0-internal.tgz#21540a6bef6e571dfd4ef16033083314df9871f0"
integrity sha512-AwtWOZlgTaQte+uBeDOAy83veksMOzKHR62k3UYgUeqgsUamtqi6+OGV633hLi49ZmF/Gs8dP4iid2jCLDEQBg==

botframework-schema@^4.11.1:
version "4.12.0"
resolved "https://registry.yarnpkg.com/botframework-schema/-/botframework-schema-4.12.0.tgz#42431b5949fb666087399fd555c21c0322099397"
integrity sha512-W0/0xvrxafRrusWfGsGiwK2X4FOoIL7obvitkS+3XZfwhr6XeDKLClkQMbaU0GCawVF6DtbiPKErHpPUhd2Oig==
dependencies:
botbuilder-stdlib "4.12.0-internal"

brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
Expand Down