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

feature/env (#80)

Browse Source 
* fix(js-cli) resolve correct paths on `tauri init`

* feat(js-cli) inject src-tauri/ as lodash template

* fix(js-cli) entry paths

* feat(js-cli) rename APP_URL to devPath and allow .html values

* feat(js-cli) reload config when `tauri.conf.js` change detected

* feat(node): update to testing

* feat(template): fix phf, remove updater

* feat(samples): add vanillajs

* fix(templates): objectify tauri
Closes #99.

* fix(examples): update cargo.toml
 - to match signature

* chore(tauri): version update

* feat(workflows): fix dirs, add tokens

* fix(config): more robust env checking

* feat(fixture): start a testing fixture for tauri

* fix(workflow): use fixture for ENV

* fix(examples:vanilla): remove updater

* addition to previous commit re. fixture

* fix(config.rs): fix the unfix

* feat(js-cli) use the new cargo-tauri-cli

* chore(template) cleanup src-tauri/Cargo.toml

* chore(js-cli) toml features cleanup

* chore(js-cli) move edge to config > tauri

* fix(js-cli) appPaths resolve() instead of join()
This commit is contained in:
nothingismagick
2019-11-30 12:48:39 +01:00
committed by Lucas Fernandes Nogueira
parent 50ef912721
commit 6dcccf5a8e
69 changed files with 4964 additions and 2851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2626
cli/tauri-cli/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
cli/tauri-cli/Cargo.toml
View File

@@ -38,6 +38,9 @@ reqwest = "0.9.22"
hex = "0.4"
zip = "0.5"
[dev-dependencies]
tempfile = "3"
[[bin]]
name = "cargo-tauri-cli"
path = "src/main.rs"

6
cli/tauri-cli/src/main.rs
View File

@@ -73,13 +73,13 @@ fn run() -> crate::Result<()> {
.iter()
.map(PackageType::short_name)
.collect();
let m = App::new("cargo-tauri-bundle")
let m = App::new("cargo-tauri-cli")
.version(format!("v{}", crate_version!()).as_str())
.bin_name("cargo")
.setting(AppSettings::GlobalVersion)
.setting(AppSettings::SubcommandRequired)
.subcommand(
SubCommand::with_name("tauri-bundle")
SubCommand::with_name("tauri-cli")
.author("George Burton <burtonageo@gmail.com>, Lucas Fernandes Gonçalves Nogueira <lucas@quasar.dev>, Daniel Thompson-Yvetot <denjell@sfosc.org>")
.about("Bundle Rust executables into OS bundles")
.setting(AppSettings::DisableVersion)
@@ -131,7 +131,7 @@ fn run() -> crate::Result<()> {
)
.get_matches();
if let Some(m) = m.subcommand_matches("tauri-bundle") {
if let Some(m) = m.subcommand_matches("tauri-cli") {
if m.is_present("version") {
println!("{}", crate_version!());
} else {