Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
pacholoamit committed May 13, 2024
2 parents 276484a + b196e65 commit d056e9f
Show file tree
Hide file tree
Showing 17 changed files with 952 additions and 929 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/fsevents-patch-2882183fbf-8.zip
Binary file not shown.
873 changes: 0 additions & 873 deletions .yarn/releases/yarn-3.5.1.cjs

This file was deleted.

875 changes: 875 additions & 0 deletions .yarn/releases/yarn-3.8.2.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.5.1.cjs
yarnPath: .yarn/releases/yarn-3.8.2.cjs
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/).

## 0.5.0
- Updated Rust and Typescript dependencies

## 0.4.0

- Add `Settings` page
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pachtop",
"private": true,
"version": "0.4.0",
"version": "0.5.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down Expand Up @@ -36,7 +36,7 @@
"tauri-plugin-store": "https://github.com/tauri-apps/tauri-plugin-store"
},
"devDependencies": {
"@tauri-apps/cli": "^1.3.0",
"@tauri-apps/cli": "^1.4.0",
"@types/lodash.sortby": "^4.7.7",
"@types/node": "^20.1.0",
"@types/react": "^18.2.6",
Expand All @@ -45,5 +45,5 @@
"typescript": "^5.0.4",
"vite": "^4.3.5"
},
"packageManager": "yarn@3.5.1"
}
"packageManager": "yarn@3.8.2"
}
8 changes: 4 additions & 4 deletions 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 = "app"
version = "0.4.0"
version = "0.5.0"
description = "Cross-platform (Linux, WIndows, MacOS) Desktop GUI system monitor"
authors = ["Pacholo Amit"]
license = "MIT"
Expand Down
16 changes: 12 additions & 4 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "pachtop",
"version": "0.4.0"
"version": "0.5.0"
},
"tauri": {
"systemTray": {
Expand Down Expand Up @@ -68,7 +68,13 @@
"depends": []
},
"externalBin": [],
"icon": ["icons/32x32.png", "icons/128x128.png", "icons/[email protected]", "icons/icon.icns", "icons/icon.ico"],
"icon": [
"icons/32x32.png",
"icons/128x128.png",
"icons/[email protected]",
"icons/icon.icns",
"icons/icon.ico"
],
"identifier": "com.pachtop.dev",
"longDescription": "",
"macOS": {
Expand All @@ -92,7 +98,9 @@
},
"updater": {
"active": true,
"endpoints": ["https://update.pachtop.com/releases/pachtop/{{target}}/{{current_version}}"],
"endpoints": [
"https://update.pachtop.com/releases/pachtop/{{target}}/{{current_version}}"
],
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEM0NkIyODA1NThCM0I0MUEKUldRYXRMTllCU2hyeE9mSUx0MElJN2N5VFo5TytFV1RwaUtoaytDNVdmajNQMmlseVlYMGYzeUkK"
},
"windows": [
Expand All @@ -108,4 +116,4 @@
}
]
}
}
}
94 changes: 52 additions & 42 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1077,82 +1077,90 @@ __metadata:
languageName: node
linkType: hard

"@tauri-apps/cli-darwin-arm64@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-darwin-arm64@npm:1.3.0"
"@tauri-apps/cli-darwin-arm64@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-darwin-arm64@npm:1.4.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@tauri-apps/cli-darwin-x64@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-darwin-x64@npm:1.3.0"
"@tauri-apps/cli-darwin-x64@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-darwin-x64@npm:1.4.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@tauri-apps/cli-linux-arm-gnueabihf@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-linux-arm-gnueabihf@npm:1.3.0"
"@tauri-apps/cli-linux-arm-gnueabihf@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-linux-arm-gnueabihf@npm:1.4.0"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"@tauri-apps/cli-linux-arm64-gnu@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-linux-arm64-gnu@npm:1.3.0"
"@tauri-apps/cli-linux-arm64-gnu@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-linux-arm64-gnu@npm:1.4.0"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@tauri-apps/cli-linux-arm64-musl@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-linux-arm64-musl@npm:1.3.0"
"@tauri-apps/cli-linux-arm64-musl@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-linux-arm64-musl@npm:1.4.0"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@tauri-apps/cli-linux-x64-gnu@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-linux-x64-gnu@npm:1.3.0"
"@tauri-apps/cli-linux-x64-gnu@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-linux-x64-gnu@npm:1.4.0"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@tauri-apps/cli-linux-x64-musl@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-linux-x64-musl@npm:1.3.0"
"@tauri-apps/cli-linux-x64-musl@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-linux-x64-musl@npm:1.4.0"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@tauri-apps/cli-win32-ia32-msvc@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-win32-ia32-msvc@npm:1.3.0"
"@tauri-apps/cli-win32-arm64-msvc@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-win32-arm64-msvc@npm:1.4.0"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@tauri-apps/cli-win32-ia32-msvc@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-win32-ia32-msvc@npm:1.4.0"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard

