This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 67516904c8c35d263979c69c8e0dc844641171d0 Author: Marat Gubaidullin <marat.gubaidul...@gmail.com> AuthorDate: Thu Sep 1 14:51:38 2022 -0400 Fixed issue with reading custom kamelets in folder contains .git --- karavan-vscode/package-lock.json | 4 ++-- karavan-vscode/src/jbang.ts | 2 +- karavan-vscode/src/utils.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/karavan-vscode/package-lock.json b/karavan-vscode/package-lock.json index e944e5d..786eaf0 100644 --- a/karavan-vscode/package-lock.json +++ b/karavan-vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan", - "version": "3.18.0", + "version": "3.18.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "karavan", - "version": "3.18.0", + "version": "3.18.3", "license": "Apache-2.0", "dependencies": { "@patternfly/patternfly": "4.194.4", diff --git a/karavan-vscode/src/jbang.ts b/karavan-vscode/src/jbang.ts index 6ead790..612e583 100644 --- a/karavan-vscode/src/jbang.ts +++ b/karavan-vscode/src/jbang.ts @@ -82,7 +82,7 @@ export function camelJbangRun(filename?: string) { const dev: boolean = workspace.getConfiguration().get("camel.dev") || false; const cmd = (filename ? "run " + filename : "run * ") + (maxMessages > -1 ? " --max-messages=" + maxMessages : "") - + (kameletsPath && kameletsPath.trim().length >0 ? " --local-kamelet-dir=" + kameletsPath : ""); + + (kameletsPath && kameletsPath.trim().length > 0 ? " --local-kamelet-dir=" + kameletsPath : ""); const command = prepareCommand(cmd) + (dev === true ? " --dev" : ""); const terminalId = "run_" + filename; const existTerminal = TERMINALS.get(terminalId); diff --git a/karavan-vscode/src/utils.ts b/karavan-vscode/src/utils.ts index 2efd50b..8e15349 100644 --- a/karavan-vscode/src/utils.ts +++ b/karavan-vscode/src/utils.ts @@ -61,7 +61,7 @@ async function readFilesInDirByExtension(dir: string, extension: string) { const dirs: [string, FileType][] = await readDirectory(dir); for (let d in dirs) { const filename = dirs[d][0]; - if (filename.endsWith(extension)){ + if (filename !== undefined && filename.endsWith(extension)){ const file = await readFile(dir + "/" + filename); const code = Buffer.from(file).toString('utf8'); result.push(code);