diff --git a/package.json b/package.json index 9fc34441..1d502a36 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "swdc-vscode", "displayName": "Code Time", - "version": "2.8.2", + "version": "2.8.3", "publisher": "softwaredotcom", "description": "Code Time is an open source plugin that provides programming metrics right in Visual Studio Code.", "author": { @@ -143,7 +143,7 @@ "axios": "^1.7.4", "date-fns": "^4.1.0", "node-cache": "^5.1.2", - "open": "^10.1.0", + "open": "^8.4.2", "swdc-tracker": "1.5.7", "uuid": "^9.0.1", "ws": "^8.18.0" diff --git a/src/Util.ts b/src/Util.ts index 2a379632..bd56ff63 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -16,7 +16,7 @@ import {getBooleanJsonItem, getJsonItem, setJsonItem, storeJsonData} from './man import { formatISO } from 'date-fns'; import { initializeWebsockets, websocketAlive } from './websockets'; -import open from 'open'; +const open = require('open'); import * as fs from 'fs'; import * as path from 'path'; import * as os from 'os'; diff --git a/src/managers/MenuManager.ts b/src/managers/MenuManager.ts deleted file mode 100644 index 7c8f7659..00000000 --- a/src/managers/MenuManager.ts +++ /dev/null @@ -1,30 +0,0 @@ -import {commands, QuickPickOptions, window} from 'vscode'; -import {launchWebUrl} from '../Util'; - -export function showQuickPick(pickOptions: any): any { - if (!pickOptions || !pickOptions['items']) { - return; - } - const options: QuickPickOptions = { - matchOnDescription: false, - matchOnDetail: false, - placeHolder: pickOptions.placeholder || '', - }; - - return window.showQuickPick(pickOptions.items, options).then(async (item: any) => { - if (item) { - const url: string = item['url']; - const cb: any = item['cb']; - const command: string = item['command']; - const commandArgs: [] = item['commandArgs'] || []; - if (url) { - launchWebUrl(url); - } else if (cb) { - cb(); - } else if (command) { - commands.executeCommand(command, ...commandArgs); - } - } - return item; - }); -} diff --git a/src/menu/MenuManager.ts b/src/menu/MenuManager.ts deleted file mode 100644 index cc4179b2..00000000 --- a/src/menu/MenuManager.ts +++ /dev/null @@ -1,40 +0,0 @@ -import {window, QuickPickOptions, commands} from 'vscode'; -import {launchWebUrl} from '../Util'; -import {app_url} from '../Constants'; - -/** - * Pass in the following array of objects - * options: {placeholder, items: [{label, description, url, detail, tooltip},...]} - */ - -export function showQuickPick(pickOptions: any): any { - if (!pickOptions || !pickOptions['items']) { - return; - } - let options: QuickPickOptions = { - matchOnDescription: false, - matchOnDetail: false, - placeHolder: pickOptions.placeholder || '', - }; - - return window.showQuickPick(pickOptions.items, options).then(async (item: any) => { - if (item) { - const url = item['url']; - const cb = item['cb']; - const command = item['command']; - const commandArgs = item['commandArgs'] || []; - if (url) { - launchWebUrl(url); - } else if (cb) { - cb(); - } else if (command) { - commands.executeCommand(command, ...commandArgs); - } - } - return item; - }); -} - -export async function launchWebDashboardView() { - launchWebUrl(`${app_url}/login`); -} diff --git a/swdc-vscode-2.8.2.vsix b/swdc-vscode-2.8.2.vsix deleted file mode 100644 index 30ae196a..00000000 Binary files a/swdc-vscode-2.8.2.vsix and /dev/null differ diff --git a/swdc-vscode-2.8.3.vsix b/swdc-vscode-2.8.3.vsix new file mode 100644 index 00000000..b2fbd8c8 Binary files /dev/null and b/swdc-vscode-2.8.3.vsix differ diff --git a/yarn.lock b/yarn.lock index cca076dc..71e88a50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -565,13 +565,6 @@ builtin-modules@^1.1.1: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ== -bundle-name@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889" - integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q== - dependencies: - run-applescript "^7.0.0" - cacheable-lookup@^5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" @@ -729,28 +722,15 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" -default-browser-id@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26" - integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA== - -default-browser@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf" - integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg== - dependencies: - bundle-name "^4.1.0" - default-browser-id "^5.0.0" - defer-to-connect@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== -define-lazy-prop@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" - integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== delayed-stream@~1.0.0: version "1.0.0" @@ -1097,10 +1077,10 @@ is-core-module@^2.9.0: dependencies: has "^1.0.3" -is-docker@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" - integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== +is-docker@^2.0.0, is-docker@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extglob@^2.1.1: version "2.1.1" @@ -1114,13 +1094,6 @@ is-glob@^4.0.1, is-glob@^4.0.3: dependencies: is-extglob "^2.1.1" -is-inside-container@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" - integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== - dependencies: - is-docker "^3.0.0" - is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -1133,12 +1106,12 @@ is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-wsl@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" - integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw== +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== dependencies: - is-inside-container "^1.0.0" + is-docker "^2.0.0" isexe@^2.0.0: version "2.0.0" @@ -1357,15 +1330,14 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -open@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1" - integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw== +open@^8.4.2: + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== dependencies: - default-browser "^5.2.1" - define-lazy-prop "^3.0.0" - is-inside-container "^1.0.0" - is-wsl "^3.1.0" + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" p-cancelable@^2.0.0: version "2.1.1" @@ -1523,11 +1495,6 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -run-applescript@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb" - integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A== - run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"