Skip to content

Commit

Permalink
fix: merge qna settings from generated files in js runtime (microsoft…
Browse files Browse the repository at this point in the history
…#3981)

* nodejs runtime: merge settings from generated files

* update bl version in yarn.lock to solve CVE-2020-8244

* fix CVE-2020-8244

* Revert "fix CVE-2020-8244"

This reverts commit fd78a757a9d4bcf9f420685e0517eceb120a8f0c.

* Revert "update bl version in yarn.lock to solve CVE-2020-8244"

This reverts commit d3e135d83ee55006256db60717fc1b0d93326e07.

Co-authored-by: Zichuan Ma <zim@microsoft.com>
Co-authored-by: Lu Han <32191031+luhan2017@users.noreply.github.com>
  • Loading branch information
3 people committed Sep 7, 2020
1 parent 52cc9aa commit 90a0114
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions runtime/node/src/shared/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ export const getSettings = (projectRoot = getProjectRoot()): BotSettings => {
const generatedFiles = fs.readdirSync(generatedPath);
for (const file of generatedFiles) {
if (file.endsWith('.json')) {
const items = JSON.parse(fs.readFileSync(path.join(generatedPath, file), 'utf8'));
settings.luis = merge({}, settings.luis, items.luis); // merge luis settings
const generatedSettings = JSON.parse(fs.readFileSync(path.join(generatedPath, file), 'utf8'));
merge(settings, generatedSettings);
}
}
}
Expand Down

0 comments on commit 90a0114

Please sign in to comment.