diff options
-rw-r--r-- | .nvmrc | 2 | ||||
-rw-r--r-- | CONTRIBUTING.md | 4 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | package.json | 14 | ||||
-rw-r--r-- | pnpm-lock.yaml | 30 | ||||
m--------- | recipes | 0 | ||||
-rw-r--r-- | src/webview/contextMenuBuilder.ts | 8 |
7 files changed, 30 insertions, 30 deletions
@@ -1 +1 @@ | |||
20.16.0 | 20.17.0 | ||
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c22f9ab62..334b45204 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -62,8 +62,8 @@ Currently, these are the combinations of system dependencies that work for MacOS | |||
62 | # Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed | 62 | # Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed |
63 | $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json | 63 | $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json |
64 | { | 64 | { |
65 | "node": "20.16.0", | 65 | "node": "20.17.0", |
66 | "pnpm": "9.7.0" | 66 | "pnpm": "9.9.0" |
67 | } | 67 | } |
68 | ``` | 68 | ``` |
69 | 69 | ||
diff --git a/Dockerfile b/Dockerfile index 60bfc848f..4be0ddb52 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -1,6 +1,6 @@ | |||
1 | # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture | 1 | # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture |
2 | 2 | ||
3 | FROM docker.io/library/node:20.16.0-buster AS builder | 3 | FROM docker.io/library/node:20.17.0-buster AS builder |
4 | 4 | ||
5 | ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" | 5 | ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" |
6 | 6 | ||
diff --git a/package.json b/package.json index a219532ad..3f8d4faa1 100644 --- a/package.json +++ b/package.json | |||
@@ -3,7 +3,7 @@ | |||
3 | "productName": "Ferdium", | 3 | "productName": "Ferdium", |
4 | "desktopName": "ferdium.desktop", | 4 | "desktopName": "ferdium.desktop", |
5 | "appId": "org.ferdium.ferdium-app", | 5 | "appId": "org.ferdium.ferdium-app", |
6 | "version": "6.7.7-nightly.3", | 6 | "version": "6.7.7-nightly.7", |
7 | "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", | 7 | "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", |
8 | "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)", | 8 | "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)", |
9 | "license": "Apache-2.0", | 9 | "license": "Apache-2.0", |
@@ -13,15 +13,15 @@ | |||
13 | "repository": "https://github.com/ferdium/ferdium-app.git", | 13 | "repository": "https://github.com/ferdium/ferdium-app.git", |
14 | "private": true, | 14 | "private": true, |
15 | "engines": { | 15 | "engines": { |
16 | "node": "20.16.0", | 16 | "node": "20.17.0", |
17 | "pnpm": "9.7.0" | 17 | "pnpm": "9.9.0" |
18 | }, | 18 | }, |
19 | "engine-strict": true, | 19 | "engine-strict": true, |
20 | "volta": { | 20 | "volta": { |
21 | "node": "20.16.0", | 21 | "node": "20.17.0", |
22 | "pnpm": "9.7.0" | 22 | "pnpm": "9.9.0" |
23 | }, | 23 | }, |
24 | "packageManager": "pnpm@9.7.0", | 24 | "packageManager": "pnpm@9.9.0", |
25 | "scripts": { | 25 | "scripts": { |
26 | "prepare": "is-ci || husky", | 26 | "prepare": "is-ci || husky", |
27 | "start": "electron ./build", | 27 | "start": "electron ./build", |
@@ -163,7 +163,7 @@ | |||
163 | "chalk": "5.3.0", | 163 | "chalk": "5.3.0", |
164 | "concurrently": "8.2.2", | 164 | "concurrently": "8.2.2", |
165 | "cross-env": "7.0.3", | 165 | "cross-env": "7.0.3", |
166 | "electron": "31.4.0", | 166 | "electron": "32.1.0", |
167 | "electron-builder": "24.13.3", | 167 | "electron-builder": "24.13.3", |
168 | "esbuild": "0.16.17", | 168 | "esbuild": "0.16.17", |
169 | "esbuild-plugin-copy": "2.1.1", | 169 | "esbuild-plugin-copy": "2.1.1", |
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9cbf310e1..a4dcafa50 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml | |||
@@ -43,7 +43,7 @@ importers: | |||
43 | version: 5.1.0 | 43 | version: 5.1.0 |
44 | '@electron/remote': | 44 | '@electron/remote': |
45 | specifier: 2.1.2 | 45 | specifier: 2.1.2 |
46 | version: 2.1.2(electron@31.4.0) | 46 | version: 2.1.2(electron@32.1.0) |
47 | '@emotion/react': | 47 | '@emotion/react': |
48 | specifier: 11.11.4 | 48 | specifier: 11.11.4 |
49 | version: 11.11.4(@types/react@18.3.3)(react@18.3.1) | 49 | version: 11.11.4(@types/react@18.3.3)(react@18.3.1) |
@@ -73,7 +73,7 @@ importers: | |||
73 | version: 7.4.0(history@5.3.0)(mobx@6.13.1)(path-to-regexp@6.2.2) | 73 | version: 7.4.0(history@5.3.0)(mobx@6.13.1)(path-to-regexp@6.2.2) |
74 | '@syed_umair/electron-process-manager': | 74 | '@syed_umair/electron-process-manager': |
75 | specifier: 1.1.0 | 75 | specifier: 1.1.0 |
76 | version: 1.1.0(electron@31.4.0) | 76 | version: 1.1.0(electron@32.1.0) |
77 | auto-launch: | 77 | auto-launch: |
78 | specifier: 5.0.6 | 78 | specifier: 5.0.6 |
79 | version: 5.0.6 | 79 | version: 5.0.6 |
@@ -353,8 +353,8 @@ importers: | |||
353 | specifier: 7.0.3 | 353 | specifier: 7.0.3 |
354 | version: 7.0.3 | 354 | version: 7.0.3 |
355 | electron: | 355 | electron: |
356 | specifier: 31.4.0 | 356 | specifier: 32.1.0 |
357 | version: 31.4.0 | 357 | version: 32.1.0 |
358 | electron-builder: | 358 | electron-builder: |
359 | specifier: 24.13.3 | 359 | specifier: 24.13.3 |
360 | version: 24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) | 360 | version: 24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) |
@@ -2556,8 +2556,8 @@ packages: | |||
2556 | camelize@1.0.1: | 2556 | camelize@1.0.1: |
2557 | resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} | 2557 | resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} |
2558 | 2558 | ||
2559 | caniuse-lite@1.0.30001651: | 2559 | caniuse-lite@1.0.30001660: |
2560 | resolution: {integrity: sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==} | 2560 | resolution: {integrity: sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==} |
2561 | 2561 | ||
2562 | caseless@0.12.0: | 2562 | caseless@0.12.0: |
2563 | resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} | 2563 | resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} |
@@ -3238,8 +3238,8 @@ packages: | |||
3238 | resolution: {integrity: sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg==} | 3238 | resolution: {integrity: sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg==} |
3239 | engines: {node: '>=8.0.0'} | 3239 | engines: {node: '>=8.0.0'} |
3240 | 3240 | ||
3241 | electron@31.4.0: | 3241 | electron@32.1.0: |
3242 | resolution: {integrity: sha512-YTwKoAA+nrJMlI1TTHnIXLYWoQLKnhbkz0qxZcI7Hadcy0UaFMFs9xzwvH2MnrRpVJy7RKo49kVGuvSdRl8zMA==} | 3242 | resolution: {integrity: sha512-4etE3K6vPUkHihf7nvawngbB5+jLuUJgZh31f9ki1Gfveo0qwNDkLv/doabw+4zFFWKUXI+uFUpyOpL5+RwS+Q==} |
3243 | engines: {node: '>= 12.20.55'} | 3243 | engines: {node: '>= 12.20.55'} |
3244 | hasBin: true | 3244 | hasBin: true |
3245 | 3245 | ||
@@ -8175,9 +8175,9 @@ snapshots: | |||
8175 | transitivePeerDependencies: | 8175 | transitivePeerDependencies: |
8176 | - supports-color | 8176 | - supports-color |
8177 | 8177 | ||
8178 | '@electron/remote@2.1.2(electron@31.4.0)': | 8178 | '@electron/remote@2.1.2(electron@32.1.0)': |
8179 | dependencies: | 8179 | dependencies: |
8180 | electron: 31.4.0 | 8180 | electron: 32.1.0 |
8181 | 8181 | ||
8182 | '@electron/universal@1.5.1': | 8182 | '@electron/universal@1.5.1': |
8183 | dependencies: | 8183 | dependencies: |
@@ -9103,9 +9103,9 @@ snapshots: | |||
9103 | mobx: 6.13.1 | 9103 | mobx: 6.13.1 |
9104 | path-to-regexp: 6.2.2 | 9104 | path-to-regexp: 6.2.2 |
9105 | 9105 | ||
9106 | '@syed_umair/electron-process-manager@1.1.0(electron@31.4.0)': | 9106 | '@syed_umair/electron-process-manager@1.1.0(electron@32.1.0)': |
9107 | dependencies: | 9107 | dependencies: |
9108 | electron: 31.4.0 | 9108 | electron: 32.1.0 |
9109 | electron-process-reporter: 1.4.0 | 9109 | electron-process-reporter: 1.4.0 |
9110 | 9110 | ||
9111 | '@szmarczak/http-timer@4.0.6': | 9111 | '@szmarczak/http-timer@4.0.6': |
@@ -10248,7 +10248,7 @@ snapshots: | |||
10248 | 10248 | ||
10249 | browserslist@4.23.0: | 10249 | browserslist@4.23.0: |
10250 | dependencies: | 10250 | dependencies: |
10251 | caniuse-lite: 1.0.30001651 | 10251 | caniuse-lite: 1.0.30001660 |
10252 | electron-to-chromium: 1.4.710 | 10252 | electron-to-chromium: 1.4.710 |
10253 | node-releases: 2.0.14 | 10253 | node-releases: 2.0.14 |
10254 | update-browserslist-db: 1.0.13(browserslist@4.23.0) | 10254 | update-browserslist-db: 1.0.13(browserslist@4.23.0) |
@@ -10411,7 +10411,7 @@ snapshots: | |||
10411 | 10411 | ||
10412 | camelize@1.0.1: {} | 10412 | camelize@1.0.1: {} |
10413 | 10413 | ||
10414 | caniuse-lite@1.0.30001651: {} | 10414 | caniuse-lite@1.0.30001660: {} |
10415 | 10415 | ||
10416 | caseless@0.12.0: {} | 10416 | caseless@0.12.0: {} |
10417 | 10417 | ||
@@ -11177,7 +11177,7 @@ snapshots: | |||
11177 | jsonfile: 4.0.0 | 11177 | jsonfile: 4.0.0 |
11178 | mkdirp: 0.5.6 | 11178 | mkdirp: 0.5.6 |
11179 | 11179 | ||
11180 | electron@31.4.0: | 11180 | electron@32.1.0: |
11181 | dependencies: | 11181 | dependencies: |
11182 | '@electron/get': 2.0.3 | 11182 | '@electron/get': 2.0.3 |
11183 | '@types/node': 20.14.10 | 11183 | '@types/node': 20.14.10 |
diff --git a/recipes b/recipes | |||
Subproject f8c065734130957a80dc3abc241f5cac8ff2c4c | Subproject e419e881b386c2fdc3faec145d8b6499b80fdf0 | ||
diff --git a/src/webview/contextMenuBuilder.ts b/src/webview/contextMenuBuilder.ts index d68605963..92a246cf5 100644 --- a/src/webview/contextMenuBuilder.ts +++ b/src/webview/contextMenuBuilder.ts | |||
@@ -867,8 +867,8 @@ export class ContextMenuBuilder { | |||
867 | new MenuItem({ | 867 | new MenuItem({ |
868 | label: this.stringTable.goBack(), | 868 | label: this.stringTable.goBack(), |
869 | accelerator: `${cmdOrCtrlShortcutKey()}+left`, | 869 | accelerator: `${cmdOrCtrlShortcutKey()}+left`, |
870 | enabled: webContents.canGoBack(), | 870 | enabled: webContents.navigationHistory.canGoBack(), |
871 | click: () => webContents.goBack(), | 871 | click: () => webContents.navigationHistory.goBack(), |
872 | }), | 872 | }), |
873 | ); | 873 | ); |
874 | } | 874 | } |
@@ -882,8 +882,8 @@ export class ContextMenuBuilder { | |||
882 | new MenuItem({ | 882 | new MenuItem({ |
883 | label: this.stringTable.goForward(), | 883 | label: this.stringTable.goForward(), |
884 | accelerator: `${cmdOrCtrlShortcutKey()}+right`, | 884 | accelerator: `${cmdOrCtrlShortcutKey()}+right`, |
885 | enabled: webContents.canGoForward(), | 885 | enabled: webContents.navigationHistory.canGoForward(), |
886 | click: () => webContents.goForward(), | 886 | click: () => webContents.navigationHistory.goForward(), |
887 | }), | 887 | }), |
888 | ); | 888 | ); |
889 | } | 889 | } |