From 625410df1a4b4b1a16c01ca45d9712839df9f90c Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Tue, 17 Oct 2023 21:56:16 +0200 Subject: [PATCH 1/2] linter --- src/core/WakaTimeCore.ts | 2 +- src/types/heartbeats.ts | 2 +- src/types/user.ts | 2 +- webpack.config.ts | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/core/WakaTimeCore.ts b/src/core/WakaTimeCore.ts index c74a2c8b..1d699316 100644 --- a/src/core/WakaTimeCore.ts +++ b/src/core/WakaTimeCore.ts @@ -354,7 +354,7 @@ class WakaTimeCore { }; payload.project = heartbeat.project ?? '<>'; - payload.branch= heartbeat.branch ?? '<>'; + payload.branch = heartbeat.branch ?? '<>'; return payload; } diff --git a/src/types/heartbeats.ts b/src/types/heartbeats.ts index 4c0bb207..69734144 100644 --- a/src/types/heartbeats.ts +++ b/src/types/heartbeats.ts @@ -28,9 +28,9 @@ export interface Datum { } export interface SendHeartbeat { + branch: string | null; hostname: string; project: string | null; - branch: string | null; url: string; } diff --git a/src/types/user.ts b/src/types/user.ts index d19e8922..860e899e 100644 --- a/src/types/user.ts +++ b/src/types/user.ts @@ -25,11 +25,11 @@ export interface User { is_hireable: boolean; is_onboarding_finished: boolean; languages_used_public: boolean; + last_branch?: string; last_heartbeat_at: string; last_plugin: string; last_plugin_name: string; last_project?: string; - last_branch?: string; location: string; logged_time_public: boolean; modified_at: string; diff --git a/webpack.config.ts b/webpack.config.ts index d38934d0..51a99e07 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -75,5 +75,9 @@ export default ( arv: Record, ): webpack.Configuration[] => { const isProd = arv.mode !== 'development'; - return [getConfigByBrowser(isProd, 'chrome'), getConfigByBrowser(isProd, 'firefox'), getConfigByBrowser(isProd, 'edge')]; + return [ + getConfigByBrowser(isProd, 'chrome'), + getConfigByBrowser(isProd, 'firefox'), + getConfigByBrowser(isProd, 'edge'), + ]; }; From 03ae1f55de5a309e4372117b4ca250c73fc76ce0 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Tue, 17 Oct 2023 21:57:00 +0200 Subject: [PATCH 2/2] Link to new firefox namespace --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 82948287..c47ff1ce 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Note: Activity from this Chrome extension will not display on leaderboards, so i [![Chrome](https://wakatime.com/static/img/chrome-web-store.png)](https://chrome.google.com/webstore/detail/wakatime/jnbbnacmeggbgdjgaoojpmhdlkkpblgi) -[![Firefox](https://wakatime.com/static/img/firefox-addon.png)](https://addons.mozilla.org/en-US/firefox/addon/wakatimes/) +[![Firefox](https://wakatime.com/static/img/firefox-addon.png)](https://addons.mozilla.org/en-US/firefox/addon/wakatime/) [![Edge](https://wakatime.com/static/img/microsoft-extension.png)](https://microsoftedge.microsoft.com/addons/detail/wakatime/cdnpfnaadjmaplhghnlonephmabegadl)