tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-11-11 05:57:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: getNpmLatestVersion, getNpmPackageVersion without npm (#1088)

Browse Source 
Co-authored-by: Lucas Fernandes Nogueira <lucas@tauri.studio>
This commit is contained in:
Christian W. Zuckschwerdt 2020-12-05 03:00:15 +01:00 committed by GitHub
parent 8388553670
commit 4a74bca390
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/updater-issue-without-npm Normal file
View File

@ -0,0 +1,5 @@
---
"tauri.js": patch
---
Fixes an issue with the dependency updater when NPM isn't installed.

18
cli/tauri.js/src/api/dependency-manager/util.ts
View File

@ -23,7 +23,12 @@ async function getCrateLatestVersion(crateName: string): Promise<string> {
} }
function getNpmLatestVersion(packageName: string): string { function getNpmLatestVersion(packageName: string): string {
const child = crossSpawnSync('npm', ['show', packageName, 'version'], { const usesYarn = existsSync(appResolve.app('yarn.lock'))
const cmd = usesYarn ? 'yarn' : 'npm'
const args = usesYarn
? ['--silent', 'info', packageName, 'version']
: ['show', packageName, 'version']
const child = crossSpawnSync(cmd, args, {
cwd: appDir cwd: appDir
}) })
return String(child.output[1]).replace('\n', '') return String(child.output[1]).replace('\n', '')
@ -32,12 +37,13 @@ function getNpmLatestVersion(packageName: string): string {
async function getNpmPackageVersion( async function getNpmPackageVersion(
packageName: string packageName: string
): Promise<string | null> { ): Promise<string | null> {
const usesYarn = existsSync(appResolve.app('yarn.lock'))
const cmd = usesYarn ? 'yarn' : 'npm'
const args = usesYarn
? ['--silent', 'list', packageName, 'version', '--depth', '0']
: ['list', packageName, 'version', '--depth', '0']
return await new Promise((resolve) => { return await new Promise((resolve) => {
const child = crossSpawnSync( const child = crossSpawnSync(cmd, args, { cwd: appDir })
'npm',
['list', packageName, 'version', '--depth', '0'],
{ cwd: appDir }
)
const output = String(child.output[1]) const output = String(child.output[1])
// eslint-disable-next-line security/detect-non-literal-regexp // eslint-disable-next-line security/detect-non-literal-regexp
const matches = new RegExp(packageName + '@(\\S+)', 'g').exec(output) const matches = new RegExp(packageName + '@(\\S+)', 'g').exec(output)