Skip to content

Commit

Permalink
feat: use npm everywhere, v1
Browse files Browse the repository at this point in the history
  • Loading branch information
piotrpdev committed Aug 30, 2024
1 parent b66a6ee commit 7d78ac1
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# You can remove the one that doesn't apply to your app to speed up the workflow a bit.

- name: install frontend dependencies
run: yarn install # change this to npm, pnpm or bun depending on which one you use.
run: npm ci # change this to npm, pnpm or bun depending on which one you use.

- uses: tauri-apps/tauri-action@v0
env:
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"contributors": ["kilobyte <https://x.com/1000kilobytes>"],
"license": "GPL-3.0",
"private": false,
"version": "0.0.0",
"version": "1.0.0",
"type": "module",
"engines": {
"npm": ">=10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

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

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "aero-weather"
version = "0.0.0"
version = "1.0.0"
description = "A Tauri App"
authors = ["Piotr Płaczek <[email protected]>", "kilobyte <https://x.com/1000kilobytes>"]
license = "GPL-3.0"
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use tauri_plugin_decorum::WebviewWindowExt;
use window_vibrancy::apply_acrylic;

#[cfg(target_os = "macos")]
use window_vibrancy::apply_vibrancy;
use window_vibrancy::{apply_vibrancy, NSVisualEffectMaterial};

fn main() {
tauri::Builder::default()
Expand Down Expand Up @@ -38,14 +38,14 @@ fn main() {
);

// Set a custom inset to the traffic lights
main_window.set_traffic_lights_inset(12.0, 16.0).unwrap();
// main_window.set_traffic_lights_inset(12.0, 16.0).unwrap();

// Make window transparent without privateApi
// main_window.make_transparent().unwrap();

// Set window level
// NSWindowLevel: https://developer.apple.com/documentation/appkit/nswindowlevel
main_window.set_window_level(25).unwrap();
// main_window.set_window_level(25).unwrap();
}
}

Expand Down
6 changes: 3 additions & 3 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"productName": "aero-weather",
"version": "0.0.0",
"version": "1.0.0",
"identifier": "dev.piotrp.aero-weather",
"build": {
"beforeDevCommand": "yarn dev",
"beforeBuildCommand": "yarn build",
"beforeDevCommand": "npm run dev",
"beforeBuildCommand": "npm run build",
"devUrl": "http://localhost:1420",
"frontendDist": "../dist"
},
Expand Down

0 comments on commit 7d78ac1

Please sign in to comment.