"@tauri-apps/cli-win32-x64-msvc@npm:1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli-win32-x64-msvc@npm:1.3.0"
"@tauri-apps/cli-win32-x64-msvc@npm:1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli-win32-x64-msvc@npm:1.4.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@tauri-apps/cli@npm:^1.3.0":
version: 1.3.0
resolution: "@tauri-apps/cli@npm:1.3.0"
dependencies:
"@tauri-apps/cli-darwin-arm64": 1.3.0
"@tauri-apps/cli-darwin-x64": 1.3.0
"@tauri-apps/cli-linux-arm-gnueabihf": 1.3.0
"@tauri-apps/cli-linux-arm64-gnu": 1.3.0
"@tauri-apps/cli-linux-arm64-musl": 1.3.0
"@tauri-apps/cli-linux-x64-gnu": 1.3.0
"@tauri-apps/cli-linux-x64-musl": 1.3.0
"@tauri-apps/cli-win32-ia32-msvc": 1.3.0
"@tauri-apps/cli-win32-x64-msvc": 1.3.0
"@tauri-apps/cli@npm:^1.4.0":
version: 1.4.0
resolution: "@tauri-apps/cli@npm:1.4.0"
dependencies:
"@tauri-apps/cli-darwin-arm64": 1.4.0
"@tauri-apps/cli-darwin-x64": 1.4.0
"@tauri-apps/cli-linux-arm-gnueabihf": 1.4.0
"@tauri-apps/cli-linux-arm64-gnu": 1.4.0
"@tauri-apps/cli-linux-arm64-musl": 1.4.0
"@tauri-apps/cli-linux-x64-gnu": 1.4.0
"@tauri-apps/cli-linux-x64-musl": 1.4.0
"@tauri-apps/cli-win32-arm64-msvc": 1.4.0
"@tauri-apps/cli-win32-ia32-msvc": 1.4.0
"@tauri-apps/cli-win32-x64-msvc": 1.4.0
dependenciesMeta:
"@tauri-apps/cli-darwin-arm64":
optional: true
Expand All @@ -1168,13 +1176,15 @@ __metadata:
optional: true
"@tauri-apps/cli-linux-x64-musl":
optional: true
"@tauri-apps/cli-win32-arm64-msvc":
optional: true
"@tauri-apps/cli-win32-ia32-msvc":
optional: true
"@tauri-apps/cli-win32-x64-msvc":
optional: true
bin:
tauri: tauri.js
checksum: 7ab24fa306e71af57bf7fe0f9e4885b2005c189a27994c9d734af5f02339beb347c0dc8a9d50fcccbc0da228b43608472aaf3975d3143685fb4f86220709f45b
checksum: b4c0b8fae092a3fc88db0f07e7e0430b741241be32d8ef47eeec58f6d98c880dc93ca691712eeaaa7385903be2e55baf2366d209ab27f4ffd40ad447c92ca08a
languageName: node
linkType: hard

Expand Down Expand Up @@ -3290,7 +3300,7 @@ __metadata:
"@mdx-js/rollup": ^2.3.0
"@tabler/icons-react": ^2.17.0
"@tauri-apps/api": ^1.3.0
"@tauri-apps/cli": ^1.3.0
"@tauri-apps/cli": ^1.4.0
"@types/lodash.sortby": ^4.7.7
"@types/node": ^20.1.0
"@types/react": ^18.2.6
Expand Down

0 comments on commit d056e9f

Please sign in to comment.