Skip to content

Commit

Permalink
updated configs, updated SemVer to 0.0.1, removed redundant comments …
Browse files Browse the repository at this point in the history
…from main.rs
  • Loading branch information
Piyuuussshhh committed Sep 19, 2024
1 parent 6304700 commit a73b2bd
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 28 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/test_build_on_push_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ name: "test-build-on-push-and-pr"

on:
push:
branches-ignore:
- 'main'
pull_request:
branches-ignore:
- 'main'
branches:
- '**' # This makes the workflow run on pushes to any branch.

Expand Down Expand Up @@ -57,4 +52,4 @@ jobs:
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
args: ${{ matrix.args }}
args: ${{ matrix.args }}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "habtrack",
"private": true,
"version": "0.0.0",
"version": "0.0.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
3 changes: 1 addition & 2 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "habtrack"
version = "0.0.0"
version = "0.0.1"
description = "A Tauri App"
authors = ["you"]
edition = "2021"
Expand All @@ -15,7 +15,6 @@ tauri = { version = "1", features = ["shell-open", "dialog"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
rusqlite = "0.31.0"
lazy_static = "1.4.0"
chrono = { version = "0.4.38", features = ["serde"] }
headless_chrome = "1.0.10"

Expand Down
7 changes: 1 addition & 6 deletions src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,9 @@
// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command

use std::sync::{Arc, Mutex};

use habtrack::{db::init, db::todos, window, export};
use tauri::Manager;

// Start work on database.
// TODO: Once done, merge with main, and pull changes into FEATURE-add-delete-task.


use habtrack::{db::init, db::todos, export, window};

fn main() {
tauri::Builder::default()
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"distDir": "../dist"
},
"package": {
"productName": "habtrack",
"version": "0.0.0"
"productName": "HabTrack",
"version": "0.0.1"
},
"tauri": {
"allowlist": {
Expand Down
33 changes: 24 additions & 9 deletions vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,7 @@ import { resolve } from "path";
// https://vitejs.dev/config/
export default defineConfig(async () => ({
plugins: [react()],

build: {
rollupOptions: {
input: {
main: resolve(__dirname, "index.html"),
tomorrow: resolve(__dirname, "src/views/TasksView/Tomorrow/index.html"),
},
},
},
base: "./",

// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
//
Expand All @@ -28,4 +20,27 @@ export default defineConfig(async () => ({
ignored: ["**/src-tauri/**"],
},
},
envPrefix: [
"VITE_",
"TAURI_PLATFORM",
"TAURI_ARCH",
"TAURI_FAMILY",
"TAURI_PLATFORM_VERSION",
"TAURI_PLATFORM_TYPE",
"TAURI_DEBUG",
],
build: {
rollupOptions: {
input: {
main: resolve(__dirname, "index.html"),
tomorrow: resolve(__dirname, "src/views/TasksView/Tomorrow/index.html"),
},
},
// Tauri uses Chromium on Windows and WebKit on macOS and Linux
target: process.env.TAURI_PLATFORM == "windows" ? "chrome105" : "safari13",
// don't minify for debug builds
minify: !process.env.TAURI_DEBUG ? "esbuild" : false,
// produce sourcemaps for debug builds
sourcemap: !!process.env.TAURI_DEBUG,
},
}));

0 comments on commit a73b2bd

Please sign in to comment.