diff options
author | 2021-04-29 15:59:17 +0200 | |
---|---|---|
committer | 2021-04-29 15:59:17 +0200 | |
commit | bb4fd841b501bcaebd6d2472853bdc6c5163d272 (patch) | |
tree | 41a095e5bc1b25e7a5247c8fd5aba00e63395e66 | |
parent | Upgraded some npm modules (#1322) (diff) | |
parent | Apply suggestions from code review (diff) | |
download | ferdium-app-bb4fd841b501bcaebd6d2472853bdc6c5163d272.tar.gz ferdium-app-bb4fd841b501bcaebd6d2472853bdc6c5163d272.tar.zst ferdium-app-bb4fd841b501bcaebd6d2472853bdc6c5163d272.zip |
Merge branch 'native_m1' of https://github.com/arioki1/ferdi into arioki1-native_m1
# Conflicts:
# package-lock.json
-rw-r--r-- | electron-builder.yml | 5 | ||||
-rw-r--r-- | package-lock.json | 122 |
2 files changed, 54 insertions, 73 deletions
diff --git a/electron-builder.yml b/electron-builder.yml index 7091dfb74..4150ba916 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -14,6 +14,11 @@ mac: | |||
14 | darkModeSupport: true | 14 | darkModeSupport: true |
15 | entitlements: "./build-helpers/entitlements.mas.plist" | 15 | entitlements: "./build-helpers/entitlements.mas.plist" |
16 | entitlementsInherit: "./build-helpers/entitlements.mas.inherit.plist" | 16 | entitlementsInherit: "./build-helpers/entitlements.mas.inherit.plist" |
17 | target: | ||
18 | - target: dmg | ||
19 | arch: | ||
20 | - x64 | ||
21 | - arm64 | ||
17 | extendInfo: | 22 | extendInfo: |
18 | NSCameraUsageDescription: "This app requires camera access for video chats" | 23 | NSCameraUsageDescription: "This app requires camera access for video chats" |
19 | NSMicrophoneUsageDescription: "This app requires microphone access for voice chats" | 24 | NSMicrophoneUsageDescription: "This app requires microphone access for voice chats" |
diff --git a/package-lock.json b/package-lock.json index c2a1a291e..c9ff47817 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -4772,9 +4772,9 @@ | |||
4772 | } | 4772 | } |
4773 | }, | 4773 | }, |
4774 | "@sentry/electron": { | 4774 | "@sentry/electron": { |
4775 | "version": "2.4.0", | 4775 | "version": "2.4.1", |
4776 | "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-2.4.0.tgz", | 4776 | "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-2.4.1.tgz", |
4777 | "integrity": "sha512-xA+cdcVms8JCR2Oc/gSSKbuQ/KQQ+u1DCZ6klxgMF1qzdHkaXuj+t+9leIuiHyYCs1RlKfF/Fd8I+ieGigSrtw==", | 4777 | "integrity": "sha512-M64IcWySOhi5+1sOEOj7Ta8QoIMBZ71T1F4PI6d8nYBP8sq2nVccCzsRsszYxV1Lk7B02GHq64K6dgRj9a3L8w==", |
4778 | "requires": { | 4778 | "requires": { |
4779 | "@sentry/browser": "5.27.6", | 4779 | "@sentry/browser": "5.27.6", |
4780 | "@sentry/core": "5.27.6", | 4780 | "@sentry/core": "5.27.6", |
@@ -4782,7 +4782,14 @@ | |||
4782 | "@sentry/node": "5.27.6", | 4782 | "@sentry/node": "5.27.6", |
4783 | "@sentry/types": "5.27.6", | 4783 | "@sentry/types": "5.27.6", |
4784 | "@sentry/utils": "5.27.6", | 4784 | "@sentry/utils": "5.27.6", |
4785 | "tslib": "^1.9.3" | 4785 | "tslib": "^2.1.0" |
4786 | }, | ||
4787 | "dependencies": { | ||
4788 | "tslib": { | ||
4789 | "version": "2.2.0", | ||
4790 | "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", | ||
4791 | "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==" | ||
4792 | } | ||
4786 | } | 4793 | } |
4787 | }, | 4794 | }, |
4788 | "@sentry/hub": { | 4795 | "@sentry/hub": { |
@@ -5169,9 +5176,9 @@ | |||
5169 | } | 5176 | } |
5170 | }, | 5177 | }, |
5171 | "@types/semver": { | 5178 | "@types/semver": { |
5172 | "version": "7.3.5", | 5179 | "version": "7.3.4", |
5173 | "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.5.tgz", | 5180 | "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz", |
5174 | "integrity": "sha512-iotVxtCCsPLRAvxMFFgxL8HD2l4mAZ2Oin7/VJ2ooWO0VOK4EGOGmZWZn1uCq7RofR3I/1IOSjCHlFT71eVK0Q==" | 5181 | "integrity": "sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==" |
5175 | }, | 5182 | }, |
5176 | "@types/stack-utils": { | 5183 | "@types/stack-utils": { |
5177 | "version": "1.0.1", | 5184 | "version": "1.0.1", |
@@ -9536,12 +9543,6 @@ | |||
9536 | "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", | 9543 | "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", |
9537 | "dev": true | 9544 | "dev": true |
9538 | }, | 9545 | }, |
9539 | "type-fest": { | ||
9540 | "version": "0.18.1", | ||
9541 | "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", | ||
9542 | "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", | ||
9543 | "dev": true | ||
9544 | }, | ||
9545 | "yallist": { | 9546 | "yallist": { |
9546 | "version": "4.0.0", | 9547 | "version": "4.0.0", |
9547 | "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | 9548 | "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", |
@@ -9993,12 +9994,6 @@ | |||
9993 | "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", | 9994 | "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", |
9994 | "dev": true | 9995 | "dev": true |
9995 | }, | 9996 | }, |
9996 | "type-fest": { | ||
9997 | "version": "0.18.1", | ||
9998 | "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", | ||
9999 | "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", | ||
10000 | "dev": true | ||
10001 | }, | ||
10002 | "wordwrap": { | 9997 | "wordwrap": { |
10003 | "version": "1.0.0", | 9998 | "version": "1.0.0", |
10004 | "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", | 9999 | "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", |
@@ -13003,59 +12998,43 @@ | |||
13003 | }, | 12998 | }, |
13004 | "dependencies": { | 12999 | "dependencies": { |
13005 | "fs-extra": { | 13000 | "fs-extra": { |
13006 | "version": "9.1.0", | 13001 | "version": "9.0.1", |
13007 | "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", | 13002 | "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", |
13008 | "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", | 13003 | "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", |
13009 | "requires": { | 13004 | "requires": { |
13010 | "at-least-node": "^1.0.0", | 13005 | "at-least-node": "^1.0.0", |
13011 | "graceful-fs": "^4.2.0", | 13006 | "graceful-fs": "^4.2.0", |
13012 | "jsonfile": "^6.0.1", | 13007 | "jsonfile": "^6.0.1", |
13013 | "universalify": "^2.0.0" | 13008 | "universalify": "^1.0.0" |
13014 | } | 13009 | } |
13015 | }, | 13010 | }, |
13016 | "js-yaml": { | 13011 | "js-yaml": { |
13017 | "version": "3.14.1", | 13012 | "version": "3.14.0", |
13018 | "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", | 13013 | "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", |
13019 | "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", | 13014 | "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", |
13020 | "requires": { | 13015 | "requires": { |
13021 | "argparse": "^1.0.7", | 13016 | "argparse": "^1.0.7", |
13022 | "esprima": "^4.0.0" | 13017 | "esprima": "^4.0.0" |
13023 | } | 13018 | } |
13024 | }, | 13019 | }, |
13025 | "jsonfile": { | 13020 | "jsonfile": { |
13026 | "version": "6.1.0", | 13021 | "version": "6.0.1", |
13027 | "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", | 13022 | "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", |
13028 | "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", | 13023 | "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", |
13029 | "requires": { | 13024 | "requires": { |
13030 | "graceful-fs": "^4.1.6", | 13025 | "graceful-fs": "^4.1.6", |
13031 | "universalify": "^2.0.0" | 13026 | "universalify": "^1.0.0" |
13032 | } | ||
13033 | }, | ||
13034 | "lru-cache": { | ||
13035 | "version": "6.0.0", | ||
13036 | "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", | ||
13037 | "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", | ||
13038 | "requires": { | ||
13039 | "yallist": "^4.0.0" | ||
13040 | } | 13027 | } |
13041 | }, | 13028 | }, |
13042 | "semver": { | 13029 | "semver": { |
13043 | "version": "7.3.5", | 13030 | "version": "7.3.2", |
13044 | "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", | 13031 | "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", |
13045 | "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", | 13032 | "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" |
13046 | "requires": { | ||
13047 | "lru-cache": "^6.0.0" | ||
13048 | } | ||
13049 | }, | 13033 | }, |
13050 | "universalify": { | 13034 | "universalify": { |
13051 | "version": "2.0.0", | 13035 | "version": "1.0.0", |
13052 | "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", | 13036 | "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", |
13053 | "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" | 13037 | "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" |
13054 | }, | ||
13055 | "yallist": { | ||
13056 | "version": "4.0.0", | ||
13057 | "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | ||
13058 | "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" | ||
13059 | } | 13038 | } |
13060 | } | 13039 | } |
13061 | }, | 13040 | }, |
@@ -16730,12 +16709,6 @@ | |||
16730 | "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", | 16709 | "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", |
16731 | "dev": true | 16710 | "dev": true |
16732 | }, | 16711 | }, |
16733 | "type-fest": { | ||
16734 | "version": "0.18.1", | ||
16735 | "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", | ||
16736 | "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", | ||
16737 | "dev": true | ||
16738 | }, | ||
16739 | "yallist": { | 16712 | "yallist": { |
16740 | "version": "4.0.0", | 16713 | "version": "4.0.0", |
16741 | "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | 16714 | "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", |
@@ -22695,11 +22668,12 @@ | |||
22695 | } | 22668 | } |
22696 | }, | 22669 | }, |
22697 | "macos-notification-state": { | 22670 | "macos-notification-state": { |
22698 | "version": "1.3.5", | 22671 | "version": "1.3.1", |
22699 | "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.5.tgz", | 22672 | "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.1.tgz", |
22700 | "integrity": "sha512-uTfue/exD5AtZnJHgjvaHCi0/MQOWigcTjKGmRmRSJz+SGdXZMM2TVAI/js8SnLILUzoA3FW1wveaPZne9x/Tg==", | 22673 | "integrity": "sha512-Zd4fezXN4WaXw0fJnO3dr8Eg72AKI4C+g0Jnm5KcX8o7WWvIMV9rzsl8mtuOL8FT+QPYv1xiaLpElqhXubf3Yw==", |
22701 | "requires": { | 22674 | "requires": { |
22702 | "bindings": "^1.5.0" | 22675 | "bindings": "^1.4.0", |
22676 | "nan": "^2.13.2" | ||
22703 | } | 22677 | } |
22704 | }, | 22678 | }, |
22705 | "macos-release": { | 22679 | "macos-release": { |
@@ -26893,12 +26867,6 @@ | |||
26893 | "lazy-val": "^1.0.4" | 26867 | "lazy-val": "^1.0.4" |
26894 | }, | 26868 | }, |
26895 | "dependencies": { | 26869 | "dependencies": { |
26896 | "dotenv": { | ||
26897 | "version": "8.2.0", | ||
26898 | "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", | ||
26899 | "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==", | ||
26900 | "dev": true | ||
26901 | }, | ||
26902 | "js-yaml": { | 26870 | "js-yaml": { |
26903 | "version": "3.14.1", | 26871 | "version": "3.14.1", |
26904 | "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", | 26872 | "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", |
@@ -28098,6 +28066,15 @@ | |||
28098 | "optional": true, | 28066 | "optional": true, |
28099 | "requires": { | 28067 | "requires": { |
28100 | "type-fest": "^0.13.1" | 28068 | "type-fest": "^0.13.1" |
28069 | }, | ||
28070 | "dependencies": { | ||
28071 | "type-fest": { | ||
28072 | "version": "0.13.1", | ||
28073 | "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", | ||
28074 | "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", | ||
28075 | "dev": true, | ||
28076 | "optional": true | ||
28077 | } | ||
28101 | } | 28078 | } |
28102 | }, | 28079 | }, |
28103 | "serialize-javascript": { | 28080 | "serialize-javascript": { |
@@ -30456,11 +30433,10 @@ | |||
30456 | } | 30433 | } |
30457 | }, | 30434 | }, |
30458 | "type-fest": { | 30435 | "type-fest": { |
30459 | "version": "0.13.1", | 30436 | "version": "0.18.1", |
30460 | "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", | 30437 | "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", |
30461 | "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", | 30438 | "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", |
30462 | "dev": true, | 30439 | "dev": true |
30463 | "optional": true | ||
30464 | }, | 30440 | }, |
30465 | "type-is": { | 30441 | "type-is": { |
30466 | "version": "1.6.18", | 30442 | "version": "1.6.18", |