Skip to content

Commit fb0b61c

Browse files
Basic fixups for release (#451)
* update node version * fix name fetching for tray * use non deprecated way of opening link * update actions * update dependencies * upload actions
1 parent 528f80c commit fb0b61c

File tree

6 files changed

+1158
-1282
lines changed

6 files changed

+1158
-1282
lines changed

.github/workflows/master.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ jobs:
1717
- windows-latest
1818
- ubuntu-latest
1919
node-version:
20-
- 17
20+
- 20
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2424
- name: Use Node.js ${{ matrix.node-version }}
25-
uses: actions/setup-node@v1
25+
uses: actions/setup-node@v4
2626
with:
2727
node-version: ${{ matrix.node-version }}
2828

2929
- name: Cache node_modules
30-
uses: actions/cache@v2
30+
uses: actions/cache@v4
3131
with:
3232
path: ./node_modules
3333
key: ${{ matrix.os }}-${{ matrix.node-version }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
@@ -45,7 +45,7 @@ jobs:
4545
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4646

4747
- name: Upload Build
48-
uses: actions/upload-artifact@v2.2.2
48+
uses: actions/upload-artifact@v4
4949
with:
5050
name: ${{ matrix.os }}-${{ matrix.node-version }}
5151
path: ./dist

.github/workflows/pull-request.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ jobs:
1717
- windows-latest
1818
- ubuntu-latest
1919
node-version:
20-
- 17
20+
- 20
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2424
- name: Use Node.js ${{ matrix.node-version }}
25-
uses: actions/setup-node@v1
25+
uses: actions/setup-node@v4
2626
with:
2727
node-version: ${{ matrix.node-version }}
2828

2929
- name: Cache node_modules
30-
uses: actions/cache@v2
30+
uses: actions/cache@v4
3131
with:
3232
path: ./node_modules
3333
key: ${{ matrix.os }}-${{ matrix.node-version }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
@@ -43,7 +43,7 @@ jobs:
4343
- run: yarn dist --publish never
4444

4545
- name: Upload Build
46-
uses: actions/upload-artifact@v2.2.2
46+
uses: actions/upload-artifact@v4
4747
with:
4848
name: ${{ matrix.os }}-${{ matrix.node-version }}
4949
path: ./dist

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "android-messages-desktop",
33
"description": "Messages for web, as a desktop app",
4-
"version": "5.4.3",
4+
"version": "5.4.4",
55
"author": {
66
"name": "Kyle Rosenberg",
77
"email": "kyle@ekrosenberg.com"
@@ -28,32 +28,32 @@
2828
},
2929
"dependencies": {
3030
"about-window": "1.15.2",
31-
"electron-updater": "5.2.1",
32-
"fs-jetpack": "^4.3.1",
31+
"electron-updater": "6.2.1",
32+
"fs-jetpack": "^5.1.0",
3333
"rxjs": "^7.5.6",
3434
"uuid": "^9.0.0"
3535
},
3636
"devDependencies": {
37-
"@types/node": "18.7.18",
38-
"@types/uuid": "^8.3.4",
37+
"@types/node": "20.14.2",
38+
"@types/uuid": "^9.0.8",
3939
"@types/webpack": "^5.28.0",
40-
"@types/webpack-node-externals": "^2.5.3",
41-
"@typescript-eslint/eslint-plugin": "^5.37.0",
42-
"@typescript-eslint/parser": "^5.37.0",
40+
"@types/webpack-node-externals": "^3.0.4",
41+
"@typescript-eslint/eslint-plugin": "^7.12.0",
42+
"@typescript-eslint/parser": "^7.12.0",
4343
"cross-env": "^7.0.2",
4444
"electron": "20.1.4",
45-
"electron-builder": "^23.3.3",
46-
"eslint": "^8.23.1",
47-
"eslint-config-prettier": "^8.5.0",
48-
"eslint-plugin-prettier": "^4.2.1",
45+
"electron-builder": "^24.13.3",
46+
"eslint": "^9.4.0",
47+
"eslint-config-prettier": "^9.1.0",
48+
"eslint-plugin-prettier": "^5.1.3",
4949
"png2icons": "^2.0.1",
50-
"prettier": "^2.7.1",
50+
"prettier": "^3.3.1",
5151
"source-map-support": "^0.5.21",
5252
"ts-loader": "^9.3.1",
5353
"ts-node": "^10.9.1",
54-
"typescript": "^4.8.3",
54+
"typescript": "^5.4.5",
5555
"webpack": "^5.74.0",
56-
"webpack-cli": "^4.10.0",
56+
"webpack-cli": "^5.1.4",
5757
"webpack-merge": "^5.8.0",
5858
"webpack-node-externals": "^3.0.0"
5959
}

src/background.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ if (gotTheLock) {
109109
})
110110
);
111111

112-
mainWindow.webContents.loadURL("https://messages.google.com/web/");
112+
mainWindow.loadURL("https://messages.google.com/web/");
113113

114114
trayManager.startIfEnabled();
115115
settings.showIconsInRecentConversationTrayEnabled.subscribe(() =>
@@ -148,11 +148,12 @@ if (gotTheLock) {
148148
}
149149
});
150150

151-
mainWindow.webContents.on("new-window", (e, url) => {
152-
e.preventDefault();
153-
shell.openExternal(url);
151+
mainWindow.webContents.setWindowOpenHandler((details) => {
152+
shell.openExternal(details.url)
153+
return {action: "deny"}
154154
});
155155

156+
156157
mainWindow.webContents.on("context-menu", popupContextMenu);
157158

158159
// block Google collecting data

src/helpers/observers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export function recentThreadObserver() {
3434

3535
const data: Conversation[] = conversations.map((conversation, i) => {
3636
const name = conversation.querySelector(
37-
"a div.text-content h3.name span"
37+
"a div.text-content h2.name span"
3838
)?.textContent;
3939
const canvas = conversation.querySelector(
4040
"a div.avatar-container canvas"

0 commit comments

Comments
 (0)