Skip to content

Commit

Permalink
feat: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
pacholoamit committed Oct 14, 2024
1 parent 3820da9 commit 4ad4325
Show file tree
Hide file tree
Showing 142 changed files with 672 additions and 579 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 not shown.
Binary file not shown.
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"prepare": "husky"
},
"dependencies": {
"@ag-grid-community/client-side-row-model": "^32.0.2",
"@ag-grid-community/core": "^32.0.2",
"@emotion/react": "^11.11.4",
"@ag-grid-community/client-side-row-model": "^32.2.2",
"@ag-grid-community/core": "^32.2.2",
"@emotion/react": "^11.13.3",
"@mantine/core": "^6.0.22",
"@mantine/form": "^6.0.22",
"@mantine/hooks": "^6.0.22",
Expand All @@ -23,50 +23,50 @@
"@tauri-apps/api": "^2.0.2",
"@tauri-apps/plugin-fs": "^2.0.0",
"@tauri-apps/plugin-log": "^2.0.0",
"@tauri-apps/plugin-os": "~2",
"@tauri-apps/plugin-os": "~2.0.0",
"@tauri-apps/plugin-process": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.0",
"@tauri-apps/plugin-store": "~2",
"@tauri-apps/plugin-updater": "^2.0.0",
"ag-grid-react": "^32.0.2",
"ag-grid-react": "^32.2.2",
"classnames": "^2.5.1",
"highcharts": "^11.4.6",
"highcharts": "^11.4.8",
"highcharts-react-official": "^3.2.1",
"immer": "^10.1.1",
"non.geist": "^1.0.3",
"posthog-js": "^1.147.0",
"non.geist": "^1.0.4",
"posthog-js": "^1.167.0",
"react": "^18.3.1",
"react-arborist": "^3.4.0",
"react-dom": "^18.3.1",
"react-geiger": "^1.2.0",
"react-github-btn": "^1.4.0",
"react-router-dom": "^6.24.1",
"react-router-dom": "^6.27.0",
"react-text-gradients": "^1.0.2",
"styled-components": "^6.1.11",
"styled-components": "^6.1.13",
"tauri-plugin-autostart-api": "https://github.com/tauri-apps/tauri-plugin-autostart#v2",
"tauri-plugin-log-api": "https://github.com/tauri-apps/tauri-plugin-log#v2",
"tauri-plugin-store": "https://github.com/tauri-apps/tauri-plugin-store#v2",
"zustand": "^4.5.5"
},
"devDependencies": {
"@eslint/js": "^9.7.0",
"@tauri-apps/cli": "2.0.2",
"@eslint/js": "^9.12.0",
"@tauri-apps/cli": "2.0.3",
"@types/lodash.sortby": "^4.7.9",
"@types/node": "^20.16.11",
"@types/node": "^22.7.5",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"@vitejs/plugin-react-swc": "^3.7.0",
"eslint": "^9.7.0",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.2",
"@vitejs/plugin-react-swc": "^3.7.1",
"eslint": "^9.12.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-no-relative-import-paths": "^1.5.5",
"eslint-plugin-react": "^7.34.4",
"eslint-plugin-unused-imports": "^4.0.0",
"globals": "^15.8.0",
"husky": "^9.0.11",
"typescript": "^5.6.2",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-unused-imports": "^4.1.4",
"globals": "^15.11.0",
"husky": "^9.1.6",
"typescript": "^5.6.3",
"typescript-eslint": "^7.18.0",
"vite": "^5.4.8",
"vite-plugin-eslint": "^1.8.1"
},
"packageManager": "[email protected]"
}
}
3 changes: 2 additions & 1 deletion src-tauri/Cargo.lock

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

3 changes: 2 additions & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ base64 = "0.22.1"
anyhow = "1.0.86"
tauri-plugin-decorum = "1.1.1"
tauri-plugin-os = "2"
tauri-plugin-store = "2"

[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }

tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
Expand Down
1 change: 1 addition & 0 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use std::time::Duration;

fn build_and_run_app(app: AppState) {
tauri::Builder::default()
.plugin(tauri_plugin_store::Builder::new().build())
.plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_updater::Builder::new().build())
.setup(|app| {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { useEffect } from "react";
import React, { useEffect } from 'react';

import AreaChart, { useAreaChartState } from "@/components/area-chart";
import Card from "@/components/card";
import StatsRing from "@/components/stats-ring2";
import useGlobalCpuSelectors from "@/features/metrics/stores/global-cpu.store";
import fromNumberToPercentageString from "@/features/metrics/utils/from-number-to-percentage-string";
import { Grid, useMantineTheme } from "@mantine/core";
import { IconCpu, TablerIconsProps } from "@tabler/icons-react";
import AreaChart, { useAreaChartState } from '@/components/area-chart';
import Card from '@/components/card';
import StatsRing from '@/components/stats-ring2';
import useGlobalCpuSelectors from '@/features/metrics/stores/global-cpu.store';
import fromNumberToPercentageString from '@/features/metrics/utils/from-number-to-percentage-string';
import { Grid, useMantineTheme } from '@mantine/core';
import { IconCpu, TablerIconsProps } from '@tabler/icons-react';

// TODO: Remove Luxon and ChartJS
// TODO: Make timestamp work automatically
Expand Down
11 changes: 5 additions & 6 deletions src/lib/store.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { Store } from 'tauri-plugin-store';

import logger from '@/lib/logger';
import { appDataDir } from '@tauri-apps/api/path';
import { createStore as createTauriStore } from '@tauri-apps/plugin-store';

const { platform } = window.__TAURI__.os;

// Generic function to create get/set operations
const createStoreItem = <T>(store: Store, key: string, defaultValue: T) => ({
const createStoreItem = <T>(store: Awaited<ReturnType<typeof createTauriStore>>, key: string, defaultValue: T) => ({
get: async () => {
const value = await store.get<T>(key);
logger.info(`Store item ${key} value: `, value);
Expand All @@ -20,7 +19,7 @@ const createStoreItem = <T>(store: Store, key: string, defaultValue: T) => ({
});

// Specialized function for sessions
const sessions = (store: Store) => ({
const sessions = (store: Awaited<ReturnType<typeof createTauriStore>>) => ({
get: async () => await store.get<number>("sessions"),
increment: async () => {
const currentSessions = (await store.get<number>("sessions")) ?? 0;
Expand All @@ -29,7 +28,7 @@ const sessions = (store: Store) => ({
});

// Specialized function for first run check
const isFirstRun = (store: Store) => ({
const isFirstRun = (store: Awaited<ReturnType<typeof createTauriStore>>) => ({
get: async () => {
const count = (await store.get<number>("sessions")) || 0;
return count === 0;
Expand All @@ -40,7 +39,7 @@ const createStore = async (name: string) => {
const currentPlatform = await platform();
const path = await appDataDir();
const storePath = currentPlatform === "windows" ? `${path}\\${name}` : `${path}/${name}`;
const store = new Store(storePath);
const store = await createTauriStore(storePath);

logger.info("Store path: ", storePath);

Expand Down
Loading

0 comments on commit 4ad4325

Please sign in to comment.