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

fix error file name 'tauri.conf.js' to 'tauri.conf.json' (#434)

Browse Source 
* fix error file name 'tauri.conf.js' to 'tauri.conf.json'

* fix(tauri.js) if the DOM is already loaded, listen for <a> clicks (#436)

code is fine, the CI is borked

* fix(open) open <a> on browser only if target=_blank (#437)

merging because CI is borked

* fix(tauri): make github action envs absolute for extra path level in runner.rs (#438)

* fix(tauri): extra path level in runner.rs

This file is one folder deeper than the other files which reference this env. This env is a relative folder reference so we need to concat an extra folder traversal into it.

* Revert "fix(tauri): extra path level in runner.rs"

This reverts commit eb1034b4f3.

* make envs in GH Actions absolute for now

* runner is only available within steps

* feat(bundler) add exception_domain option by nothingismagick (#439)

* chore(deps) Update Tauri JS CLI (#421)

Co-authored-by: WhiteSource Renovate <renovatebot@gmail.com>

Co-authored-by: Lucas Fernandes Nogueira <lucas@tauri.studio>
Co-authored-by: Jacob Bolda <me@jacobbolda.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: WhiteSource Renovate <renovatebot@gmail.com>
Co-authored-by: nothingismagick <denjell@sfosc.org>
This commit is contained in:
Shihpin Tseng 2020-02-21 22:31:05 +08:00 committed by GitHub
parent a2da82e8f2
commit c15a6d5649
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/tauri.js/src/runner.ts
View File

@ -79,7 +79,7 @@ class Runner {
path.join(tauriDir, 'src'),
path.join(tauriDir, 'Cargo.toml'),
path.join(tauriDir, 'build.rs'),
path.join(appDir, 'tauri.conf.js')
path.join(appDir, 'tauri.conf.json')
],
{
ignoreInitial: true
@ -90,7 +90,7 @@ class Runner {
debounce((path: string) => {
this.__stopCargo()
.then(() => {
if (path.includes('tauri.conf.js')) {
if (path.includes('tauri.conf.json')) {
this.run(getTauriConfig({ ctx: cfg.ctx })).catch(e => {
throw e
})