diff --git a/.changes/fix-commands.md b/.changes/fix-commands.md new file mode 100644 index 0000000..4246495 --- /dev/null +++ b/.changes/fix-commands.md @@ -0,0 +1,5 @@ +--- +'tauri-vscode': patch +--- + +Fix dependency resolution and glob usage. Fixes "command not found" errors. diff --git a/package.json b/package.json index e45103f..980bf0d 100644 --- a/package.json +++ b/package.json @@ -114,5 +114,8 @@ "dependencies": { "glob": "8.0.3", "run-in-terminal": "^0.0.3" + }, + "resolutions": { + "brace-expansion": "^2.0.1" } } diff --git a/src/extension.ts b/src/extension.ts index 0a116eb..c5c5f58 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -143,7 +143,7 @@ function __getNpmProjectsPaths(): string[] { const paths = []; for (const folder of folders) { - const npmProjectRoots: string[] = glob.sync(folder.uri.fsPath + '/**/package.json') + const npmProjectRoots: string[] = glob.sync(folder.uri.fsPath.split('\\').join('/') + '/**/package.json') .map((p: string) => path.dirname(p)); paths.push(...npmProjectRoots.filter(p => !p.includes('node_modules'))); } @@ -163,7 +163,7 @@ function __getTauriProjectsPaths(): string[] { const paths = []; for (const folder of folders) { - const tauriProjectRoots: string[] = glob.sync(folder.uri.fsPath + '/**/src-tauri') + const tauriProjectRoots: string[] = glob.sync(folder.uri.fsPath.split('\\').join('/') + '/**/src-tauri') .map((p: string) => path.dirname(p)); paths.push(...tauriProjectRoots.filter(p => !p.includes('node_modules'))); } diff --git a/yarn.lock b/yarn.lock index 6abf8ec..65fd2d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -291,15 +291,7 @@ bluebird@~3.4.1: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" integrity sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA== -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: +brace-expansion@^1.1.7, brace-expansion@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== @@ -389,11 +381,6 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"