From 3bb19919bee55f2f0d63dfc6a3944c3f3d41c83c Mon Sep 17 00:00:00 2001
From: Yadro
Date: Thu, 14 Apr 2022 09:56:24 +0300
Subject: [PATCH 01/20] Update README.md
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index d5672ed..2b359b9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
-
From a4c1fbc0ffb0505503429c03447cf983be850450 Mon Sep 17 00:00:00 2001
From: Yadro
Date: Wed, 15 Jun 2022 13:42:11 +0300
Subject: [PATCH 02/20] Update README.md
---
README.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/README.md b/README.md
index 2b359b9..c37baff 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,10 @@ Start and stop time, jump between tasks, and add details on how time was spent.
Windows / Linux / MacOS
**Open latest release**
+## Support
+To support this app, please leave a feedback on [AlternativeTo](https://alternativeto.net/software/timetracker-by-yadro/about/) or [ProductHunt](https://www.producthunt.com/posts/timetracker)
+
+
## Starting Development
@@ -44,3 +48,5 @@ To package apps for the local platform:
```bash
yarn package
```
+
+
From 60c3bcdb1f27aa11feb5b820fc56d78c5624089f Mon Sep 17 00:00:00 2001
From: Yadro
Date: Wed, 15 Jun 2022 14:24:25 +0300
Subject: [PATCH 03/20] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c37baff..9616604 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Windows / Linux / MacOS
**Open latest release**
## Support
-To support this app, please leave a feedback on [AlternativeTo](https://alternativeto.net/software/timetracker-by-yadro/about/) or [ProductHunt](https://www.producthunt.com/posts/timetracker)
+Please leave the feedback on [AlternativeTo](https://alternativeto.net/software/timetracker-by-yadro/about/) or [ProductHunt](https://www.producthunt.com/posts/timetracker) to support this app.
From add99f24ae659e8c1ac0cbe1f11255327e97a96a Mon Sep 17 00:00:00 2001
From: Yadro
Date: Wed, 15 Jun 2022 14:47:32 +0300
Subject: [PATCH 04/20] Create LICENSE
---
LICENSE | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 LICENSE
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..c1e626e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022-present Yadro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
From d3c19f5ff98aba53a9a8849aa2bb3facc517a312 Mon Sep 17 00:00:00 2001
From: yadro
Date: Fri, 24 Jun 2022 17:42:03 +0300
Subject: [PATCH 05/20] ignore .run
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index dcebd27..80b6aec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ dll
main.js
main.js.map
+.run
.idea
npm-debug.log.*
*.css.d.ts
From 4afff0fdfae82e691eee349884c94d4244853ba0 Mon Sep 17 00:00:00 2001
From: yadro
Date: Fri, 24 Jun 2022 17:37:40 +0300
Subject: [PATCH 06/20] Save user uid
---
.env.example | 2 ++
src/services/gaService/GaService.ts | 23 +++++++++++++++++------
src/types/Types.d.ts | 8 +++++++-
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/.env.example b/.env.example
index 5754edb..6c60fbb 100644
--- a/.env.example
+++ b/.env.example
@@ -4,3 +4,5 @@ GA_UACODE=UA-XXXXXXXXX-X
# But dotenv-webpack plugin will replace it by string and parse by Terser will fail.
# NODE_DEBUG=request # debug requests in analytics
# DEBUG_PROD=true
+# FORCE_ENABLE_ANALYTICS=true
+
diff --git a/src/services/gaService/GaService.ts b/src/services/gaService/GaService.ts
index 7b7e95e..bd44282 100644
--- a/src/services/gaService/GaService.ts
+++ b/src/services/gaService/GaService.ts
@@ -1,16 +1,27 @@
-import ua from 'universal-analytics';
+import ua, { Visitor } from 'universal-analytics';
+import { v4 as uuid } from 'uuid';
-const isProd = process.env.NODE_ENV === 'production';
+const isEnabled =
+ process.env.NODE_ENV === 'production' ||
+ process.env.FORCE_ENABLE_ANALYTICS === 'true';
const gaCode = process.env.GA_UACODE;
-let analytics: any | null = null;
-if (isProd && gaCode) {
- analytics = ua(gaCode);
+let analytics: Visitor | null = null;
+
+if (isEnabled && gaCode) {
+ let uid = window.localStorage.getItem('uid');
+
+ if (!uid) {
+ uid = uuid();
+ window.localStorage.setItem('uid', uid);
+ }
+
+ analytics = ua(gaCode, uid);
}
const executeOnCondition = (fn: () => void) => {
- if (isProd && analytics) {
+ if (isEnabled && analytics) {
fn();
}
};
diff --git a/src/types/Types.d.ts b/src/types/Types.d.ts
index 29d3733..8bf2cf3 100644
--- a/src/types/Types.d.ts
+++ b/src/types/Types.d.ts
@@ -1,5 +1,11 @@
declare module 'universal-analytics' {
- const ua: (code: string) => any;
+ export interface Visitor {
+ pageview(path: string): Visitor;
+ event(category: string, action: string): Visitor;
+ send(): void;
+ }
+
+ const ua: (code: string, uid?: string) => Visitor;
export default ua;
}
From 62cd3f0eb07a5b186ece780881a11fd38c9269d2 Mon Sep 17 00:00:00 2001
From: yadro
Date: Fri, 24 Jun 2022 23:56:06 +0300
Subject: [PATCH 07/20] Update packages
---
package.json | 18 +-
src/index.tsx | 5 +
src/types/Types.d.ts | 12 --
yarn.lock | 454 ++++++++++++++++++++++---------------------
4 files changed, 248 insertions(+), 241 deletions(-)
diff --git a/package.json b/package.json
index 7d71bb7..8dc7a2c 100644
--- a/package.json
+++ b/package.json
@@ -164,13 +164,14 @@
"@types/history": "4.7.6",
"@types/jest": "^26.0.24",
"@types/node": "14.14.10",
- "@types/react": "^16.9.44",
- "@types/react-dom": "^16.9.9",
+ "@types/react": "18.0.14",
+ "@types/react-dom": "17.0.11",
"@types/react-router-dom": "^5.1.6",
"@types/uuid": "^8.3.3",
"@types/webpack-env": "^1.15.2",
"@typescript-eslint/eslint-plugin": "^4.8.1",
"@typescript-eslint/parser": "^4.8.1",
+ "@types/universal-analytics": "0.4.5",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.1.0",
"babel-loader": "^8.2.2",
@@ -229,9 +230,9 @@
},
"dependencies": {
"@ant-design/colors": "6.0.0",
- "@ant-design/icons": "4.6.2",
+ "@ant-design/icons": "4.7.0",
"@sentry/electron": "2.5.0",
- "antd": "4.17.2",
+ "antd": "4.21.3",
"caniuse-lite": "1.0.30001214",
"clsx": "^1.1.1",
"date-fns": "2.20.1",
@@ -246,14 +247,14 @@
"mobx": "6.1.8",
"mobx-react": "7.1.0",
"moment": "2.29.1",
- "react": "^17.0.1",
- "react-dom": "^17.0.1",
+ "react": "18.2.0",
+ "react-dom": "18.2.0",
"react-hook-media-query": "^1.0.5",
"react-jss": "^10.6.0",
"react-router-dom": "^5.2.0",
"regenerator-runtime": "^0.13.5",
"source-map-support": "^0.5.19",
- "universal-analytics": "^0.4.23",
+ "universal-analytics": "0.5.3",
"uuid": "^8.3.2"
},
"devEngines": {
@@ -261,9 +262,6 @@
"npm": ">=6.x",
"yarn": ">=1.21.3"
},
- "collective": {
- "url": "https://opencollective.com/electron-react-boilerplate-594"
- },
"browserslist": [],
"prettier": {
"overrides": [
diff --git a/src/index.tsx b/src/index.tsx
index 6a6df9e..4546051 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,5 +1,9 @@
import React from 'react';
+
+// Due to issue with antd, we need to use old react api
import { render } from 'react-dom';
+// FIXME: import { createRoot } from 'react-dom/client';
+
import dotenv from 'dotenv';
import App from './App';
@@ -11,3 +15,4 @@ dotenv.config();
initSentry();
render(, document.getElementById('root'));
+// createRoot(document.getElementById('root')).render();
diff --git a/src/types/Types.d.ts b/src/types/Types.d.ts
index 8bf2cf3..5079129 100644
--- a/src/types/Types.d.ts
+++ b/src/types/Types.d.ts
@@ -1,15 +1,3 @@
-declare module 'universal-analytics' {
- export interface Visitor {
- pageview(path: string): Visitor;
- event(category: string, action: string): Visitor;
- send(): void;
- }
-
- const ua: (code: string, uid?: string) => Visitor;
-
- export default ua;
-}
-
declare module 'react-hook-media-query' {
const useMediaQuery: (query: string) => boolean;
diff --git a/yarn.lock b/yarn.lock
index 6205b4a..1d71393 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,23 +14,12 @@
dependencies:
"@ctrl/tinycolor" "^3.4.0"
-"@ant-design/icons-svg@^4.0.0", "@ant-design/icons-svg@^4.2.1":
+"@ant-design/icons-svg@^4.2.1":
version "4.2.1"
resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz#8630da8eb4471a4aabdaed7d1ff6a97dcb2cf05a"
integrity sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==
-"@ant-design/icons@4.6.2":
- version "4.6.2"
- resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.6.2.tgz#290f2e8cde505ab081fda63e511e82d3c48be982"
- integrity sha512-QsBG2BxBYU/rxr2eb8b2cZ4rPKAPBpzAR+0v6rrZLp/lnyvflLH3tw1vregK+M7aJauGWjIGNdFmUfpAOtw25A==
- dependencies:
- "@ant-design/colors" "^6.0.0"
- "@ant-design/icons-svg" "^4.0.0"
- "@babel/runtime" "^7.11.2"
- classnames "^2.2.6"
- rc-util "^5.9.4"
-
-"@ant-design/icons@^4.7.0":
+"@ant-design/icons@4.7.0", "@ant-design/icons@^4.7.0":
version "4.7.0"
resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.7.0.tgz#8c3cbe0a556ba92af5dc7d1e70c0b25b5179af0f"
integrity sha512-aoB4Z7JA431rt6d4u+8xcNPPCrdufSRMUOpxa1ab6mz1JCQZOEVolj2WVs/tDFmN62zzK30mNelEsprLYsSF3g==
@@ -41,16 +30,16 @@
classnames "^2.2.6"
rc-util "^5.9.4"
-"@ant-design/react-slick@~0.28.1":
- version "0.28.2"
- resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.2.tgz#d2826f8a837b86b8d9cb0c38533ee8a491621f1b"
- integrity sha512-nkrvXsO29pLToFaBb3MlJY4McaUFR4UHtXTz6A5HBzYmxH4SwKerX54mWdGc/6tKpHvS3vUwjEOt2T5XqZEo8Q==
+"@ant-design/react-slick@~0.29.1":
+ version "0.29.2"
+ resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.29.2.tgz#53e6a7920ea3562eebb304c15a7fc2d7e619d29c"
+ integrity sha512-kgjtKmkGHa19FW21lHnAfyyH9AAoh35pBdcJ53rHmQ3O+cfFHGHnUbj/HFrRNJ5vIts09FKJVAD8RpaC+RaWfA==
dependencies:
"@babel/runtime" "^7.10.4"
classnames "^2.2.5"
json2mq "^0.2.0"
- lodash "^4.17.15"
- resize-observer-polyfill "^1.5.0"
+ lodash "^4.17.21"
+ resize-observer-polyfill "^1.5.1"
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0":
version "7.16.0"
@@ -1106,10 +1095,10 @@
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.1", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
- version "7.14.6"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
- integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
+ version "7.18.3"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
+ integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
dependencies:
regenerator-runtime "^0.13.4"
@@ -1831,10 +1820,10 @@
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
-"@types/react-dom@^16.9.9":
- version "16.9.9"
- resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.9.tgz#d2d0a6f720a0206369ccbefff752ba37b9583136"
- integrity sha512-jE16FNWO3Logq/Lf+yvEAjKzhpST/Eac8EMd1i4dgZdMczfgqC8EjpxwNgEe3SExHYLliabXDh9DEhhqnlXJhg==
+"@types/react-dom@17.0.11":
+ version "17.0.11"
+ resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466"
+ integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==
dependencies:
"@types/react" "*"
@@ -1855,12 +1844,13 @@
"@types/history" "*"
"@types/react" "*"
-"@types/react@*", "@types/react@^16.9.44":
- version "16.9.56"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.56.tgz#ea25847b53c5bec064933095fc366b1462e2adf0"
- integrity sha512-gIkl4J44G/qxbuC6r2Xh+D3CGZpJ+NdWTItAPmZbR5mUS+JQ8Zvzpl0ea5qT/ZT3ZNTUcDKUVqV3xBE8wv/DyQ==
+"@types/react@*", "@types/react@18.0.14":
+ version "18.0.14"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.14.tgz#e016616ffff51dba01b04945610fe3671fdbe06d"
+ integrity sha512-x4gGuASSiWmo0xjDLpm5mPb52syZHJx02VKbqUKdLmKtAwIh63XClGsiTI1K6DO5q7ox4xAsQrU+Gl3+gGXF9Q==
dependencies:
"@types/prop-types" "*"
+ "@types/scheduler" "*"
csstype "^3.0.2"
"@types/responselike@*", "@types/responselike@^1.0.0":
@@ -1870,6 +1860,11 @@
dependencies:
"@types/node" "*"
+"@types/scheduler@*":
+ version "0.16.2"
+ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
+ integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+
"@types/semver@^7.3.1":
version "7.3.4"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
@@ -1880,6 +1875,11 @@
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+"@types/universal-analytics@0.4.5":
+ version "0.4.5"
+ resolved "https://registry.yarnpkg.com/@types/universal-analytics/-/universal-analytics-0.4.5.tgz#6a4a88477a70f7ca1ce19caede561ca728149810"
+ integrity sha512-Opb+Un786PS3te24VtJR/QPmX00P/pXaJQtLQYJklQefP4xP0Ic3mPc2z6SDz97OrITzR+RHTBEwjtNRjZ/nLQ==
+
"@types/uuid@^8.3.3":
version "8.3.3"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.3.tgz#c6a60686d953dbd1b1d45e66f4ecdbd5d471b4d0"
@@ -2421,53 +2421,54 @@ ansi-styles@^5.0.0:
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-antd@4.17.2:
- version "4.17.2"
- resolved "https://registry.yarnpkg.com/antd/-/antd-4.17.2.tgz#c50123e6da990d8a41bc1ed6fbfc6d587b014ae0"
- integrity sha512-1/xwj72mzg2ly5byvnxsgucEL5JMrinlsaAr4Y+vjobmTBSI9l9zOVkwwOG8kPIrFkhrzC1I42n6GZKnTwfZmg==
+antd@4.21.3:
+ version "4.21.3"
+ resolved "https://registry.yarnpkg.com/antd/-/antd-4.21.3.tgz#a87a5936b3fbb92c0112a6b6fc8f1305ec6d4bdc"
+ integrity sha512-TETxAqqkgzpmQl/74kG2JiY6cd6E7LmrXjU7PN3Kxs8oPfQk7CGxez4smCMdpbTI2NU2qvOw0ugnvqzES82VJQ==
dependencies:
"@ant-design/colors" "^6.0.0"
"@ant-design/icons" "^4.7.0"
- "@ant-design/react-slick" "~0.28.1"
+ "@ant-design/react-slick" "~0.29.1"
"@babel/runtime" "^7.12.5"
"@ctrl/tinycolor" "^3.4.0"
- array-tree-filter "^2.1.0"
classnames "^2.2.6"
copy-to-clipboard "^3.2.0"
lodash "^4.17.21"
memoize-one "^6.0.0"
- moment "^2.25.3"
- rc-cascader "~2.2.0"
+ moment "^2.29.2"
+ rc-cascader "~3.6.0"
rc-checkbox "~2.3.0"
- rc-collapse "~3.1.0"
- rc-dialog "~8.6.0"
+ rc-collapse "~3.3.0"
+ rc-dialog "~8.9.0"
rc-drawer "~4.4.2"
- rc-dropdown "~3.2.0"
- rc-field-form "~1.21.0"
- rc-image "~5.2.5"
+ rc-dropdown "~4.0.0"
+ rc-field-form "~1.26.1"
+ rc-image "~5.7.0"
+ rc-input "~0.0.1-alpha.5"
rc-input-number "~7.3.0"
- rc-mentions "~1.6.1"
- rc-menu "~9.0.12"
- rc-motion "^2.4.4"
- rc-notification "~4.5.7"
- rc-pagination "~3.1.9"
- rc-picker "~2.5.17"
- rc-progress "~3.1.0"
+ rc-mentions "~1.8.0"
+ rc-menu "~9.6.0"
+ rc-motion "^2.5.1"
+ rc-notification "~4.6.0"
+ rc-pagination "~3.1.16"
+ rc-picker "~2.6.8"
+ rc-progress "~3.3.2"
rc-rate "~2.9.0"
- rc-resize-observer "^1.0.0"
- rc-select "~13.1.0-alpha.0"
- rc-slider "~9.7.4"
+ rc-resize-observer "^1.2.0"
+ rc-segmented "~2.1.0"
+ rc-select "~14.1.1"
+ rc-slider "~10.0.0"
rc-steps "~4.1.0"
rc-switch "~3.2.0"
- rc-table "~7.19.0"
- rc-tabs "~11.10.0"
+ rc-table "~7.24.0"
+ rc-tabs "~11.16.0"
rc-textarea "~0.3.0"
rc-tooltip "~5.1.1"
- rc-tree "~5.3.0"
- rc-tree-select "~4.7.0"
+ rc-tree "~5.6.5"
+ rc-tree-select "~5.4.0"
rc-trigger "^5.2.10"
rc-upload "~4.3.0"
- rc-util "^5.14.0"
+ rc-util "^5.20.0"
scroll-into-view-if-needed "^2.2.25"
anymatch@^2.0.0:
@@ -2735,10 +2736,10 @@ async-limiter@~1.0.0:
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-async-validator@^4.0.2:
- version "4.0.7"
- resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.0.7.tgz#034a0fd2103a6b2ebf010da75183bec299247afe"
- integrity sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==
+async-validator@^4.1.0:
+ version "4.2.5"
+ resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.2.5.tgz#c96ea3332a521699d0afaaceed510a54656c6339"
+ integrity sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==
async@0.9.x:
version "0.9.2"
@@ -3497,7 +3498,7 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"
-classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6:
+classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
@@ -8102,7 +8103,7 @@ loglevel@^1.6.8:
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
+loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -8463,11 +8464,16 @@ mobx@6.1.8:
resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.1.8.tgz#5d03cb76d8f7694dd82bfb2578d886945b66450d"
integrity sha512-U4yCvUeh6yKXRwFxm2lyJjXPVekOEar/R8ZKWAXem/3fthJqYflViawfjDAUh7lZEvbKqljC3NT/pSaUKpE+gg==
-moment@2.29.1, moment@^2.24.0, moment@^2.25.3:
+moment@2.29.1:
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+moment@^2.24.0, moment@^2.29.2:
+ version "2.29.3"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
+ integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
+
ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9840,17 +9846,17 @@ rc-align@^4.0.0:
rc-util "^5.3.0"
resize-observer-polyfill "^1.5.1"
-rc-cascader@~2.2.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-2.2.1.tgz#ec6cfa9d631e6e787abedb2db8c6b014ba1e15b6"
- integrity sha512-4saWcwpmxxh5fhUdaDgOLF2gWL8KNxLwWqELX702HNXEt2yU7AixjfvgEORNsnQZleT2W2AaGMkRDeWrwt8fMw==
+rc-cascader@~3.6.0:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.6.0.tgz#7db0d373edf4c276bba4b68b7de57fad1486c908"
+ integrity sha512-p9qwt8E8ZICzPIzyfXF5y7/lbJhRowFj8YhWpdytMomHUZ568duFNwA4H5QVqdC6hg/HIV1YEawOE5jlxSpeww==
dependencies:
"@babel/runtime" "^7.12.5"
array-tree-filter "^2.1.0"
- rc-tree-select "~4.7.0"
- rc-trigger "^5.0.4"
- rc-util "^5.0.1"
- warning "^4.0.1"
+ classnames "^2.3.1"
+ rc-select "~14.1.0"
+ rc-tree "~5.6.3"
+ rc-util "^5.6.1"
rc-checkbox@~2.3.0:
version "2.3.2"
@@ -9860,10 +9866,10 @@ rc-checkbox@~2.3.0:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
-rc-collapse@~3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.0.tgz#4ce5e612568c5fbeaf368cc39214471c1461a1a1"
- integrity sha512-EwpNPJcLe7b+5JfyaxM9ZNnkCgqArt3QQO0Cr5p5plwz/C9h8liAmjYY5I4+hl9lAjBqb7ZwLu94+z+rt5g1WQ==
+rc-collapse@~3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.3.0.tgz#ecde33a06ca53c6c672c6a46c701052b88723950"
+ integrity sha512-nkxjhpYAAwEVbBvZ/qoatLecD0PpRtQ5ja9G+FP1QmsWhs/4VCruhjvRdSpMn9vfluKUnePe3PEy8eeqTeuE0g==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
@@ -9871,15 +9877,15 @@ rc-collapse@~3.1.0:
rc-util "^5.2.1"
shallowequal "^1.1.0"
-rc-dialog@~8.6.0:
- version "8.6.0"
- resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.6.0.tgz#3b228dac085de5eed8c6237f31162104687442e7"
- integrity sha512-GSbkfqjqxpZC5/zc+8H332+q5l/DKUhpQr0vdX2uDsxo5K0PhvaMEVjyoJUTkZ3+JstEADQji1PVLVb/2bJeOQ==
+rc-dialog@~8.9.0:
+ version "8.9.0"
+ resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.9.0.tgz#04dc39522f0321ed2e06018d4a7e02a4c32bd3ea"
+ integrity sha512-Cp0tbJnrvPchJfnwIvOMWmJ4yjX3HWFatO6oBFD1jx8QkgsQCR0p8nUWAKdd3seLJhEC39/v56kZaEjwp9muoQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.6"
rc-motion "^2.3.0"
- rc-util "^5.6.1"
+ rc-util "^5.21.0"
rc-drawer@~4.4.2:
version "4.4.3"
@@ -9890,32 +9896,33 @@ rc-drawer@~4.4.2:
classnames "^2.2.6"
rc-util "^5.7.0"
-rc-dropdown@^3.2.0, rc-dropdown@~3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-3.2.0.tgz#da6c2ada403842baee3a9e909a0b1a91ba3e1090"
- integrity sha512-j1HSw+/QqlhxyTEF6BArVZnTmezw2LnSmRk6I9W7BCqNCKaRwleRmMMs1PHbuaG8dKHVqP6e21RQ7vPBLVnnNw==
+rc-dropdown@~4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-4.0.1.tgz#f65d9d3d89750241057db59d5a75e43cd4576b68"
+ integrity sha512-OdpXuOcme1rm45cR0Jzgfl1otzmU4vuBVb+etXM8vcaULGokAKVpKlw8p6xzspG7jGd/XxShvq+N3VNEfk/l5g==
dependencies:
- "@babel/runtime" "^7.10.1"
+ "@babel/runtime" "^7.18.3"
classnames "^2.2.6"
- rc-trigger "^5.0.4"
+ rc-trigger "^5.3.1"
+ rc-util "^5.17.0"
-rc-field-form@~1.21.0:
- version "1.21.2"
- resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.21.2.tgz#85bda1ee006ae9f1d146e1000337c69b4bb6d101"
- integrity sha512-LR/bURt/Tf5g39mb0wtMtQuWn42d/7kEzpzlC5fNC7yaRVmLTtlPP4sBBlaViETM9uZQKLoaB0Pt9Mubhm9gow==
+rc-field-form@~1.26.1:
+ version "1.26.7"
+ resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.26.7.tgz#1794afa50f844170d8907cc575ab482d65db9926"
+ integrity sha512-CIb7Gw+DG9R+g4HxaDGYHhOjhjQoU2mGU4y+UM2+KQ3uRz9HrrNgTspGvNynn3UamsYcYcaPWZJmiJ6VklkT/w==
dependencies:
- "@babel/runtime" "^7.8.4"
- async-validator "^4.0.2"
+ "@babel/runtime" "^7.18.0"
+ async-validator "^4.1.0"
rc-util "^5.8.0"
-rc-image@~5.2.5:
- version "5.2.5"
- resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.2.5.tgz#44e6ffc842626827960e7ab72e1c0d6f3a8ce440"
- integrity sha512-qUfZjYIODxO0c8a8P5GeuclYXZjzW4hV/5hyo27XqSFo1DmTCs2HkVeQObkcIk5kNsJtgsj1KoPThVsSc/PXOw==
+rc-image@~5.7.0:
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.7.0.tgz#e1a3b21099feb3fb9bf8ef3ce12c3fc11a8c1148"
+ integrity sha512-v6dzSgYfYrH4liKmOZKZZO+x21sJ9KPXNinBfkAoQg2Ihcd5QZ+P/JjB7v60X981XTPGjegy8U17Z8VUX4V36g==
dependencies:
"@babel/runtime" "^7.11.2"
classnames "^2.2.6"
- rc-dialog "~8.6.0"
+ rc-dialog "~8.9.0"
rc-util "^5.0.6"
rc-input-number@~7.3.0:
@@ -9927,22 +9934,31 @@ rc-input-number@~7.3.0:
classnames "^2.2.5"
rc-util "^5.9.8"
-rc-mentions@~1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.6.1.tgz#46035027d64aa33ef840ba0fbd411871e34617ae"
- integrity sha512-LDzGI8jJVGnkhpTZxZuYBhMz3avcZZqPGejikchh97xPni/g4ht714Flh7DVvuzHQ+BoKHhIjobHnw1rcP8erg==
+rc-input@~0.0.1-alpha.5:
+ version "0.0.1-alpha.7"
+ resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.0.1-alpha.7.tgz#53e3f13871275c21d92b51f80b698f389ad45dd3"
+ integrity sha512-eozaqpCYWSY5LBMwlHgC01GArkVEP+XlJ84OMvdkwUnJBSv83Yxa15pZpn7vACAj84uDC4xOA2CoFdbLuqB08Q==
+ dependencies:
+ "@babel/runtime" "^7.11.1"
+ classnames "^2.2.1"
+ rc-util "^5.18.1"
+
+rc-mentions@~1.8.0:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.8.0.tgz#4c0c41605064303f7aedec47d4d07e0bbfcc2dc3"
+ integrity sha512-ch7yfMMvx2UXy+EvE4axm0Vp6VlVZ30WLrZtLtV/Eb1ty7rQQRzNzCwAHAMyw6tNKTMs9t9sF68AVjAzQ0rvJw==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.6"
- rc-menu "^9.0.0"
+ rc-menu "~9.6.0"
rc-textarea "^0.3.0"
rc-trigger "^5.0.4"
rc-util "^5.0.1"
-rc-menu@^9.0.0, rc-menu@~9.0.12:
- version "9.0.12"
- resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.0.12.tgz#492c4bb07a596e2ce07587c669b27ee28c3810c5"
- integrity sha512-8uy47DL36iDEwVZdUO/fjhhW5+4j0tYlrCsOzw6iy8MJqKL7/HC2pj7sL/S9ayp2+hk9fYQYB9Tu+UN+N2OOOQ==
+rc-menu@~9.6.0:
+ version "9.6.0"
+ resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.6.0.tgz#3263a729a81ae49cfdadee112e97d3c702922829"
+ integrity sha512-d26waws42U/rVwW/+rOE2FN9pX6wUc9bDy38vVQYoie6gE85auWIpl5oChGlnW6nE2epnTwUsgWl8ipOPgmnUA==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
@@ -9952,24 +9968,24 @@ rc-menu@^9.0.0, rc-menu@~9.0.12:
rc-util "^5.12.0"
shallowequal "^1.1.0"
-rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4:
- version "2.4.4"
- resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.4.4.tgz#e995d5fa24fc93065c24f714857cf2677d655bb0"
- integrity sha512-ms7n1+/TZQBS0Ydd2Q5P4+wJTSOrhIrwNxLXCZpR7Fa3/oac7Yi803HDALc2hLAKaCTQtw9LmQeB58zcwOsqlQ==
+rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4, rc-motion@^2.5.1:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.6.0.tgz#c60c3e7f15257f55a8cd7794a539f0e2cc751399"
+ integrity sha512-1MDWA9+i174CZ0SIDenSYm2Wb9YbRkrexjZWR0CUFu7D6f23E8Y0KsTgk9NGOLJsGak5ELZK/Y5lOlf5wQdzbw==
dependencies:
"@babel/runtime" "^7.11.1"
classnames "^2.2.1"
- rc-util "^5.2.1"
+ rc-util "^5.21.0"
-rc-notification@~4.5.7:
- version "4.5.7"
- resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.5.7.tgz#265e6e6a0c1a0fac63d6abd4d832eb8ff31522f1"
- integrity sha512-zhTGUjBIItbx96SiRu3KVURcLOydLUHZCPpYEn1zvh+re//Tnq/wSxN4FKgp38n4HOgHSVxcLEeSxBMTeBBDdw==
+rc-notification@~4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.6.0.tgz#4e76fc2d0568f03cc93ac18c9e20763ebe29fa46"
+ integrity sha512-xF3MKgIoynzjQAO4lqsoraiFo3UXNYlBfpHs0VWvwF+4pimen9/H1DYLN2mfRWhHovW6gRpla73m2nmyIqAMZQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
rc-motion "^2.2.0"
- rc-util "^5.0.1"
+ rc-util "^5.20.1"
rc-overflow@^1.0.0, rc-overflow@^1.2.0:
version "1.2.2"
@@ -9981,18 +9997,18 @@ rc-overflow@^1.0.0, rc-overflow@^1.2.0:
rc-resize-observer "^1.0.0"
rc-util "^5.5.1"
-rc-pagination@~3.1.9:
- version "3.1.14"
- resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.14.tgz#1f7d0342edb80dca0989e4ddbe937b1d4657d88d"
- integrity sha512-tcugvxrtPiVU00Uh0IwC8NIUlxa4KtA9pXcaMNJdSHeO2uQqVkHEwllsULTAWRF3zRV2ozo2weP/DRKIUrX+Zg==
+rc-pagination@~3.1.16:
+ version "3.1.17"
+ resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.17.tgz#91e690aa894806e344cea88ea4a16d244194a1bd"
+ integrity sha512-/BQ5UxcBnW28vFAcP2hfh+Xg15W0QZn8TWYwdCApchMH1H0CxiaUUcULP8uXcFM1TygcdKWdt3JqsL9cTAfdkQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
-rc-picker@~2.5.17:
- version "2.5.19"
- resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.5.19.tgz#73d07546fac3992f0bfabf2789654acada39e46f"
- integrity sha512-u6myoCu/qiQ0vLbNzSzNrzTQhs7mldArCpPHrEI6OUiifs+IPXmbesqSm0zilJjfzrZJLgYeyyOMSznSlh0GKA==
+rc-picker@~2.6.8:
+ version "2.6.10"
+ resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.10.tgz#8d0a473c079388bdb2d7358a2a54c7d5095893b4"
+ integrity sha512-9wYtw0DFWs9FO92Qh2D76P0iojUr8ZhLOtScUeOit6ks/F+TBLrOC1uze3IOu+u9gbDAjmosNWLKbBzx/Yuv2w==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -10003,13 +10019,14 @@ rc-picker@~2.5.17:
rc-util "^5.4.0"
shallowequal "^1.1.0"
-rc-progress@~3.1.0:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.1.3.tgz#d77d8fd26d9d948d72c2a28b64b71a6e86df2426"
- integrity sha512-Jl4fzbBExHYMoC6HBPzel0a9VmhcSXx24LVt/mdhDM90MuzoMCJjXZAlhA0V0CJi+SKjMhfBoIQ6Lla1nD4QNw==
+rc-progress@~3.3.2:
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.3.3.tgz#eb9bffbacab1534f2542f9f6861ce772254362b1"
+ integrity sha512-MDVNVHzGanYtRy2KKraEaWeZLri2ZHWIRyaE1a9MQ2MuJ09m+Wxj5cfcaoaR6z5iRpHpA59YeUxAlpML8N4PJw==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.6"
+ rc-util "^5.16.1"
rc-rate@~2.9.0:
version "2.9.1"
@@ -10020,38 +10037,48 @@ rc-rate@~2.9.0:
classnames "^2.2.5"
rc-util "^5.0.1"
-rc-resize-observer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.0.tgz#97fb89856f62fec32ab6e40933935cf58e2e102d"
- integrity sha512-RgKGukg1mlzyGdvzF7o/LGFC8AeoMH9aGzXTUdp6m+OApvmRdUuOscq/Y2O45cJA+rXt1ApWlpFoOIioXL3AGg==
+rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.2.0.tgz#9f46052f81cdf03498be35144cb7c53fd282c4c7"
+ integrity sha512-6W+UzT3PyDM0wVCEHfoW3qTHPTvbdSgiA43buiy8PzmeMnfgnDeb9NjdimMXMl3/TcrvvWl5RRVdp+NqcR47pQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
- rc-util "^5.0.0"
+ rc-util "^5.15.0"
resize-observer-polyfill "^1.5.1"
-rc-select@~13.1.0-alpha.0:
- version "13.1.1"
- resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-13.1.1.tgz#851315d08a743504db57c7a5358cc907b69b45a5"
- integrity sha512-Oy4L27x5QgGR8902pw0bJVjrTWFnKPKvdLHzJl5pjiA+jM1hpzDfLGg/bY2ntk5ElxxQKZUwbFKUeqfCQU7SrQ==
+rc-segmented@~2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.1.0.tgz#0e0afe646c1a0e44a0e18785f518c42633ec8efc"
+ integrity sha512-hUlonro+pYoZcwrH6Vm56B2ftLfQh046hrwif/VwLIw1j3zGt52p5mREBwmeVzXnSwgnagpOpfafspzs1asjGw==
+ dependencies:
+ "@babel/runtime" "^7.11.1"
+ classnames "^2.2.1"
+ rc-motion "^2.4.4"
+ rc-util "^5.17.0"
+
+rc-select@~14.1.0, rc-select@~14.1.1:
+ version "14.1.7"
+ resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.7.tgz#665ec578ff9456688fdaf737badfff071884507a"
+ integrity sha512-mvALDI0Ih1Nehb2JhErNDh1tmxua4mSZtQW7poBkCFISLPjuOs+uy9LKRJwxHHtaH0PxcN+SbITrIXm4KiFUmg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
rc-motion "^2.0.1"
rc-overflow "^1.0.0"
rc-trigger "^5.0.4"
- rc-util "^5.9.8"
+ rc-util "^5.16.1"
rc-virtual-list "^3.2.0"
-rc-slider@~9.7.4:
- version "9.7.4"
- resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.7.4.tgz#430c860723bf6445ebf53517b550417a2f25eed1"
- integrity sha512-pjLKLiDKiaL7/pNywfIBD+lDo5TtVo05KuIBSWEIoqu6FHh6IMWvthCiaODuYaVs3RLeF2nXOP5AjkD2Lt2Rwg==
+rc-slider@~10.0.0:
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.0.0.tgz#8ffe1dd3c8799c9d1f81ac808976f18af3dca206"
+ integrity sha512-Bk54UIKWW4wyhHcL8ehAxt+wX+n69dscnHTX6Uv0FMxSke/TGrlkZz1LSIWblCpfE2zr/dwR2Ca8nZGk3U+Tbg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.5"
rc-tooltip "^5.0.1"
- rc-util "^5.0.0"
+ rc-util "^5.18.1"
shallowequal "^1.1.0"
rc-steps@~4.1.0:
@@ -10072,26 +10099,26 @@ rc-switch@~3.2.0:
classnames "^2.2.1"
rc-util "^5.0.1"
-rc-table@~7.19.0:
- version "7.19.2"
- resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.19.2.tgz#976337a5dace3b8e04bea9554d72bc83aa5ab301"
- integrity sha512-NdpnoM50MK02H5/hGOsObfxCvGFUG5cHB9turE5BKJ81T5Ycbq193w5tLhnpILXe//Oanzr47MdMxkUnVGP+qg==
+rc-table@~7.24.0:
+ version "7.24.2"
+ resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.24.2.tgz#fbccf5ef4b84cdb38c8a0b416365de157483bf51"
+ integrity sha512-yefqhtc4V3BeWG2bnDhWYxWX1MOckvW2KU1J55pntZmIGrov5Hx8tQn2gcs6OM0fJ6NgEwUvVEknsCsWI24zUg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.5"
- rc-resize-observer "^1.0.0"
+ rc-resize-observer "^1.1.0"
rc-util "^5.14.0"
shallowequal "^1.1.0"
-rc-tabs@~11.10.0:
- version "11.10.4"
- resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.10.4.tgz#36ea00a02466c90d8f843322660c713c2a45e6ed"
- integrity sha512-FXihSD9DEF7G/C5iIHNon5jzIO66Two0aeB6uHCmSYibasCsnuBFslHXb9Pa4woqs+vVNjiKRgoDZfurwx1rzg==
+rc-tabs@~11.16.0:
+ version "11.16.0"
+ resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.16.0.tgz#12447069ea1dc480c729e1e40661cfbd46ac4efe"
+ integrity sha512-CIDPv3lHaXSHTJevmFP2eHoD3Hq9psfKbOZYf6D4FYPACloNGHpz44y3RGeJgataQ7omFLrGBm3dOBMUki87tA==
dependencies:
"@babel/runtime" "^7.11.2"
classnames "2.x"
- rc-dropdown "^3.2.0"
- rc-menu "^9.0.0"
+ rc-dropdown "~4.0.0"
+ rc-menu "~9.6.0"
rc-resize-observer "^1.0.0"
rc-util "^5.5.0"
@@ -10113,38 +10140,38 @@ rc-tooltip@^5.0.1, rc-tooltip@~5.1.1:
"@babel/runtime" "^7.11.2"
rc-trigger "^5.0.0"
-rc-tree-select@~4.7.0:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-4.7.0.tgz#4e612d5ba3f30a51f590e3c0e38e1e4c49f34aef"
- integrity sha512-xcc2yPpQieTW6BcRkcKbT1dcAYCQ7ARtkoHlS9EsNdd6xgw9LA6rek6PMed8r/VRMfiKtWV4c4xijW5PI6s4Rw==
+rc-tree-select@~5.4.0:
+ version "5.4.0"
+ resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.4.0.tgz#c94b961aca68689f5ee3a43e33881cf693d195ef"
+ integrity sha512-reRbOqC7Ic/nQocJAJeCl4n6nJUY3NoqiwRXKvhjgZJU7NGr9vIccXEsY+Lghkw5UMpPoxGsIJB0jiAvM18XYA==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
- rc-select "~13.1.0-alpha.0"
- rc-tree "~5.3.0"
- rc-util "^5.7.0"
+ rc-select "~14.1.0"
+ rc-tree "~5.6.1"
+ rc-util "^5.16.1"
-rc-tree@~5.3.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.3.0.tgz#766195ffbd65741000d4caf66980bd474d8ac9a2"
- integrity sha512-A9GpRalG9sCsC+D3Dw9AB3a2gggf7KUT1FoCGGrbmCH1vsBYfTm3Z4RqEUrWtC7793HRccUTxqnENymkKS99lw==
+rc-tree@~5.6.1, rc-tree@~5.6.3, rc-tree@~5.6.5:
+ version "5.6.5"
+ resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.6.5.tgz#1947337fc48f3fe20fabaafb1aed3e4ff1ce71b4"
+ integrity sha512-Bnyen46B251APyRZ9D/jYeTnSqbSEvK2AkU5B4vWkNYgUJNPrxO+VMgcDRedP/8N7YcsgdDT9hxqVvNOq7oCAQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
rc-motion "^2.0.1"
- rc-util "^5.0.0"
- rc-virtual-list "^3.4.1"
+ rc-util "^5.16.1"
+ rc-virtual-list "^3.4.8"
-rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10:
- version "5.2.10"
- resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.10.tgz#8a0057a940b1b9027eaa33beec8a6ecd85cce2b1"
- integrity sha512-FkUf4H9BOFDaIwu42fvRycXMAvkttph9AlbCZXssZDVzz2L+QZ0ERvfB/4nX3ZFPh1Zd+uVGr1DEDeXxq4J1TA==
+rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10, rc-trigger@^5.3.1:
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.3.1.tgz#acafadf3eaf384e7f466c303bfa0f34c8137d7b8"
+ integrity sha512-5gaFbDkYSefZ14j2AdzucXzlWgU2ri5uEjkHvsf1ynRhdJbKxNOnw4PBZ9+FVULNGFiDzzlVF8RJnR9P/xrnKQ==
dependencies:
- "@babel/runtime" "^7.11.2"
+ "@babel/runtime" "^7.18.3"
classnames "^2.2.6"
rc-align "^4.0.0"
rc-motion "^2.0.0"
- rc-util "^5.5.0"
+ rc-util "^5.19.2"
rc-upload@~4.3.0:
version "4.3.1"
@@ -10155,23 +10182,23 @@ rc-upload@~4.3.0:
classnames "^2.2.5"
rc-util "^5.2.0"
-rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
- version "5.15.0"
- resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.15.0.tgz#3527bd6c5806cf04476e17a0c7bf094fc8ea4666"
- integrity sha512-8RI8sjOCXD3FhD3dzQNBQetpGol6BBd3sHQ/8jSGk9NPT0CH3JGtBfPODnASyE7AdDpCFQMOmgcp9CBs3S/1hg==
+rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
+ version "5.22.5"
+ resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.22.5.tgz#d4d6d886c5ecb6a2a51dde1840d780a2b70f5179"
+ integrity sha512-awD2TGMGU97OZftT2R3JwrHWjR8k/xIwqjwcivPskciweUdgXE7QsyXkBKVSBHXS+c17AWWMDWuKWsJSheQy8g==
dependencies:
- "@babel/runtime" "^7.12.5"
+ "@babel/runtime" "^7.18.3"
react-is "^16.12.0"
shallowequal "^1.1.0"
-rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.1:
- version "3.4.2"
- resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.2.tgz#1078327aa7230b5e456d679ed2ce99f3c036ebd1"
- integrity sha512-OyVrrPvvFcHvV0ssz5EDZ+7Rf5qLat/+mmujjchNw5FfbJWNDwkpQ99EcVE6+FtNRmX9wFa1LGNpZLUTvp/4GQ==
+rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8:
+ version "3.4.8"
+ resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.8.tgz#c24c10c6940546b7e2a5e9809402c6716adfd26c"
+ integrity sha512-qSN+Rv4i/E7RCTvTMr1uZo7f3crJJg/5DekoCagydo9zsXrxj07zsFSxqizqW+ldGA16lwa8So/bIbV9Ofjddg==
dependencies:
classnames "^2.2.6"
rc-resize-observer "^1.0.0"
- rc-util "^5.0.7"
+ rc-util "^5.15.0"
rc@^1.2.7, rc@^1.2.8:
version "1.2.8"
@@ -10188,14 +10215,13 @@ react-display-name@^0.2.4:
resolved "https://registry.yarnpkg.com/react-display-name/-/react-display-name-0.2.5.tgz#304c7cbfb59ee40389d436e1a822c17fe27936c6"
integrity sha512-I+vcaK9t4+kypiSgaiVWAipqHRXYmZIuAiS8vzFvXHHXVigg/sMKwlRgLy6LH2i3rmP+0Vzfl5lFsFRwF1r3pg==
-react-dom@^17.0.1:
- version "17.0.1"
- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
- integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
+react-dom@18.2.0:
+ version "18.2.0"
+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
+ integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
dependencies:
loose-envify "^1.1.0"
- object-assign "^4.1.1"
- scheduler "^0.20.1"
+ scheduler "^0.23.0"
react-hook-media-query@^1.0.5:
version "1.0.5"
@@ -10263,13 +10289,12 @@ react-router@5.2.0:
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"
-react@^17.0.1:
- version "17.0.1"
- resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
- integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
+react@18.2.0:
+ version "18.2.0"
+ resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+ integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
dependencies:
loose-envify "^1.1.0"
- object-assign "^4.1.1"
read-config-file@6.2.0:
version "6.2.0"
@@ -10522,7 +10547,7 @@ requires-port@^1.0.0:
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
+resize-observer-polyfill@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
@@ -10766,13 +10791,12 @@ saxes@^5.0.1:
dependencies:
xmlchars "^2.2.0"
-scheduler@^0.20.1:
- version "0.20.1"
- resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
- integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
+scheduler@^0.23.0:
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
+ integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
dependencies:
loose-envify "^1.1.0"
- object-assign "^4.1.1"
schema-utils@^1.0.0:
version "1.0.0"
@@ -12031,14 +12055,13 @@ unique-string@^2.0.0:
dependencies:
crypto-random-string "^2.0.0"
-universal-analytics@^0.4.23:
- version "0.4.23"
- resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac"
- integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==
+universal-analytics@0.5.3:
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.5.3.tgz#ff2d9b850062cdd4a8f652448047982a183c8e96"
+ integrity sha512-HXSMyIcf2XTvwZ6ZZQLfxfViRm/yTGoRgDeTbojtq6rezeyKB0sTBcKH2fhddnteAHRcHiKgr/ACpbgjGOC6RQ==
dependencies:
- debug "^4.1.1"
- request "^2.88.2"
- uuid "^3.0.0"
+ debug "^4.3.1"
+ uuid "^8.0.0"
universalify@^0.1.0, universalify@^0.1.2:
version "0.1.2"
@@ -12175,12 +12198,12 @@ utils-merge@1.0.1:
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-uuid@^3.0.0, uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.3.2, uuid@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-uuid@^8.3.2:
+uuid@^8.0.0, uuid@^8.3.2:
version "8.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -12257,13 +12280,6 @@ walker@^1.0.7, walker@~1.0.5:
dependencies:
makeerror "1.0.12"
-warning@^4.0.1:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
- integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
- dependencies:
- loose-envify "^1.0.0"
-
watchpack@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.0.1.tgz#2f2192c542c82a3bcde76acd3411470c120426a8"
From 60221c5985bb914b0c2f26d2650ca069399c0146 Mon Sep 17 00:00:00 2001
From: yadro
Date: Fri, 24 Jun 2022 23:57:43 +0300
Subject: [PATCH 08/20] Sentry testing
---
.env.example | 2 +-
src/shared/initSentry.ts | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.env.example b/.env.example
index 6c60fbb..e3705b2 100644
--- a/.env.example
+++ b/.env.example
@@ -5,4 +5,4 @@ GA_UACODE=UA-XXXXXXXXX-X
# NODE_DEBUG=request # debug requests in analytics
# DEBUG_PROD=true
# FORCE_ENABLE_ANALYTICS=true
-
+# FORCE_ENABLE_SENTRY=true
diff --git a/src/shared/initSentry.ts b/src/shared/initSentry.ts
index 5324746..bdc3774 100644
--- a/src/shared/initSentry.ts
+++ b/src/shared/initSentry.ts
@@ -1,4 +1,5 @@
import log from 'electron-log';
+
Object.assign(console, log.functions);
const Sentry =
@@ -7,7 +8,11 @@ const Sentry =
: require('@sentry/electron/dist/renderer');
export function initSentry() {
- if (process.env.NODE_ENV === 'production' && process.env.SENTRY_DSN) {
+ if (
+ (process.env.NODE_ENV === 'production' ||
+ process.env.FORCE_ENABLE_SENTRY === 'true') &&
+ process.env.SENTRY_DSN
+ ) {
Sentry.init({
dsn: process.env.SENTRY_DSN,
});
From 0b6ef1ce808e903fe5171f199b9d80bac8a73ff7 Mon Sep 17 00:00:00 2001
From: yadro
Date: Sat, 25 Jun 2022 11:48:49 +0300
Subject: [PATCH 09/20] Upd electron version and others
---
package.json | 18 +-
src/index.html | 2 +-
yarn.lock | 1091 +++++++++++++++++++++++++++++-------------------
3 files changed, 668 insertions(+), 443 deletions(-)
diff --git a/package.json b/package.json
index 8dc7a2c..e117932 100644
--- a/package.json
+++ b/package.json
@@ -167,11 +167,11 @@
"@types/react": "18.0.14",
"@types/react-dom": "17.0.11",
"@types/react-router-dom": "^5.1.6",
+ "@types/universal-analytics": "0.4.5",
"@types/uuid": "^8.3.3",
"@types/webpack-env": "^1.15.2",
"@typescript-eslint/eslint-plugin": "^4.8.1",
"@typescript-eslint/parser": "^4.8.1",
- "@types/universal-analytics": "0.4.5",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.1.0",
"babel-loader": "^8.2.2",
@@ -186,11 +186,11 @@
"css-minimizer-webpack-plugin": "^2.0.0",
"detect-port": "^1.3.0",
"dotenv-webpack": "^7.0.3",
- "electron": "^12.0.2",
- "electron-builder": "^22.11.7",
- "electron-devtools-installer": "git+https://github.com/MarshallOfSound/electron-devtools-installer.git",
- "electron-notarize": "^1.0.0",
- "electron-rebuild": "^2.3.2",
+ "electron": "19.0.0",
+ "electron-builder": "23.1.0",
+ "electron-devtools-installer": "3.2.0",
+ "electron-notarize": "1.2.1",
+ "electron-rebuild": "3.2.7",
"eslint": "^7.5.0",
"eslint-config-airbnb": "^18.2.0",
"eslint-config-airbnb-typescript": "^12.0.0",
@@ -236,9 +236,9 @@
"caniuse-lite": "1.0.30001214",
"clsx": "^1.1.1",
"date-fns": "2.20.1",
- "electron-debug": "^3.1.0",
- "electron-log": "^4.2.4",
- "electron-updater": "^4.3.4",
+ "electron-debug": "3.2.0",
+ "electron-log": "4.4.8",
+ "electron-updater": "5.0.5",
"electron-windows-badge": "1.1.0",
"history": "^5.0.0",
"less": "4.1.1",
diff --git a/src/index.html b/src/index.html
index 66f5a2a..661d7eb 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,5 +1,5 @@
-
+
Time Tracker
diff --git a/yarn.lock b/yarn.lock
index 1d71393..fb391e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1160,32 +1160,34 @@
ajv "^6.12.0"
ajv-keywords "^3.4.1"
-"@electron/get@^1.0.1":
- version "1.12.2"
- resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3"
- integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==
+"@electron/get@^1.14.1":
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
+ integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
dependencies:
debug "^4.1.1"
env-paths "^2.2.0"
fs-extra "^8.1.0"
got "^9.6.0"
progress "^2.0.3"
- sanitize-filename "^1.6.2"
+ semver "^6.2.0"
sumchecker "^3.0.1"
optionalDependencies:
- global-agent "^2.0.2"
+ global-agent "^3.0.0"
global-tunnel-ng "^2.7.1"
-"@electron/universal@1.0.5":
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37"
- integrity sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag==
+"@electron/universal@1.2.1":
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339"
+ integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==
dependencies:
"@malept/cross-spawn-promise" "^1.1.0"
- asar "^3.0.3"
+ asar "^3.1.0"
debug "^4.3.1"
dir-compare "^2.4.0"
fs-extra "^9.0.1"
+ minimatch "^3.0.4"
+ plist "^3.0.4"
"@emotion/is-prop-valid@^0.7.3":
version "0.7.3"
@@ -1215,6 +1217,11 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"
+"@gar/promisify@^1.0.1":
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
+ integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
+
"@istanbuljs/load-nyc-config@^1.0.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1439,6 +1446,13 @@
dependencies:
cross-spawn "^7.0.1"
+"@malept/cross-spawn-promise@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d"
+ integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==
+ dependencies:
+ cross-spawn "^7.0.1"
+
"@malept/flatpak-bundler@^0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858"
@@ -1470,6 +1484,22 @@
"@nodelib/fs.scandir" "2.1.3"
fastq "^1.6.0"
+"@npmcli/fs@^1.0.0":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
+ integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
+ dependencies:
+ "@gar/promisify" "^1.0.1"
+ semver "^7.3.5"
+
+"@npmcli/move-file@^1.0.1":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+ integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
+ dependencies:
+ mkdirp "^1.0.4"
+ rimraf "^3.0.2"
+
"@pmmmwh/react-refresh-webpack-plugin@^0.4.3":
version "0.4.3"
resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766"
@@ -1627,6 +1657,11 @@
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+"@tootallnate/once@2":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+ integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
"@trysound/sax@0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.1.1.tgz#3348564048e7a2d7398c935d466c0414ebb6a669"
@@ -1675,10 +1710,12 @@
"@types/node" "*"
"@types/responselike" "*"
-"@types/debug@^4.1.5":
- version "4.1.5"
- resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
- integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
+"@types/debug@^4.1.6":
+ version "4.1.7"
+ resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+ integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+ dependencies:
+ "@types/ms" "*"
"@types/eslint-scope@^3.7.0":
version "3.7.0"
@@ -1787,10 +1824,15 @@
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-"@types/node@*", "@types/node@^14.6.2":
- version "14.14.37"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
- integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
+"@types/ms@*":
+ version "0.7.31"
+ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
+"@types/node@*", "@types/node@^16.11.26":
+ version "16.11.41"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.41.tgz#88eb485b1bfdb4c224d878b7832239536aa2f813"
+ integrity sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ==
"@types/node@14.14.10":
version "14.14.10"
@@ -1865,10 +1907,10 @@
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
-"@types/semver@^7.3.1":
- version "7.3.4"
- resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
- integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
+"@types/semver@^7.3.6":
+ version "7.3.10"
+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.10.tgz#5f19ee40cbeff87d916eedc8c2bfe2305d957f73"
+ integrity sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw==
"@types/stack-utils@^2.0.0":
version "2.0.1"
@@ -1907,13 +1949,20 @@
dependencies:
"@types/yargs-parser" "*"
-"@types/yargs@^16.0.0", "@types/yargs@^16.0.2":
+"@types/yargs@^16.0.0":
version "16.0.4"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
dependencies:
"@types/yargs-parser" "*"
+"@types/yargs@^17.0.1":
+ version "17.0.10"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a"
+ integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==
+ dependencies:
+ "@types/yargs-parser" "*"
+
"@typescript-eslint/eslint-plugin@^4.8.1":
version "4.8.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.8.1.tgz#b362abe0ee478a6c6d06c14552a6497f0b480769"
@@ -2303,13 +2352,22 @@ address@^1.0.1:
resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
dependencies:
debug "4"
+agentkeepalive@^4.1.3:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
+ integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+ dependencies:
+ debug "^4.1.0"
+ depd "^1.1.2"
+ humanize-ms "^1.2.1"
+
aggregate-error@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -2382,11 +2440,6 @@ ansi-regex@^2.0.0:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-ansi-regex@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
- integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
ansi-regex@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
@@ -2487,38 +2540,41 @@ anymatch@^3.0.3:
normalize-path "^3.0.0"
picomatch "^2.0.4"
-app-builder-bin@3.5.13:
- version "3.5.13"
- resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e"
- integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==
+app-builder-bin@4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
+ integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
-app-builder-lib@22.11.7:
- version "22.11.7"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6"
- integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==
+app-builder-lib@23.1.0:
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.1.0.tgz#39bab8eb445d06ad9168eb2513c7f267923df2ba"
+ integrity sha512-aZpKjBBLzyxtr4Cmbyi3dl8uRO8SI2PG2MYEKYRZL6pl7IsKP2hJkCYzlD6NjLJlRIAZcFPFjFbJliO74DFf7w==
dependencies:
"7zip-bin" "~5.1.1"
"@develar/schema-utils" "~2.6.5"
- "@electron/universal" "1.0.5"
+ "@electron/universal" "1.2.1"
"@malept/flatpak-bundler" "^0.4.0"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9"
- builder-util "22.11.7"
- builder-util-runtime "8.7.7"
+ builder-util "23.0.9"
+ builder-util-runtime "9.0.2"
chromium-pickle-js "^0.2.0"
- debug "^4.3.2"
- ejs "^3.1.6"
- electron-publish "22.11.7"
- fs-extra "^10.0.0"
- hosted-git-info "^4.0.2"
+ debug "^4.3.4"
+ ejs "^3.1.7"
+ electron-osx-sign "^0.6.0"
+ electron-publish "23.0.9"
+ form-data "^4.0.0"
+ fs-extra "^10.1.0"
+ hosted-git-info "^4.1.0"
is-ci "^3.0.0"
- isbinaryfile "^4.0.8"
+ isbinaryfile "^4.0.10"
js-yaml "^4.1.0"
lazy-val "^1.0.5"
- minimatch "^3.0.4"
+ minimatch "^3.1.2"
read-config-file "6.2.0"
sanitize-filename "^1.6.3"
- semver "^7.3.5"
+ semver "^7.3.7"
+ tar "^6.1.11"
temp-file "^3.4.0"
aproba@^1.0.3:
@@ -2526,6 +2582,19 @@ aproba@^1.0.3:
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+"aproba@^1.0.3 || ^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+ integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
+are-we-there-yet@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
+ integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
+ dependencies:
+ delegates "^1.0.0"
+ readable-stream "^3.6.0"
+
are-we-there-yet@~1.1.2:
version "1.1.5"
resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -2649,10 +2718,10 @@ array.prototype.flatmap@^1.2.3:
es-abstract "^1.18.0-next.1"
function-bind "^1.1.1"
-asar@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
- integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==
+asar@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
+ integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==
dependencies:
chromium-pickle-js "^0.2.0"
commander "^5.0.0"
@@ -2741,11 +2810,6 @@ async-validator@^4.1.0:
resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.2.5.tgz#c96ea3332a521699d0afaaceed510a54656c6339"
integrity sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==
-async@0.9.x:
- version "0.9.2"
- resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
- integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
-
async@^2.6.2:
version "2.6.3"
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
@@ -2753,6 +2817,11 @@ async@^2.6.2:
dependencies:
lodash "^4.17.14"
+async@^3.2.3:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+ integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
+
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -2979,7 +3048,7 @@ bluebird-lst@^1.0.9:
dependencies:
bluebird "^3.5.5"
-bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.5:
version "3.7.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -3171,6 +3240,19 @@ bser@2.1.1:
dependencies:
node-int64 "^0.4.0"
+buffer-alloc-unsafe@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+ integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+ integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+ dependencies:
+ buffer-alloc-unsafe "^1.1.0"
+ buffer-fill "^1.0.0"
+
buffer-crc32@~0.2.3:
version "0.2.13"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -3181,6 +3263,11 @@ buffer-equal@1.0.0:
resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
+buffer-fill@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+ integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
+
buffer-from@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -3213,44 +3300,31 @@ buffer@^5.1.0:
base64-js "^1.3.1"
ieee754 "^1.1.13"
-builder-util-runtime@8.7.2:
- version "8.7.2"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
- integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA==
- dependencies:
- debug "^4.1.1"
- sax "^1.2.4"
-
-builder-util-runtime@8.7.6:
- version "8.7.6"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz#4b43c96db2bd494ced7694bcd7674934655e8324"
- integrity sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug==
- dependencies:
- debug "^4.3.2"
- sax "^1.2.4"
-
-builder-util-runtime@8.7.7:
- version "8.7.7"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d"
- integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==
+builder-util-runtime@9.0.2:
+ version "9.0.2"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz#dc54f8581bbcf1e0428da4483fa46d09524be857"
+ integrity sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA==
dependencies:
- debug "^4.3.2"
+ debug "^4.3.4"
sax "^1.2.4"
-builder-util@22.11.7:
- version "22.11.7"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467"
- integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==
+builder-util@23.0.9:
+ version "23.0.9"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.9.tgz#8b1aeeeee679060e39ad2bd0f50f5b3f3cb53a59"
+ integrity sha512-ccPFwI1Sex4yLt8R3LI+H07p2jHICKwEWtxkFkb6jiU/g/VJnF1wazW7I1oMcCFcPTEl30GhqoRv9rfDD9VAiQ==
dependencies:
"7zip-bin" "~5.1.1"
- "@types/debug" "^4.1.5"
+ "@types/debug" "^4.1.6"
"@types/fs-extra" "^9.0.11"
- app-builder-bin "3.5.13"
+ app-builder-bin "4.0.0"
bluebird-lst "^1.0.9"
- builder-util-runtime "8.7.7"
+ builder-util-runtime "9.0.2"
chalk "^4.1.1"
- debug "^4.3.2"
+ cross-spawn "^7.0.3"
+ debug "^4.3.4"
fs-extra "^10.0.0"
+ http-proxy-agent "^5.0.0"
+ https-proxy-agent "^5.0.0"
is-ci "^3.0.0"
js-yaml "^4.1.0"
source-map-support "^0.5.19"
@@ -3272,6 +3346,30 @@ bytes@3.1.0:
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+cacache@^15.2.0:
+ version "15.3.0"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+ integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
+ dependencies:
+ "@npmcli/fs" "^1.0.0"
+ "@npmcli/move-file" "^1.0.1"
+ chownr "^2.0.0"
+ fs-minipass "^2.0.0"
+ glob "^7.1.4"
+ infer-owner "^1.0.4"
+ lru-cache "^6.0.0"
+ minipass "^3.1.1"
+ minipass-collect "^1.0.2"
+ minipass-flush "^1.0.5"
+ minipass-pipeline "^1.2.2"
+ mkdirp "^1.0.3"
+ p-map "^4.0.0"
+ promise-inflight "^1.0.1"
+ rimraf "^3.0.2"
+ ssri "^8.0.1"
+ tar "^6.0.2"
+ unique-filename "^1.1.1"
+
cache-base@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -3411,7 +3509,7 @@ chalk@^2.0.0, chalk@^2.4.2:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3443,11 +3541,6 @@ chokidar@^2.1.8:
optionalDependencies:
fsevents "^1.2.7"
-chownr@^1.1.1:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
- integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
chownr@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -3525,14 +3618,6 @@ cli-spinners@^2.4.0:
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047"
integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==
-cli-truncate@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086"
- integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==
- dependencies:
- slice-ansi "^1.0.0"
- string-width "^2.0.0"
-
cli-truncate@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
@@ -3632,6 +3717,11 @@ color-name@~1.1.4:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+color-support@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+ integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
colord@^2.0.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/colord/-/colord-2.1.0.tgz#28cd9d6ac874dff97ef5ec1432c5c0b4e58e49c7"
@@ -3647,11 +3737,6 @@ colors@1.0.3:
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
-colors@^1.3.3:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
- integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
version "1.0.8"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3701,6 +3786,11 @@ commondir@^1.0.1:
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+compare-version@^0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
+ integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==
+
compare-versions@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
@@ -3801,10 +3891,10 @@ console-browserify@^1.1.0:
resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
- integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+ integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
constants-browserify@^1.0.0:
version "1.0.0"
@@ -4205,17 +4295,17 @@ dayjs@1.x:
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
dependencies:
ms "2.0.0"
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2:
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
- integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4:
+ version "4.3.4"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+ integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"
@@ -4364,10 +4454,10 @@ delegates@^1.0.0:
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-depd@~1.1.2:
+depd@^1.1.2, depd@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
- integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+ integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
des.js@^1.0.0:
version "1.0.1"
@@ -4382,7 +4472,7 @@ destroy@~1.0.4:
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-detect-libc@^1.0.2, detect-libc@^1.0.3:
+detect-libc@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@@ -4441,32 +4531,31 @@ dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"
-dmg-builder@22.11.7:
- version "22.11.7"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89"
- integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==
+dmg-builder@23.1.0:
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.1.0.tgz#94426db22b762e7ffc61f0da1f68d385059a20ed"
+ integrity sha512-CzhPk/k12nJ2KqTbePkIwHOLiaWneQu2cgXCT9Hb5FhwI1vxTPalLsg8OZ57wKCrkL8AEftqqSff8gB5yWY/xw==
dependencies:
- app-builder-lib "22.11.7"
- builder-util "22.11.7"
- builder-util-runtime "8.7.6"
+ app-builder-lib "23.1.0"
+ builder-util "23.0.9"
+ builder-util-runtime "9.0.2"
fs-extra "^10.0.0"
iconv-lite "^0.6.2"
js-yaml "^4.1.0"
optionalDependencies:
- dmg-license "^1.0.9"
+ dmg-license "^1.0.11"
-dmg-license@^1.0.9:
- version "1.0.9"
- resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"
- integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q==
+dmg-license@^1.0.11:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a"
+ integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==
dependencies:
"@types/plist" "^3.0.1"
"@types/verror" "^1.10.3"
ajv "^6.10.0"
- cli-truncate "^1.1.0"
crc "^3.8.0"
- iconv-corefoundation "^1.1.6"
- plist "^3.0.1"
+ iconv-corefoundation "^1.1.7"
+ plist "^3.0.4"
smart-buffer "^4.0.2"
verror "^1.10.0"
@@ -4618,24 +4707,24 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-ejs@^3.1.5, ejs@^3.1.6:
- version "3.1.6"
- resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
- integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
+ejs@^3.1.5, ejs@^3.1.7:
+ version "3.1.8"
+ resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
+ integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
dependencies:
- jake "^10.6.1"
+ jake "^10.8.5"
-electron-builder@^22.11.7:
- version "22.11.7"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596"
- integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==
+electron-builder@23.1.0:
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.1.0.tgz#fdd213387008e44ab7dcabe53b84dbd969c1a7cc"
+ integrity sha512-UEblaQY8N9m8/HriOwl7jgFJ4olpWDXwdDBqwUkQiRHVNRnCfrA0u8LV03li5ZYhma6zFWzfIZbHd+uk8y//lQ==
dependencies:
- "@types/yargs" "^16.0.2"
- app-builder-lib "22.11.7"
- builder-util "22.11.7"
- builder-util-runtime "8.7.7"
+ "@types/yargs" "^17.0.1"
+ app-builder-lib "23.1.0"
+ builder-util "23.0.9"
+ builder-util-runtime "9.0.2"
chalk "^4.1.1"
- dmg-builder "22.11.7"
+ dmg-builder "23.1.0"
fs-extra "^10.0.0"
is-ci "^3.0.0"
lazy-val "^1.0.5"
@@ -4643,17 +4732,18 @@ electron-builder@^22.11.7:
update-notifier "^5.1.0"
yargs "^17.0.1"
-electron-debug@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.1.0.tgz#0df17297487fa3c82344d810812853bf67f0bd69"
- integrity sha512-SWEqLj4MgfV3tGuO5eBLQ5/Nr6M+KPxsnE0bUJZvQebGJus6RAcdmvd7L+l0Ji31h2mmrN23l2tHFtCa2FvurA==
+electron-debug@3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.2.0.tgz#46a15b555c3b11872218c65ea01d058aa0814920"
+ integrity sha512-7xZh+LfUvJ52M9rn6N+tPuDw6oRAjxUj9SoxAZfJ0hVCXhZCsdkrSt7TgXOiWiEOBgEV8qwUIO/ScxllsPS7ow==
dependencies:
electron-is-dev "^1.1.0"
electron-localshortcut "^3.1.0"
-"electron-devtools-installer@git+https://github.com/MarshallOfSound/electron-devtools-installer.git":
- version "0.0.0-development"
- resolved "git+https://github.com/MarshallOfSound/electron-devtools-installer.git#19fd4dde8a8e3eb8a50ba4ca242bf3b52e878436"
+electron-devtools-installer@3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.2.0.tgz#acc48d24eb7033fe5af284a19667e73b78d406d0"
+ integrity sha512-t3UczsYugm4OAbqvdImMCImIMVdFzJAHgbwHpkl5jmfu1izVgUcP/mnrPqJIpEeCK1uZGpt+yHgWEN+9EwoYhQ==
dependencies:
rimraf "^3.0.2"
semver "^7.2.1"
@@ -4680,80 +4770,96 @@ electron-localshortcut@^3.1.0:
keyboardevent-from-electron-accelerator "^2.0.0"
keyboardevents-areequal "^0.2.1"
-electron-log@^4.2.4:
- version "4.3.5"
- resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.3.5.tgz#2aad5f93842b9b5214a1b4a10e47b5ac5c9ec104"
- integrity sha512-J5Ew3axdk7W4jzzxKLSAi1sqbcAoo9CzHuBVsG0tT47j256xKulNrWFf3lZmHJ1KDXOQUcuwOngQF0jjmpEdpw==
+electron-log@4.4.8:
+ version "4.4.8"
+ resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.8.tgz#fcb9f714dbcaefb6ac7984c4683912c74730248a"
+ integrity sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA==
-electron-notarize@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"
- integrity sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==
+electron-notarize@1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.2.1.tgz#347c18eca8e29dddadadee511b870c13d4008baf"
+ integrity sha512-u/ECWhIrhkSQpZM4cJzVZ5TsmkaqrRo5LDC/KMbGF0sPkm53Ng59+M0zp8QVaql0obfJy9vlVT+4iOkAi2UDlA==
dependencies:
debug "^4.1.1"
fs-extra "^9.0.1"
-electron-publish@22.11.7:
- version "22.11.7"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a"
- integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==
+electron-osx-sign@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8"
+ integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==
+ dependencies:
+ bluebird "^3.5.0"
+ compare-version "^0.1.2"
+ debug "^2.6.8"
+ isbinaryfile "^3.0.2"
+ minimist "^1.2.0"
+ plist "^3.0.1"
+
+electron-publish@23.0.9:
+ version "23.0.9"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.9.tgz#5b098dafab5d830b7c8bcd18b5a499164c51fa6b"
+ integrity sha512-afr2z6L07/elgDX+6I/G/0vzXOP6xYUd/aXx9tnTPSVZ/3AuvCegHrKiuh8sKYHmzoAcNGXe3ikISYIu961IfA==
dependencies:
"@types/fs-extra" "^9.0.11"
- builder-util "22.11.7"
- builder-util-runtime "8.7.7"
+ builder-util "23.0.9"
+ builder-util-runtime "9.0.2"
chalk "^4.1.1"
fs-extra "^10.0.0"
lazy-val "^1.0.5"
mime "^2.5.2"
-electron-rebuild@^2.3.2:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-2.3.2.tgz#42da553a1e4e844ae4d3c3b97e42be836b2924b3"
- integrity sha512-VLd3iIn65PmYWmvL+nx0oKspbohkDUhCAz8I2EWbMJcOFzWKW1UXJZ+ZG53iEDJFldm9PahE4q2Bx3ns4bdzeQ==
+electron-rebuild@3.2.7:
+ version "3.2.7"
+ resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.7.tgz#0f56c1cc99a6fec0a5b990532283c2a8c838c19b"
+ integrity sha512-WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==
dependencies:
- "@malept/cross-spawn-promise" "^1.1.0"
- colors "^1.3.3"
+ "@malept/cross-spawn-promise" "^2.0.0"
+ chalk "^4.0.0"
debug "^4.1.1"
detect-libc "^1.0.3"
- fs-extra "^9.0.1"
+ fs-extra "^10.0.0"
got "^11.7.0"
- lzma-native "^6.0.1"
- node-abi "^2.19.1"
- node-gyp "^7.1.0"
+ lzma-native "^8.0.5"
+ node-abi "^3.0.0"
+ node-api-version "^0.1.4"
+ node-gyp "^8.4.0"
ora "^5.1.0"
+ semver "^7.3.5"
tar "^6.0.5"
- yargs "^16.0.0"
+ yargs "^17.0.1"
electron-to-chromium@^1.3.896:
version "1.4.4"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.4.tgz#57311918524c1a26878c330537f967804d43788a"
integrity sha512-teHtgwcmVcL46jlFvAaqjyiTLWuMrUQO1JqV303JKB4ysXG6m8fXSFhbjal9st0r9mNskI22AraJZorb1VcLVg==
-electron-updater@^4.3.4:
- version "4.3.5"
- resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.5.tgz#4fb36f593a031c87ea07ee141c9f064d5deffb15"
- integrity sha512-5jjN7ebvfj1cLI0VZMdCnJk6aC4bP+dy7ryBf21vArR0JzpRVk0OZHA2QBD+H5rm6ZSeDYHOY6+8PrMEqJ4wlQ==
+electron-updater@5.0.5:
+ version "5.0.5"
+ resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-5.0.5.tgz#efc025a1777fc0a9c6f9f20ef70037b727e989fb"
+ integrity sha512-YcKEI9zpU+c0sNXTpjw3UpzP8Pfuuwo70T42oLYm0hHc0dy41ih51oENlhxgooa2+uzzpXhoCOyrpG+w6CB0Pw==
dependencies:
- "@types/semver" "^7.3.1"
- builder-util-runtime "8.7.2"
- fs-extra "^9.0.1"
- js-yaml "^3.14.0"
- lazy-val "^1.0.4"
+ "@types/semver" "^7.3.6"
+ builder-util-runtime "9.0.2"
+ fs-extra "^10.0.0"
+ js-yaml "^4.1.0"
+ lazy-val "^1.0.5"
+ lodash.escaperegexp "^4.1.2"
lodash.isequal "^4.5.0"
- semver "^7.3.2"
+ semver "^7.3.5"
+ typed-emitter "^2.1.0"
electron-windows-badge@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/electron-windows-badge/-/electron-windows-badge-1.1.0.tgz#cbc874c685e76da42b63565b8bc83eab7c65b961"
integrity sha512-hWFbUk9u3fQHcKzTAcjZAN7XH9bL9oH9g20RRDU/DVDNqdMI03GzlBZfR/R8R1krYu9AT4biLqSCAxnt9LMAfA==
-electron@^12.0.2:
- version "12.0.2"
- resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.2.tgz#d92be205f1937627bd6718aad44ac161382b4c2d"
- integrity sha512-14luh9mGzfL4e0sncyy0+kW37IU7Y0Y1tvI97FDRSW0ZBQxi5cmAwSs5dmPmNBFBIGtzkaGaEB01j9RjZuCmow==
+electron@19.0.0:
+ version "19.0.0"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.0.tgz#f6b742b708ec118676ba3b38d0f3712d8f0311cf"
+ integrity sha512-VXwqLQxuIUr0SI8vOYDj5OLPwtKa/trn5DVKd/BFGT/U/IerfVoSZuydGLOjSL5yJlckfmKQpiq+8PW4gI8hXA==
dependencies:
- "@electron/get" "^1.0.1"
- "@types/node" "^14.6.2"
+ "@electron/get" "^1.14.1"
+ "@types/node" "^16.11.26"
extract-zip "^1.0.3"
elliptic@^6.5.3:
@@ -4804,6 +4910,13 @@ encodeurl@^1.0.2, encodeurl@~1.0.2:
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+encoding@^0.1.12:
+ version "0.1.13"
+ resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+ integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+ dependencies:
+ iconv-lite "^0.6.2"
+
end-of-stream@^1.1.0:
version "1.4.4"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -4850,6 +4963,11 @@ envinfo@^7.7.3:
resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc"
integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==
+err-code@^2.0.2:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+ integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
errno@^0.1.1, errno@^0.1.3:
version "0.1.8"
resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
@@ -5687,6 +5805,15 @@ form-data@^3.0.0:
combined-stream "^1.0.8"
mime-types "^2.1.12"
+form-data@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+ integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ mime-types "^2.1.12"
+
form-data@~2.3.2:
version "2.3.3"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -5713,10 +5840,10 @@ fresh@0.5.2:
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-fs-extra@^10.0.0:
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
- integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+fs-extra@^10.0.0, fs-extra@^10.1.0:
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+ integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
dependencies:
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
@@ -5741,13 +5868,6 @@ fs-extra@^9.0.0, fs-extra@^9.0.1:
jsonfile "^6.0.1"
universalify "^2.0.0"
-fs-minipass@^1.2.5:
- version "1.2.7"
- resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
- integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
- dependencies:
- minipass "^2.6.0"
-
fs-minipass@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -5783,6 +5903,20 @@ functional-red-black-tree@^1.0.1:
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+gauge@^4.0.3:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+ integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+ dependencies:
+ aproba "^1.0.3 || ^2.0.0"
+ color-support "^1.1.3"
+ console-control-strings "^1.1.0"
+ has-unicode "^2.0.1"
+ signal-exit "^3.0.7"
+ string-width "^4.2.3"
+ strip-ansi "^6.0.1"
+ wide-align "^1.1.5"
+
gauge@~2.7.3:
version "2.7.4"
resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -5918,13 +6052,12 @@ glob@~7.1.1:
once "^1.3.0"
path-is-absolute "^1.0.0"
-global-agent@^2.0.2:
- version "2.1.12"
- resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
- integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
+global-agent@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
+ integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
dependencies:
boolean "^3.0.1"
- core-js "^3.6.5"
es6-error "^4.1.1"
matcher "^3.0.0"
roarr "^2.15.3"
@@ -6033,10 +6166,10 @@ got@^9.6.0:
to-readable-stream "^1.0.0"
url-parse-lax "^3.0.0"
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
- version "4.2.4"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
- integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
+ version "4.2.10"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+ integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
"graceful-readlink@>= 1.0.0":
version "1.0.1"
@@ -6096,10 +6229,10 @@ has-symbols@^1.0.1:
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-has-unicode@^2.0.0:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
- integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+ integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
has-value@^0.3.1:
version "0.3.1"
@@ -6206,10 +6339,10 @@ hosted-git-info@^2.1.4:
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
-hosted-git-info@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
- integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
+hosted-git-info@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+ integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
dependencies:
lru-cache "^6.0.0"
@@ -6250,7 +6383,7 @@ html-escaper@^2.0.0:
resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-http-cache-semantics@^4.0.0:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
@@ -6306,6 +6439,15 @@ http-proxy-agent@^4.0.1:
agent-base "6"
debug "4"
+http-proxy-agent@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+ integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+ dependencies:
+ "@tootallnate/once" "2"
+ agent-base "6"
+ debug "4"
+
http-proxy-middleware@0.19.1:
version "0.19.1"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -6365,6 +6507,13 @@ human-signals@^2.1.0:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+humanize-ms@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+ integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
+ dependencies:
+ ms "^2.0.0"
+
husky@^4.2.5:
version "4.3.0"
resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de"
@@ -6386,12 +6535,12 @@ hyphenate-style-name@^1.0.3:
resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
-iconv-corefoundation@^1.1.6:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a"
- integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw==
+iconv-corefoundation@^1.1.7:
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a"
+ integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==
dependencies:
- cli-truncate "^1.1.0"
+ cli-truncate "^2.1.0"
node-addon-api "^1.6.3"
iconv-lite@0.4.24, iconv-lite@^0.4.4:
@@ -6425,13 +6574,6 @@ ieee754@^1.1.13, ieee754@^1.1.4:
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-ignore-walk@^3.0.1:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
- integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
- dependencies:
- minimatch "^3.0.4"
-
ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -6505,6 +6647,11 @@ indent-string@^4.0.0:
resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+infer-owner@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+ integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6772,6 +6919,11 @@ is-interactive@^1.0.0:
resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+is-lambda@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+ integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
+
is-negative-zero@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
@@ -6919,10 +7071,17 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-isbinaryfile@^4.0.8:
- version "4.0.8"
- resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
- integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
+isbinaryfile@^3.0.2:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+ integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+ dependencies:
+ buffer-alloc "^1.2.0"
+
+isbinaryfile@^4.0.10:
+ version "4.0.10"
+ resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
+ integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
isexe@^2.0.0:
version "2.0.0"
@@ -6998,13 +7157,13 @@ istanbul-reports@^3.0.2:
html-escaper "^2.0.0"
istanbul-lib-report "^3.0.0"
-jake@^10.6.1:
- version "10.8.2"
- resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
- integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+jake@^10.8.5:
+ version "10.8.5"
+ resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
+ integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
dependencies:
- async "0.9.x"
- chalk "^2.4.2"
+ async "^3.2.3"
+ chalk "^4.0.2"
filelist "^1.0.1"
minimatch "^3.0.4"
@@ -7498,7 +7657,7 @@ js-base64@^2.1.8:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-yaml@^3.13.1, js-yaml@^3.14.0:
+js-yaml@^3.13.1:
version "3.14.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
@@ -8061,6 +8220,11 @@ locate-path@^5.0.0:
dependencies:
p-locate "^4.1.0"
+lodash.escaperegexp@^4.1.2:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
+ integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==
+
lodash.isequal@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -8140,15 +8304,14 @@ lru_map@^0.3.3:
resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=
-lzma-native@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-6.0.1.tgz#eec231d31b9f9ba5aea5afc86326669f01dedb58"
- integrity sha512-O6oWF0xe1AFvOCjU8uOZBZ/lhjaMNwHfVNaqVMqmoQXlRwBcFWpCAToiZOdXcKVMdo/5s/D0a2QgA5laMErxHQ==
+lzma-native@^8.0.5:
+ version "8.0.6"
+ resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665"
+ integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA==
dependencies:
- node-addon-api "^1.6.0"
- node-pre-gyp "^0.11.0"
- readable-stream "^2.3.5"
- rimraf "^2.7.1"
+ node-addon-api "^3.1.0"
+ node-gyp-build "^4.2.1"
+ readable-stream "^3.6.0"
make-dir@^2.0.0, make-dir@^2.1.0:
version "2.1.0"
@@ -8165,6 +8328,28 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
dependencies:
semver "^6.0.0"
+make-fetch-happen@^9.1.0:
+ version "9.1.0"
+ resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+ integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
+ dependencies:
+ agentkeepalive "^4.1.3"
+ cacache "^15.2.0"
+ http-cache-semantics "^4.1.0"
+ http-proxy-agent "^4.0.1"
+ https-proxy-agent "^5.0.0"
+ is-lambda "^1.0.1"
+ lru-cache "^6.0.0"
+ minipass "^3.1.3"
+ minipass-collect "^1.0.2"
+ minipass-fetch "^1.3.2"
+ minipass-flush "^1.0.5"
+ minipass-pipeline "^1.2.4"
+ negotiator "^0.6.2"
+ promise-retry "^2.0.1"
+ socks-proxy-agent "^6.0.0"
+ ssri "^8.0.0"
+
makeerror@1.0.12:
version "1.0.12"
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -8385,41 +8570,72 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@3.0.4, minimatch@~3.0.2:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
dependencies:
brace-expansion "^1.1.7"
+minimatch@^3.0.4, minimatch@^3.1.2:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+ integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+ dependencies:
+ brace-expansion "^1.1.7"
+
minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
- version "2.9.0"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
- integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+minipass-collect@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+ integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
dependencies:
- safe-buffer "^5.1.2"
- yallist "^3.0.0"
+ minipass "^3.0.0"
-minipass@^3.0.0:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
- integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+minipass-fetch@^1.3.2:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+ integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
dependencies:
- yallist "^4.0.0"
+ minipass "^3.1.0"
+ minipass-sized "^1.0.3"
+ minizlib "^2.0.0"
+ optionalDependencies:
+ encoding "^0.1.12"
-minizlib@^1.2.1:
- version "1.3.3"
- resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
- integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+minipass-flush@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+ integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+ dependencies:
+ minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+ integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+ dependencies:
+ minipass "^3.0.0"
+
+minipass-sized@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+ integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+ dependencies:
+ minipass "^3.0.0"
+
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.3.tgz#fd1f0e6c06449c10dadda72618b59c00f3d6378d"
+ integrity sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA==
dependencies:
- minipass "^2.9.0"
+ yallist "^4.0.0"
-minizlib@^2.1.1:
+minizlib@^2.0.0, minizlib@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -8435,7 +8651,7 @@ mixin-deep@^1.2.0:
for-in "^1.0.2"
is-extendable "^1.0.1"
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5:
version "0.5.5"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -8484,11 +8700,16 @@ ms@2.1.1:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-ms@2.1.2, ms@^2.1.1:
+ms@2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+ms@^2.0.0, ms@^2.1.1:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+ integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
multicast-dns-service-types@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -8546,7 +8767,7 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-needle@^2.2.1, needle@^2.5.2:
+needle@^2.5.2:
version "2.6.0"
resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe"
integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==
@@ -8560,6 +8781,11 @@ negotiator@0.6.2:
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+negotiator@^0.6.2:
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+ integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
neo-async@^2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -8570,23 +8796,40 @@ nice-try@^1.0.4:
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-node-abi@^2.19.1:
- version "2.19.3"
- resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d"
- integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==
+node-abi@^3.0.0:
+ version "3.22.0"
+ resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.22.0.tgz#00b8250e86a0816576258227edbce7bbe0039362"
+ integrity sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==
dependencies:
- semver "^5.4.1"
+ semver "^7.3.5"
-node-addon-api@^1.6.0, node-addon-api@^1.6.3:
+node-addon-api@^1.6.3:
version "1.7.2"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
+node-addon-api@^3.1.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+ integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
+node-api-version@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080"
+ integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==
+ dependencies:
+ semver "^7.3.5"
+
node-forge@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+node-gyp-build@^4.2.1:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4"
+ integrity sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==
+
node-gyp@^7.1.0:
version "7.1.2"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
@@ -8603,6 +8846,22 @@ node-gyp@^7.1.0:
tar "^6.0.2"
which "^2.0.2"
+node-gyp@^8.4.0:
+ version "8.4.1"
+ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
+ integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
+ dependencies:
+ env-paths "^2.2.0"
+ glob "^7.1.4"
+ graceful-fs "^4.2.6"
+ make-fetch-happen "^9.1.0"
+ nopt "^5.0.0"
+ npmlog "^6.0.0"
+ rimraf "^3.0.2"
+ semver "^7.3.5"
+ tar "^6.1.2"
+ which "^2.0.2"
+
node-int64@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -8642,22 +8901,6 @@ node-modules-regexp@^1.0.0:
resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
-node-pre-gyp@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054"
- integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==
- dependencies:
- detect-libc "^1.0.2"
- mkdirp "^0.5.1"
- needle "^2.2.1"
- nopt "^4.0.1"
- npm-packlist "^1.1.6"
- npmlog "^4.0.2"
- rc "^1.2.7"
- rimraf "^2.6.1"
- semver "^5.3.0"
- tar "^4"
-
node-releases@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
@@ -8685,14 +8928,6 @@ node-sass@^5.0.0:
stdout-stream "^1.4.0"
"true-case-path" "^1.0.2"
-nopt@^4.0.1:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
- integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
- dependencies:
- abbrev "1"
- osenv "^0.1.4"
-
nopt@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -8732,13 +8967,6 @@ normalize-url@^6.0.1:
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
-npm-bundled@^1.0.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
- integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
- dependencies:
- npm-normalize-package-bin "^1.0.1"
-
npm-conf@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
@@ -8747,20 +8975,6 @@ npm-conf@^1.1.3:
config-chain "^1.1.11"
pify "^3.0.0"
-npm-normalize-package-bin@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
- integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
- version "1.4.8"
- resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
- integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
- dependencies:
- ignore-walk "^3.0.1"
- npm-bundled "^1.0.1"
- npm-normalize-package-bin "^1.0.1"
-
npm-run-path@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -8775,7 +8989,7 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1:
dependencies:
path-key "^3.0.0"
-npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
+npmlog@^4.0.0, npmlog@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -8785,6 +8999,16 @@ npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
gauge "~2.7.3"
set-blocking "~2.0.0"
+npmlog@^6.0.0:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+ integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+ dependencies:
+ are-we-there-yet "^3.0.0"
+ console-control-strings "^1.1.0"
+ gauge "^4.0.3"
+ set-blocking "^2.0.0"
+
nth-check@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
@@ -8990,24 +9214,6 @@ os-browserify@^0.3.0:
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-os-homedir@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
- integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-tmpdir@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
- integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@^0.1.4:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
- integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
- dependencies:
- os-homedir "^1.0.0"
- os-tmpdir "^1.0.0"
-
p-cancelable@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
@@ -9350,14 +9556,13 @@ please-upgrade-node@^3.2.0:
dependencies:
semver-compare "^1.0.0"
-plist@^3.0.1:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc"
- integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==
+plist@^3.0.1, plist@^3.0.4:
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
+ integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==
dependencies:
base64-js "^1.5.1"
xmlbuilder "^9.0.7"
- xmldom "^0.5.0"
portfinder@^1.0.26:
version "1.0.28"
@@ -9693,6 +9898,19 @@ progress@^2.0.0, progress@^2.0.3:
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+promise-inflight@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+ integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
+
+promise-retry@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+ integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+ dependencies:
+ err-code "^2.0.2"
+ retry "^0.12.0"
+
prompts@^2.0.1:
version "2.4.2"
resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
@@ -10182,7 +10400,7 @@ rc-upload@~4.3.0:
classnames "^2.2.5"
rc-util "^5.2.0"
-rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
+rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
version "5.22.5"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.22.5.tgz#d4d6d886c5ecb6a2a51dde1840d780a2b70f5179"
integrity sha512-awD2TGMGU97OZftT2R3JwrHWjR8k/xIwqjwcivPskciweUdgXE7QsyXkBKVSBHXS+c17AWWMDWuKWsJSheQy8g==
@@ -10200,7 +10418,7 @@ rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8:
rc-resize-observer "^1.0.0"
rc-util "^5.15.0"
-rc@^1.2.7, rc@^1.2.8:
+rc@^1.2.8:
version "1.2.8"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -10350,7 +10568,7 @@ read-pkg@^4.0.1:
parse-json "^4.0.0"
pify "^3.0.0"
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
version "2.3.7"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -10663,7 +10881,7 @@ rimraf@2.6.3:
dependencies:
glob "^7.1.3"
-rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.6.3:
version "2.7.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -10714,6 +10932,13 @@ rxjs@^6.5.2, rxjs@^6.6.3:
dependencies:
tslib "^1.9.0"
+rxjs@^7.5.2:
+ version "7.5.5"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
+ integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
+ dependencies:
+ tslib "^2.1.0"
+
safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -10751,7 +10976,7 @@ sane@^4.0.3:
minimist "^1.1.1"
walker "~1.0.5"
-sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
+sanitize-filename@^1.6.3:
version "1.6.3"
resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
@@ -10869,7 +11094,7 @@ semver-regex@^2.0.0:
resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.1:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -10889,10 +11114,10 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
- version "7.3.5"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
- integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+ version "7.3.7"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+ integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
dependencies:
lru-cache "^6.0.0"
@@ -11044,10 +11269,10 @@ side-channel@^1.0.2:
es-abstract "^1.18.0-next.0"
object-inspect "^1.8.0"
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
- version "3.0.6"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
- integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+ version "3.0.7"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+ integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
sisteransi@^1.0.5:
version "1.0.5"
@@ -11059,13 +11284,6 @@ slash@^3.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-slice-ansi@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
- integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
- dependencies:
- is-fullwidth-code-point "^2.0.0"
-
slice-ansi@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -11093,10 +11311,10 @@ slice-ansi@^4.0.0:
astral-regex "^2.0.0"
is-fullwidth-code-point "^3.0.0"
-smart-buffer@^4.0.2:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
- integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
+smart-buffer@^4.0.2, smart-buffer@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+ integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
snapdragon-node@^2.0.1:
version "2.1.1"
@@ -11149,6 +11367,23 @@ sockjs@^0.3.21:
uuid "^3.4.0"
websocket-driver "^0.7.4"
+socks-proxy-agent@^6.0.0:
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+ integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
+ dependencies:
+ agent-base "^6.0.2"
+ debug "^4.3.3"
+ socks "^2.6.2"
+
+socks@^2.6.2:
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
+ integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
+ dependencies:
+ ip "^1.1.5"
+ smart-buffer "^4.2.0"
+
source-list-map@^2.0.0, source-list-map@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -11291,6 +11526,13 @@ sshpk@^1.7.0:
safer-buffer "^2.0.2"
tweetnacl "~0.14.0"
+ssri@^8.0.0, ssri@^8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+ integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+ dependencies:
+ minipass "^3.1.1"
+
stable@^0.1.8:
version "0.1.8"
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -11379,13 +11621,14 @@ string-width@^1.0.1:
is-fullwidth-code-point "^1.0.0"
strip-ansi "^3.0.0"
-"string-width@^1.0.2 || 2", string-width@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
- integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
- is-fullwidth-code-point "^2.0.0"
- strip-ansi "^4.0.0"
+ emoji-regex "^8.0.0"
+ is-fullwidth-code-point "^3.0.0"
+ strip-ansi "^6.0.1"
string-width@^3.0.0, string-width@^3.1.0:
version "3.1.0"
@@ -11396,15 +11639,6 @@ string-width@^3.0.0, string-width@^3.1.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
- integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
- dependencies:
- emoji-regex "^8.0.0"
- is-fullwidth-code-point "^3.0.0"
- strip-ansi "^6.0.0"
-
string.prototype.matchall@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
@@ -11463,13 +11697,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
dependencies:
ansi-regex "^2.0.0"
-strip-ansi@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
- integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
- dependencies:
- ansi-regex "^3.0.0"
-
strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -11477,12 +11704,12 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
dependencies:
ansi-regex "^4.1.0"
-strip-ansi@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
- integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
- ansi-regex "^5.0.0"
+ ansi-regex "^5.0.1"
strip-bom@^2.0.0:
version "2.0.0"
@@ -11645,23 +11872,10 @@ tapable@^2.0.0:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.1.1.tgz#b01cc1902d42a7bb30514e320ce21c456f72fd3f"
integrity sha512-Wib1S8m2wdpLbmQz0RBEVosIyvb/ykfKXf3ZIDqvWoMg/zTNm6G/tDSuUM61J1kNCDXWJrLHGSFeMhAG+gAGpQ==
-tar@^4:
- version "4.4.13"
- resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
- integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
- dependencies:
- chownr "^1.1.1"
- fs-minipass "^1.2.5"
- minipass "^2.8.6"
- minizlib "^1.2.1"
- mkdirp "^0.5.0"
- safe-buffer "^5.1.2"
- yallist "^3.0.3"
-
-tar@^6.0.2, tar@^6.0.5:
- version "6.0.5"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
- integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
+tar@^6.0.2, tar@^6.0.5, tar@^6.1.11, tar@^6.1.2:
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+ integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -11988,6 +12202,13 @@ type-is@~1.6.17, type-is@~1.6.18:
media-typer "0.3.0"
mime-types "~2.1.24"
+typed-emitter@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/typed-emitter/-/typed-emitter-2.1.0.tgz#ca78e3d8ef1476f228f548d62e04e3d4d3fd77fb"
+ integrity sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==
+ optionalDependencies:
+ rxjs "^7.5.2"
+
typedarray-to-buffer@^3.1.5:
version "3.1.5"
resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -12048,6 +12269,20 @@ uniqs@^2.0.0:
resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
+unique-filename@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+ integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+ dependencies:
+ unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+ integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+ dependencies:
+ imurmurhash "^0.1.4"
+
unique-string@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -12527,12 +12762,12 @@ which@^2.0.1, which@^2.0.2:
dependencies:
isexe "^2.0.0"
-wide-align@^1.1.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
- integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+wide-align@^1.1.0, wide-align@^1.1.5:
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+ integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
dependencies:
- string-width "^1.0.2 || 2"
+ string-width "^1.0.2 || 2 || 3 || 4"
widest-line@^3.1.0:
version "3.1.0"
@@ -12645,11 +12880,6 @@ xmlchars@^2.2.0:
resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
-xmldom@^0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e"
- integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==
-
xtend@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -12670,11 +12900,6 @@ yaku@^0.16.6:
resolved "https://registry.yarnpkg.com/yaku/-/yaku-0.16.7.tgz#1d195c78aa9b5bf8479c895b9504fd4f0847984e"
integrity sha1-HRlceKqbW/hHnIlblQT9TwhHmE4=
-yallist@^3.0.0, yallist@^3.0.3:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
- integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
yallist@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
@@ -12714,7 +12939,7 @@ yargs@^13.3.0, yargs@^13.3.2:
y18n "^4.0.0"
yargs-parser "^13.1.2"
-yargs@^16.0.0, yargs@^16.2.0:
+yargs@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
From b929040e2bb0e3be3c47cfe820927756759a2ad4 Mon Sep 17 00:00:00 2001
From: yadro
Date: Tue, 12 Jul 2022 00:00:10 +0300
Subject: [PATCH 10/20] Menu fixes
---
src/menu.ts | 164 ++++++++++-------------------------------------
src/package.json | 2 +-
2 files changed, 34 insertions(+), 132 deletions(-)
diff --git a/src/menu.ts b/src/menu.ts
index 66f3381..b0b949a 100644
--- a/src/menu.ts
+++ b/src/menu.ts
@@ -1,5 +1,4 @@
import {
- app,
Menu,
shell,
BrowserWindow,
@@ -11,6 +10,9 @@ interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
submenu?: DarwinMenuItemConstructorOptions[] | Menu;
}
+const isDev =
+ process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true';
+
export default class MenuBuilder {
mainWindow: BrowserWindow;
@@ -27,10 +29,8 @@ export default class MenuBuilder {
}
const template =
- process.platform === 'darwin'
- ? this.buildDarwinTemplate()
- : [];
- // : this.buildDefaultTemplate(); // Disable menu for Win and Linux
+ process.platform === 'darwin' ? this.buildDarwinTemplate() : [];
+ // : this.buildDefaultTemplate(); // Disable menu for Win and Linux
const menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu);
@@ -54,143 +54,45 @@ export default class MenuBuilder {
}
buildDarwinTemplate(): MenuItemConstructorOptions[] {
- const subMenuAbout: DarwinMenuItemConstructorOptions = {
- label: 'Electron',
+ const none = [] as any;
+ const subMenuApp: DarwinMenuItemConstructorOptions = {
+ label: 'TimeTracker',
submenu: [
- {
- label: 'About ElectronReact',
- selector: 'orderFrontStandardAboutPanel:',
- },
- { type: 'separator' },
- { label: 'Services', submenu: [] },
- { type: 'separator' },
- {
- label: 'Hide ElectronReact',
- accelerator: 'Command+H',
- selector: 'hide:',
- },
- {
- label: 'Hide Others',
- accelerator: 'Command+Shift+H',
- selector: 'hideOtherApplications:',
- },
- { label: 'Show All', selector: 'unhideAllApplications:' },
+ { role: 'about' },
+ ...(isDev ? [{ type: 'separator' }, { role: 'services' }] : none),
{ type: 'separator' },
- {
- label: 'Quit',
- accelerator: 'Command+Q',
- click: () => {
- app.quit();
- },
- },
- ],
- };
- const subMenuEdit: DarwinMenuItemConstructorOptions = {
- label: 'Edit',
- submenu: [
- { label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },
- { label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },
+ { role: 'hide' },
+ { role: 'hideOthers' },
+ { role: 'unhide' },
{ type: 'separator' },
- { label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },
- { label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },
- { label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },
- {
- label: 'Select All',
- accelerator: 'Command+A',
- selector: 'selectAll:',
- },
- ],
- };
- const subMenuViewDev: MenuItemConstructorOptions = {
- label: 'View',
- submenu: [
- {
- label: 'Reload',
- accelerator: 'Command+R',
- click: () => {
- this.mainWindow.webContents.reload();
- },
- },
- {
- label: 'Toggle Full Screen',
- accelerator: 'Ctrl+Command+F',
- click: () => {
- this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
- },
- },
- {
- label: 'Toggle Developer Tools',
- accelerator: 'Alt+Command+I',
- click: () => {
- this.mainWindow.webContents.toggleDevTools();
- },
- },
+ { role: 'quit' },
],
};
- const subMenuViewProd: MenuItemConstructorOptions = {
+ const subMenuView: DarwinMenuItemConstructorOptions = {
label: 'View',
submenu: [
- {
- label: 'Toggle Full Screen',
- accelerator: 'Ctrl+Command+F',
- click: () => {
- this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
- },
- },
- ],
- };
- const subMenuWindow: DarwinMenuItemConstructorOptions = {
- label: 'Window',
- submenu: [
- {
- label: 'Minimize',
- accelerator: 'Command+M',
- selector: 'performMiniaturize:',
- },
- { label: 'Close', accelerator: 'Command+W', selector: 'performClose:' },
+ ...(isDev
+ ? [
+ { role: 'reload' },
+ { role: 'forceReload' },
+ { role: 'toggleDevTools' },
+ { type: 'separator' },
+ ]
+ : none),
+ { role: 'resetZoom' },
+ { role: 'zoomIn' },
+ { role: 'zoomOut' },
{ type: 'separator' },
- { label: 'Bring All to Front', selector: 'arrangeInFront:' },
- ],
- };
- const subMenuHelp: MenuItemConstructorOptions = {
- label: 'Help',
- submenu: [
- {
- label: 'Learn More',
- click() {
- shell.openExternal('https://electronjs.org');
- },
- },
- {
- label: 'Documentation',
- click() {
- shell.openExternal(
- 'https://github.com/electron/electron/tree/master/docs#readme'
- );
- },
- },
- {
- label: 'Community Discussions',
- click() {
- shell.openExternal('https://www.electronjs.org/community');
- },
- },
- {
- label: 'Search Issues',
- click() {
- shell.openExternal('https://github.com/electron/electron/issues');
- },
- },
+ { role: 'togglefullscreen' },
],
};
- const subMenuView =
- process.env.NODE_ENV === 'development' ||
- process.env.DEBUG_PROD === 'true'
- ? subMenuViewDev
- : subMenuViewProd;
-
- return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow, subMenuHelp];
+ return [
+ subMenuApp,
+ { role: 'editMenu' },
+ subMenuView,
+ { role: 'windowMenu' },
+ ];
}
buildDefaultTemplate() {
diff --git a/src/package.json b/src/package.json
index 76ccac7..54f950f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,7 +1,7 @@
{
"name": "time-tracker",
"productName": "TimeTracker",
- "version": "1.0.9",
+ "version": "1.0.10",
"description": "Start and stop time, jump between tasks, and add details on how time was spent.",
"main": "./main.prod.js",
"author": {
From 9ebe1e5cf9d146fb4863290683363e5f15ed5cc5 Mon Sep 17 00:00:00 2001
From: Yadro
Date: Fri, 15 Jul 2022 22:00:51 +0300
Subject: [PATCH 11/20] Clean and fix deps (#27)
* Fix build and clear
* node 16
* Fix workflow
* Upd deps
---
.../configs/webpack.config.main.prod.babel.js | 15 +-
.../webpack.config.renderer.dev.babel.js | 84 +-
.../webpack.config.renderer.prod.babel.js | 17 +-
.erb/img/erb-banner.png | Bin 2058098 -> 0 bytes
.erb/img/erb-logo.png | Bin 28783 -> 0 bytes
.erb/img/eslint-padded-90.png | Bin 6742 -> 0 bytes
.erb/img/eslint-padded.png | Bin 9731 -> 0 bytes
.erb/img/eslint.png | Bin 10125 -> 0 bytes
.erb/img/jest-padded-90.png | Bin 3131 -> 0 bytes
.erb/img/jest-padded.png | Bin 3965 -> 0 bytes
.erb/img/jest.png | Bin 3821 -> 0 bytes
.erb/img/js-padded.png | Bin 4680 -> 0 bytes
.erb/img/js.png | Bin 5128 -> 0 bytes
.erb/img/npm.png | Bin 2455 -> 0 bytes
.erb/img/react-padded-90.png | Bin 4068 -> 0 bytes
.erb/img/react-padded.png | Bin 5124 -> 0 bytes
.erb/img/react-router-padded-90.png | Bin 6514 -> 0 bytes
.erb/img/react-router-padded.png | Bin 4801 -> 0 bytes
.erb/img/react-router.png | Bin 4640 -> 0 bytes
.erb/img/react.png | Bin 5639 -> 0 bytes
.erb/img/webpack-padded-90.png | Bin 3979 -> 0 bytes
.erb/img/webpack-padded.png | Bin 4999 -> 0 bytes
.erb/img/webpack.png | Bin 5576 -> 0 bytes
.erb/img/yarn-padded-90.png | Bin 6264 -> 0 bytes
.erb/img/yarn-padded.png | Bin 6613 -> 0 bytes
.erb/img/yarn.png | Bin 2181 -> 0 bytes
.github/workflows/publish.yml | 19 +-
package.json | 16 +-
yarn.lock | 1148 +----------------
29 files changed, 105 insertions(+), 1194 deletions(-)
delete mode 100644 .erb/img/erb-banner.png
delete mode 100644 .erb/img/erb-logo.png
delete mode 100644 .erb/img/eslint-padded-90.png
delete mode 100644 .erb/img/eslint-padded.png
delete mode 100755 .erb/img/eslint.png
delete mode 100644 .erb/img/jest-padded-90.png
delete mode 100644 .erb/img/jest-padded.png
delete mode 100644 .erb/img/jest.png
delete mode 100644 .erb/img/js-padded.png
delete mode 100755 .erb/img/js.png
delete mode 100755 .erb/img/npm.png
delete mode 100644 .erb/img/react-padded-90.png
delete mode 100644 .erb/img/react-padded.png
delete mode 100644 .erb/img/react-router-padded-90.png
delete mode 100644 .erb/img/react-router-padded.png
delete mode 100644 .erb/img/react-router.png
delete mode 100755 .erb/img/react.png
delete mode 100644 .erb/img/webpack-padded-90.png
delete mode 100644 .erb/img/webpack-padded.png
delete mode 100755 .erb/img/webpack.png
delete mode 100644 .erb/img/yarn-padded-90.png
delete mode 100644 .erb/img/yarn-padded.png
delete mode 100644 .erb/img/yarn.png
diff --git a/.erb/configs/webpack.config.main.prod.babel.js b/.erb/configs/webpack.config.main.prod.babel.js
index 94598ba..ed7016b 100644
--- a/.erb/configs/webpack.config.main.prod.babel.js
+++ b/.erb/configs/webpack.config.main.prod.babel.js
@@ -6,11 +6,12 @@ import path from 'path';
import webpack from 'webpack';
import { merge } from 'webpack-merge';
import TerserPlugin from 'terser-webpack-plugin';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import Dotenv from 'dotenv-webpack';
+// import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+
import baseConfig from './webpack.config.base';
import CheckNodeEnv from '../scripts/CheckNodeEnv';
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
-import Dotenv from 'dotenv-webpack';
CheckNodeEnv('production');
DeleteSourceMaps();
@@ -46,11 +47,11 @@ export default merge(baseConfig, {
},
plugins: [
- new BundleAnalyzerPlugin({
- analyzerMode:
- process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
- openAnalyzer: process.env.OPEN_ANALYZER === 'true',
- }),
+ // new BundleAnalyzerPlugin({
+ // analyzerMode:
+ // process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
+ // openAnalyzer: process.env.OPEN_ANALYZER === 'true',
+ // }),
/**
* Create global constants which can be configured at compile time.
diff --git a/.erb/configs/webpack.config.renderer.dev.babel.js b/.erb/configs/webpack.config.renderer.dev.babel.js
index 26ffb9b..abc6168 100644
--- a/.erb/configs/webpack.config.renderer.dev.babel.js
+++ b/.erb/configs/webpack.config.renderer.dev.babel.js
@@ -103,48 +103,48 @@ export default merge(baseConfig, {
],
},
// SASS support - compile all .global.scss files and pipe it to style.css
- {
- test: /\.global\.(scss|sass)$/,
- use: [
- {
- loader: 'style-loader',
- },
- {
- loader: 'css-loader',
- options: {
- sourceMap: true,
- },
- },
- {
- loader: 'sass-loader',
- },
- ],
- },
- // SASS support - compile all other .scss files and pipe it to style.css
- {
- test: /^((?!\.global).)*\.(scss|sass)$/,
- use: [
- {
- loader: 'style-loader',
- },
- {
- loader: '@teamsupercell/typings-for-css-modules-loader',
- },
- {
- loader: 'css-loader',
- options: {
- modules: {
- localIdentName: '[name]__[local]__[hash:base64:5]',
- },
- sourceMap: true,
- importLoaders: 1,
- },
- },
- {
- loader: 'sass-loader',
- },
- ],
- },
+ // {
+ // test: /\.global\.(scss|sass)$/,
+ // use: [
+ // {
+ // loader: 'style-loader',
+ // },
+ // {
+ // loader: 'css-loader',
+ // options: {
+ // sourceMap: true,
+ // },
+ // },
+ // {
+ // loader: 'sass-loader',
+ // },
+ // ],
+ // },
+ // // SASS support - compile all other .scss files and pipe it to style.css
+ // {
+ // test: /^((?!\.global).)*\.(scss|sass)$/,
+ // use: [
+ // {
+ // loader: 'style-loader',
+ // },
+ // {
+ // loader: '@teamsupercell/typings-for-css-modules-loader',
+ // },
+ // {
+ // loader: 'css-loader',
+ // options: {
+ // modules: {
+ // localIdentName: '[name]__[local]__[hash:base64:5]',
+ // },
+ // sourceMap: true,
+ // importLoaders: 1,
+ // },
+ // },
+ // {
+ // loader: 'sass-loader',
+ // },
+ // ],
+ // },
{
test: /\.less$/,
use: [
diff --git a/.erb/configs/webpack.config.renderer.prod.babel.js b/.erb/configs/webpack.config.renderer.prod.babel.js
index bd4d2d7..5d7df82 100644
--- a/.erb/configs/webpack.config.renderer.prod.babel.js
+++ b/.erb/configs/webpack.config.renderer.prod.babel.js
@@ -5,11 +5,12 @@
import path from 'path';
import webpack from 'webpack';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
+// import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+// import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
import { merge } from 'webpack-merge';
import TerserPlugin from 'terser-webpack-plugin';
import Dotenv from 'dotenv-webpack';
+
import baseConfig from './webpack.config.base';
import CheckNodeEnv from '../scripts/CheckNodeEnv';
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -152,7 +153,7 @@ export default merge(baseConfig, {
new TerserPlugin({
parallel: true,
}),
- new CssMinimizerPlugin(),
+ // new CssMinimizerPlugin(),
],
},
@@ -180,10 +181,10 @@ export default merge(baseConfig, {
filename: 'style.css',
}),
- new BundleAnalyzerPlugin({
- analyzerMode:
- process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
- openAnalyzer: process.env.OPEN_ANALYZER === 'true',
- }),
+ // new BundleAnalyzerPlugin({
+ // analyzerMode:
+ // process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
+ // openAnalyzer: process.env.OPEN_ANALYZER === 'true',
+ // }),
],
});
diff --git a/.erb/img/erb-banner.png b/.erb/img/erb-banner.png
deleted file mode 100644
index 1d9224651a71fee2746900ae501bc2998aa9a240..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2058098
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	}K!RI8?i52zv
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