CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-11 10:43:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(tauri.js): init command properly building with manifests (#1374)

Browse Source 
* fix(tauri.js): init command properly building with manifests

* fix: tests
This commit is contained in:
Lucas Fernandes Nogueira
2021-03-22 21:05:37 -03:00
committed by GitHub
parent af24034405
commit 2afb3f8ad5
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cli/tauri.js/src/template/index.ts
View File

@@ -84,20 +84,21 @@ Run \`tauri init --force template\` to overwrite.`)
return resolvedPath.replace(/\\/g, '/')
}
const resolveCurrentTauriVersion = (crate: string): string => {
const manifestPath = `../../../../${crate}/Cargo.toml`
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-member-access, security/detect-non-literal-require
const tauriManifest = require(manifestPath) as CargoManifest
const version = tauriManifest.package.version
const resolveCurrentTauriVersion = (manifest: CargoManifest): string => {
const version = manifest.package.version
return version.substring(0, version.lastIndexOf('.'))
}
// eslint-disable-next-line @typescript-eslint/no-var-requires
const tauriManifest = require('../../../../tauri/Cargo.toml') as CargoManifest
// eslint-disable-next-line @typescript-eslint/no-var-requires
const tauriBuildManifest = require('../../../../core/tauri-build/Cargo.toml') as CargoManifest
const tauriDep = tauriPath
? `{ path = "${resolveTauriPath(tauriPath, 'tauri')}" }`
: `{ version = "${resolveCurrentTauriVersion('tauri')}" }`
: `{ version = "${resolveCurrentTauriVersion(tauriManifest)}" }`
const tauriBuildDep = tauriPath
? `{ path = "${resolveTauriPath(tauriPath, 'core/tauri-build')}" }`
: `{ version = "${resolveCurrentTauriVersion('core/tauri-build')}" }`
: `{ version = "${resolveCurrentTauriVersion(tauriBuildManifest)}" }`
removeSync(dir)
copyTemplates({